diff --git a/templates/Maketank/login/fpwd.tpl b/templates/Maketank/login/fpwd.tpl
index 2a24de4f..e347c48a 100644
--- a/templates/Maketank/login/fpwd.tpl
+++ b/templates/Maketank/login/fpwd.tpl
@@ -1,7 +1,7 @@
 $header
 	<article class="login bradius">
 		<header class="dark">
-			<img src="templates/{$theme}/img/logo.svg" alt="Froxlor Server Management Panel" />
+			<img src="templates/{$theme}/assets/img/logo.svg" alt="Froxlor Server Management Panel" />
 		</header>
 			<if $message != ''>
 				<div class="errorcontainer bradius">
diff --git a/templates/Maketank/login/login.tpl b/templates/Maketank/login/login.tpl
index 43514391..ded9e6bb 100644
--- a/templates/Maketank/login/login.tpl
+++ b/templates/Maketank/login/login.tpl
@@ -1,7 +1,7 @@
 $header
 	<article class="login bradius">
 		<header class="dark">
-			<img src="templates/{$theme}/img/logo.svg" alt="Froxlor Server Management Panel" />
+			<img src="templates/{$theme}/assets/img/logo.svg" alt="Froxlor Server Management Panel" />
 		</header>
 
 		<if $update_in_progress !== ''>
diff --git a/templates/Maketank/login/login_ftp.tpl b/templates/Maketank/login/login_ftp.tpl
index 317eb061..509c9a90 100644
--- a/templates/Maketank/login/login_ftp.tpl
+++ b/templates/Maketank/login/login_ftp.tpl
@@ -1,6 +1,6 @@
 	<article class="login bradius">
 		<header class="dark">
-			<img src="templates/{$theme}/img/logo.svg" alt="{t}Froxlor Server Management Panel{/t}" />
+			<img src="templates/{$theme}/assets/img/logo.svg" alt="{t}Froxlor Server Management Panel{/t}" />
 		</header>
 
 		{if isset($successmessage)}
diff --git a/templates/Maketank/login/rpwd.tpl b/templates/Maketank/login/rpwd.tpl
index 6a606fa5..11a9af10 100644
--- a/templates/Maketank/login/rpwd.tpl
+++ b/templates/Maketank/login/rpwd.tpl
@@ -1,7 +1,7 @@
 $header
 	<article class="login bradius">
 		<header class="dark">
-			<img src="templates/{$theme}/img/logo.svg" alt="Froxlor Server Management Panel" />
+			<img src="templates/{$theme}/assets/img/logo.svg" alt="Froxlor Server Management Panel" />
 		</header>
 			<if $message != ''>
 				<div class="errorcontainer bradius">
diff --git a/templates/Maketank/misc/alreadyinstalledhint.tpl b/templates/Maketank/misc/alreadyinstalledhint.tpl
index 029c8907..1747a511 100644
--- a/templates/Maketank/misc/alreadyinstalledhint.tpl
+++ b/templates/Maketank/misc/alreadyinstalledhint.tpl
@@ -6,7 +6,7 @@
 	<link rel="stylesheet" href="../templates/Sparkle/assets/css/main.css" />
 	<!--[if IE]><link rel="stylesheet" href="../templates/Sparkle/assets/css/main_ie.css" /><![endif]-->
 	<!--[if lt IE 9]><script src="js/html5shiv.min.js"></script><![endif]-->
-	<link href="../templates/Sparkle/assets/img/favicon.ico" rel="icon" type="image/x-icon" />
+	<link href="../templates/{$theme}/assets/img/favicon.ico" rel="icon" type="image/x-icon" />
 	<title>Froxlor Server Management Panel - Installation</title>
 </head>
 <body>
diff --git a/templates/Maketank/misc/configurehint.tpl b/templates/Maketank/misc/configurehint.tpl
index 876a5f1a..60ec9901 100644
--- a/templates/Maketank/misc/configurehint.tpl
+++ b/templates/Maketank/misc/configurehint.tpl
@@ -6,7 +6,7 @@
 	<link rel="stylesheet" href="templates/Sparkle/assets/css/main.css" />
 	<!--[if IE]><link rel="stylesheet" href="templates/Sparkle/assets/css/main_ie.css" /><![endif]-->
 	<!--[if lt IE 9]><script src="js/html5shiv.min.js"></script><![endif]-->
-	<link href="templates/Sparkle/assets/img/favicon.ico" rel="icon" type="image/x-icon" />
+	<link href="templates/{$theme}/assets/img/favicon.ico" rel="icon" type="image/x-icon" />
 	<title>Froxlor Server Management Panel - Installation</title>
 </head>
 <body>
diff --git a/templates/Maketank/misc/dberrornice.tpl b/templates/Maketank/misc/dberrornice.tpl
index 8f74965c..20c05043 100644
--- a/templates/Maketank/misc/dberrornice.tpl
+++ b/templates/Maketank/misc/dberrornice.tpl
@@ -6,7 +6,7 @@
 	<link rel="stylesheet" href="templates/Sparkle/assets/css/main.css" />
 	<!--[if IE]><link rel="stylesheet" href="templates/Sparkle/assets/css/main_ie.css" /><![endif]-->
 	<!--[if lt IE 9]><script src="js/html5shiv.min.js"></script><![endif]-->
-	<link href="templates/Sparkle/assets/img/favicon.ico" rel="icon" type="image/x-icon" />
+	<link href="templates/{$theme}/assets/img/favicon.ico" rel="icon" type="image/x-icon" />
 	<title>Froxlor Server Management Panel - Database error</title>
 </head>
 <body>
