diff --git a/install-dev/upgrade/sql/1.6.0.2.sql b/install-dev/upgrade/sql/1.6.0.2.sql
index 55c3dfabe..5eba8ecf0 100644
--- a/install-dev/upgrade/sql/1.6.0.2.sql
+++ b/install-dev/upgrade/sql/1.6.0.2.sql
@@ -4,5 +4,5 @@ INSERT INTO `PREFIX_hook_module` (`id_module`, `id_shop`, `id_hook`, `position`)
 	SELECT m.id_module, s.id_shop, h.id_hook, 0
 	FROM `PREFIX_module` m, `PREFIX_shop` s, `PREFIX_hook` h
 	WHERE m.name IN ('dashgoals', 'dashactivity', 'dashtrends', 'dashproducts')
-	AND h.name IN ('displayBackOfficeHeader')
+	AND h.name IN ('actionAdminControllerSetMedia')
 );
diff --git a/modules/blockcategories/blockcategories.tpl b/modules/blockcategories/blockcategories.tpl
index 86acc7807..49013faab 100644
--- a/modules/blockcategories/blockcategories.tpl
+++ b/modules/blockcategories/blockcategories.tpl
@@ -22,9 +22,8 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-
-<!-- Block categories module -->
 {if $blockCategTree && $blockCategTree.children|@count}
+<!-- Block categories module -->
 <div id="categories_block_left" class="block">
 	<h4 class="title_block">{if isset($currentCategory)}{$currentCategory->name|escape}{else}{l s='Categories' mod='blockcategories'}{/if}</h4>
 	<div class="block_content">
@@ -46,5 +45,5 @@
 		</script>
 	</div>
 </div>
-{/if}
 <!-- /Block categories module -->
+{/if}
diff --git a/modules/blockcategories/blockcategories_footer.tpl b/modules/blockcategories/blockcategories_footer.tpl
index 12d947b1c..66620354f 100644
--- a/modules/blockcategories/blockcategories_footer.tpl
+++ b/modules/blockcategories/blockcategories_footer.tpl
@@ -23,8 +23,8 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-<!-- Block categories module -->
 <div class="blockcategories_footer">
+<!-- Block categories module -->
 	<h4 class="title_block">{l s='Categories' mod='blockcategories'}</h4>
 <div class="category_footer" style="float:left;clear:none;width:{$widthColumn}%">
 	<div style="float:left" class="list">
@@ -51,5 +51,5 @@
 	</div>
 </div>
 <br class="clear"/>
-</div>
 <!-- /Block categories module -->
+</div>
diff --git a/themes/default-bootstrap/modules/blockcategories/blockcategories.tpl b/themes/default-bootstrap/modules/blockcategories/blockcategories.tpl
index d0b731f0a..7f1a86b9d 100644
--- a/themes/default-bootstrap/modules/blockcategories/blockcategories.tpl
+++ b/themes/default-bootstrap/modules/blockcategories/blockcategories.tpl
@@ -22,9 +22,8 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-
-<!-- Block categories module -->
 {if $blockCategTree && $blockCategTree.children|@count}
+<!-- Block categories module -->
 <div id="categories_block_left" class="block">
 	<p class="title_block">{if isset($currentCategory)}{$currentCategory->name|escape}{else}{l s='Categories' mod='blockcategories'}{/if}</p>
 	<div class="block_content">
@@ -46,5 +45,5 @@
 		</script>
 	</div>
 </div>
-{/if}
 <!-- /Block categories module -->
+{/if}