diff --git a/admin-dev/themes/default/css/admin-theme.css b/admin-dev/themes/default/css/admin-theme.css
index 2ca98bebd..97f228937 100644
--- a/admin-dev/themes/default/css/admin-theme.css
+++ b/admin-dev/themes/default/css/admin-theme.css
@@ -3031,7 +3031,7 @@ a.link-social:hover { text-decoration: none; }
 #nav-sidebar ul.submenu li.active a { color: white; background-color: #1ba6e5; border-bottom: solid 1px #1585b8; }
 @media (max-width: 480px) { #nav-sidebar { display: none; } }
 
-#nav-topbar { position: fixed; height: 28px; top: 38px; left: 80; width: 100%; padding: 0 40px 0 0; z-index: 600; background-color: white; }
+#nav-topbar { position: fixed; height: 28px; top: 37px; width: 100%; padding: 0 40px 0 0; z-index: 600; background-color: white; }
 #nav-topbar ul.menu { margin: 0; padding: 0; display: block; list-style: none; }
 #nav-topbar ul.menu li.maintab, #nav-topbar ul.menu li.subtab { height: 28px; padding: 0; margin: 0; list-style: none; position: relative; float: left; }
 #nav-topbar ul.menu li.maintab > a, #nav-topbar ul.menu li.subtab > a { display: block; line-height: 30px; color: #515561; padding: 0 6px; margin: 0; font-size: 12px; }
@@ -3055,9 +3055,8 @@ a.link-social:hover { text-decoration: none; }
 .menu-collapse { cursor: pointer; height: 54px; width: 100%; font-size: 2em; text-align: center; line-height: 55px; display: block; background-color: #515561; border-bottom: 4px solid #3a3d45; color: #0b0c0e; }
 
 .page-topbar #main { padding-top: 64px; }
-.page-topbar #nav-sidebar { display: none; }
-.page-topbar .page-head { top: 66px; }
-.page-topbar #content { margin-left: 0; width: 100%; }
+.page-topbar #content { margin-left: 0; }
+.page-topbar #content .page-head { top: 65px; }
 .page-topbar #content .page-head h2.page-title { padding: 0 0 0 20px; }
 
 .page-sidebar #content { margin-left: 240px; }
diff --git a/admin-dev/themes/default/js/admin-theme.js b/admin-dev/themes/default/js/admin-theme.js
index 203774ebf..9a2b6738c 100755
--- a/admin-dev/themes/default/js/admin-theme.js
+++ b/admin-dev/themes/default/js/admin-theme.js
@@ -58,7 +58,7 @@ $( document ).ready(function() {
 	//nav top bar
 	function navTopbar(){
 		//$('body').removeClass('page-sidebar').addClass('page-topbar').removeClass('page-sidebar-closed');
-		//$('#nav-sidebar').attr('id','nav-topbar');
+		$('#nav-sidebar').attr('id','nav-topbar');
 		var topbar = $('#nav-topbar');
 		topbar.off();
 		$('span.submenu_expand').remove();
diff --git a/admin-dev/themes/default/scss/admin-theme/_admin-nav.sass b/admin-dev/themes/default/scss/admin-theme/_admin-nav.sass
index 6ec03dbf5..01567d7c3 100644
--- a/admin-dev/themes/default/scss/admin-theme/_admin-nav.sass
+++ b/admin-dev/themes/default/scss/admin-theme/_admin-nav.sass
@@ -212,8 +212,7 @@
 #nav-topbar
 	position: fixed
 	height: 28px
-	top: 38px
-	left: 80
+	top: 37px
 	width: 100%
 	padding: 0 40px 0 0
 	z-index: 600
@@ -320,15 +319,12 @@
 .page-topbar
 	#main
 		padding-top: 64px
-	#nav-sidebar
-		display: none
-	.page-head
-		top: 66px
 	#content
 		margin-left: 0
-		width: 100%
-		.page-head h2.page-title
-			padding: 0 0 0 20px
+		.page-head
+			top: 65px
+			h2.page-title
+				padding: 0 0 0 20px
 
 .page-sidebar
 	#content
diff --git a/admin-dev/themes/default/template/footer.tpl b/admin-dev/themes/default/template/footer.tpl
index 011fa4f09..0d877a469 100644
--- a/admin-dev/themes/default/template/footer.tpl
+++ b/admin-dev/themes/default/template/footer.tpl
@@ -48,18 +48,22 @@
 
 	<div class="col-sm-5">
 		<a href="http://www.prestashop.com/en/contact_us?utm_source=backoffice_footer" target="_blank" class="footer_link">
+			<i class="icon-envelope"></i>
 			{l s='Contact'}
 		</a>
-		|&nbsp;
+		//&nbsp;
 		<a href="http://forge.prestashop.com/?utm_source=backoffice_footer" target="_blank" class="footer_link">
+			<i class="icon-bug"></i>
 			{l s='Bug Tracker'}
 		</a>
-		|&nbsp;
+		//&nbsp;
 		<a href="http://www.prestashop.com/forums/?utm_source=backoffice_footer" target="_blank" class="footer_link">
+			<i class="icon-comments"></i>
 			{l s='Forum'}
 		</a>
-		|&nbsp;
+		//&nbsp;
 		<a href="http://addons.prestashop.com/?utm_source=backoffice_footer" target="_blank" class="footer_link">
+			<i class="icon-puzzle-piece"></i>
 			{l s='Addons'}
 		</a>
 		{if $iso_is_fr}
diff --git a/admin-dev/themes/default/template/nav.tpl b/admin-dev/themes/default/template/nav.tpl
index 1d919a6e2..644a4c669 100644
--- a/admin-dev/themes/default/template/nav.tpl
+++ b/admin-dev/themes/default/template/nav.tpl
@@ -1,34 +1,36 @@
-<nav id="nav-sidebar" class="bootstrap" role="navigation">
-{if !$tab}
-	<div class="mainsubtablist" style="display:none"></div>
-{/if}
-	<span class="menu-collapse">
-		<i class="icon-align-justify"></i>
-	</span>
+<div class="bootstrap">
+	<nav id="nav-sidebar" role="navigation">
+	{if !$tab}
+		<div class="mainsubtablist" style="display:none"></div>
+	{/if}
+		<span class="menu-collapse">
+			<i class="icon-align-justify"></i>
+		</span>
 
-	<ul class="menu">
-	{foreach $tabs as $t}
-		{if $t.active}
-		<li class="maintab {if $t.current}active{/if} {if $t.sub_tabs|@count}has_submenu{/if}" id="maintab{$t.id_tab}" data-submenu="{$t.id_tab}">
-			<a href="{if $t.sub_tabs|@count}{$t.sub_tabs[0].href}{else}{$t.href}{/if}" class="title" >
-				<i class="icon-{$t.class_name}"></i>
-				<span class="title">{if $t.name eq ''}{$t.class_name}{else}{$t.name}{/if}</span>
-			</a>
-			{if $t.sub_tabs|@count}
-				<ul class="submenu">
-				{foreach from=$t.sub_tabs item=t2}
-					{if $t2.active}
-					<li {if $t2.current} class="active"{/if}>
-						<a href="{$t2.href|escape:'htmlall':'UTF-8'}">
-							{if $t2.name eq ''}{$t2.class_name}{else}{$t2.name|escape:'htmlall':'UTF-8'}{/if}
-						</a>
-					</li>
-					{/if}
-				{/foreach}
-				</ul>
+		<ul class="menu">
+		{foreach $tabs as $t}
+			{if $t.active}
+			<li class="maintab {if $t.current}active{/if} {if $t.sub_tabs|@count}has_submenu{/if}" id="maintab{$t.id_tab}" data-submenu="{$t.id_tab}">
+				<a href="{if $t.sub_tabs|@count}{$t.sub_tabs[0].href}{else}{$t.href}{/if}" class="title" >
+					<i class="icon-{$t.class_name}"></i>
+					<span class="title">{if $t.name eq ''}{$t.class_name}{else}{$t.name}{/if}</span>
+				</a>
+				{if $t.sub_tabs|@count}
+					<ul class="submenu">
+					{foreach from=$t.sub_tabs item=t2}
+						{if $t2.active}
+						<li {if $t2.current} class="active"{/if}>
+							<a href="{$t2.href|escape:'htmlall':'UTF-8'}">
+								{if $t2.name eq ''}{$t2.class_name}{else}{$t2.name|escape:'htmlall':'UTF-8'}{/if}
+							</a>
+						</li>
+						{/if}
+					{/foreach}
+					</ul>
+				{/if}
+			</li>
 			{/if}
-		</li>
-		{/if}
-	{/foreach}
-	</ul>
-</nav>
\ No newline at end of file
+		{/foreach}
+		</ul>
+	</nav>
+</div>
\ No newline at end of file