diff --git a/app/layout/header.phtml b/app/layout/header.phtml
index 1c0d2562f..64c60b168 100644
--- a/app/layout/header.phtml
+++ b/app/layout/header.phtml
@@ -10,7 +10,7 @@
 
 <div class="header">
 	<div class="item title">
-		<img class="logo" width="32" height="32" src="<?php echo Url::display ('/icons/icon-32.png'); ?>" alt="[logo]" />
+		<img class="logo" width="32" height="32" src="<?php echo Url::display ('/themes/icons/icon-32.png'); ?>" alt="[logo]" />
 		<h1><a href="<?php echo _url ('index', 'index'); ?>"><?php echo Configuration::title (); ?></a></h1>
 	</div>
 
diff --git a/public/icons/icon-128.png b/public/themes/icons/icon-128.png
similarity index 100%
rename from public/icons/icon-128.png
rename to public/themes/icons/icon-128.png
diff --git a/public/icons/icon-16.png b/public/themes/icons/icon-16.png
similarity index 100%
rename from public/icons/icon-16.png
rename to public/themes/icons/icon-16.png
diff --git a/public/icons/icon-256.png b/public/themes/icons/icon-256.png
similarity index 100%
rename from public/icons/icon-256.png
rename to public/themes/icons/icon-256.png
diff --git a/public/icons/icon-32.png b/public/themes/icons/icon-32.png
similarity index 100%
rename from public/icons/icon-32.png
rename to public/themes/icons/icon-32.png
diff --git a/public/icons/icon-64.png b/public/themes/icons/icon-64.png
similarity index 100%
rename from public/icons/icon-64.png
rename to public/themes/icons/icon-64.png
diff --git a/public/icons/icon.svg b/public/themes/icons/icon.svg
similarity index 100%
rename from public/icons/icon.svg
rename to public/themes/icons/icon.svg