diff --git a/admin-dev/themes/template/addons_catalog/content.tpl b/admin-dev/themes/template/addons_catalog/content.tpl
new file mode 100644
index 000000000..5bd3128aa
--- /dev/null
+++ b/admin-dev/themes/template/addons_catalog/content.tpl
@@ -0,0 +1,3 @@
+<iframe frameborder="no" style="margin:0px;padding:0px;width:100%;height:920px" src="http://addons.prestashop.com/iframe/search.php?parentUrl={$parentDomain}"></iframe>
+<div class="clear">&nbsp;</div>
+
diff --git a/admin-dev/themes/template/addons_myaccount/content.tpl b/admin-dev/themes/template/addons_myaccount/content.tpl
new file mode 100644
index 000000000..296f6fb1f
--- /dev/null
+++ b/admin-dev/themes/template/addons_myaccount/content.tpl
@@ -0,0 +1,2 @@
+<iframe frameborder="no" style="margin:0px;padding:0px;width:100%;height:920px" src="http://addons.prestashop.com/iframe/myaccount.php?parentUrl={$parentDomain}"></iframe>
+<div class="clear">&nbsp;</div>
diff --git a/admin-dev/tabs/AdminAddonsCatalog.php b/controllers/admin/AdminAddonsCatalogController.php
similarity index 71%
rename from admin-dev/tabs/AdminAddonsCatalog.php
rename to controllers/admin/AdminAddonsCatalogController.php
index c7863aa71..2899ffc49 100644
--- a/admin-dev/tabs/AdminAddonsCatalog.php
+++ b/controllers/admin/AdminAddonsCatalogController.php
@@ -25,13 +25,12 @@
 *  International Registered Trademark & Property of PrestaShop SA
 */
 
-class AdminAddonsCatalog extends AdminTab
+class AdminAddonsCatalogControllerCore extends AdminController
 {
-	public function display()
+	public function initContent()
 	{
-		$parentDomain = Tools::getHttpHost(true).substr($_SERVER['REQUEST_URI'], 0, -1 * strlen(basename($_SERVER['REQUEST_URI'])));
-		echo '<iframe frameborder="no" style="margin:0px;padding:0px;width:100%;height:920px" src="http://addons.prestashop.com/iframe/search.php?parentUrl='.$parentDomain.'"></iframe>
-		<div class="clear">&nbsp;</div>';
+		$this->context->smarty->assign('parentDomain', Tools::getHttpHost(true).substr($_SERVER['REQUEST_URI'], 0, -1 * strlen(basename($_SERVER['REQUEST_URI']))));
+		parent::initContent();
 	}
 }
 
diff --git a/admin-dev/tabs/AdminAddonsMyAccount.php b/controllers/admin/AdminAddonsMyAccountController.php
similarity index 71%
rename from admin-dev/tabs/AdminAddonsMyAccount.php
rename to controllers/admin/AdminAddonsMyAccountController.php
index e856cc670..613c2820a 100644
--- a/admin-dev/tabs/AdminAddonsMyAccount.php
+++ b/controllers/admin/AdminAddonsMyAccountController.php
@@ -25,13 +25,12 @@
 *  International Registered Trademark & Property of PrestaShop SA
 */
 
-class AdminAddonsMyAccount extends AdminTab
+class AdminAddonsMyAccountControllerCore extends AdminController
 {
-	public function display()
+	public function initContent()
 	{
-		$parentDomain = Tools::getHttpHost(true).substr($_SERVER['REQUEST_URI'], 0, -1 * strlen(basename($_SERVER['REQUEST_URI'])));
-		echo '<iframe frameborder="no" style="margin:0px;padding:0px;width:100%;height:920px" src="http://addons.prestashop.com/iframe/myaccount.php?parentUrl='.$parentDomain.'"></iframe>
-		<div class="clear">&nbsp;</div>';
+		$this->context->smarty->assign('parentDomain', Tools::getHttpHost(true).substr($_SERVER['REQUEST_URI'], 0, -1 * strlen(basename($_SERVER['REQUEST_URI']))));
+		parent::initContent();
 	}
 }