diff --git a/public/css/main.css b/public/css/main.css
index 3fad7880..5c0c5770 100644
--- a/public/css/main.css
+++ b/public/css/main.css
@@ -61,9 +61,6 @@ body {
     height: 60px;
     border-bottom: 1px solid;
 }
-.header.content-admin {
-    height: auto;
-}
 
 .container, .modtools {
     max-width: 1111px;
@@ -91,10 +88,6 @@ body {
 .h-left {
     position: absolute;
 }
-.header.content-admin .h-left {
-    position: initial;
-    float: left;
-}
 
 .h-right {
     right: 0;
@@ -104,11 +97,6 @@ body {
     height: 60px;
 }
 
-.header.content-admin .h-right {
-    position: initial;
-    float: right;
-}
-
 .h-logo, .h-nav {
     float: left;
 }
@@ -132,10 +120,6 @@ body {
 .header .h-search {
     margin-right: 6px;
 }
-.header.content-admin .h-search {
-    height: auto;
-    float: right;
-}
 
 .header .h-search .form-input {
     font-size: 80%;
@@ -676,9 +660,6 @@ html, body {
     .header .h-user .user-menu {
         right: 92px;
     }
-    .header.content-admin .user-menu {
-        right: 16px!important;
-    }
     .header .h-user .user-info {
         display: none;
     }
@@ -838,9 +819,6 @@ html, body {
     .header {
     height: 56px;
     }
-    .header.content-admin{
-        height: auto;
-    }
     .header .container > div {
     line-height: 58px; padding: 0 0.6rem;
     }
@@ -854,9 +832,6 @@ html, body {
     #content {
     top: 58px;
     }
-    #content.content-admin {
-    top: 108px;
-    }
 
     h3 {
     margin-bottom: 5px;
@@ -1559,16 +1534,6 @@ input.filelist-checkbox:checked+table.table-filelist {
     float: right;
 }
 
-.header.content-admin .user-menu {
-    position: absolute;
-    top: 63px;
-    z-index: 7;
-}
-
-#content.content-admin {
-    top: 110px;
-}
-
 .tr-actions .form-input {
     display: inline-block;
 }
@@ -1891,6 +1856,25 @@ span.tag {
     border: none;
     overflow: hidden;
 }
+#admin-header {
+	width: 100%;
+	display: inline-block;
+	border-bottom:none;
+	border-radius: 3px 3px 0 0;
+	word-spacing: -0.26em;
+    border: 1px solid #b3b3b3;
+}
+#admin-header .nav-btn {
+	display: inline-block;
+    vertical-align: middle;
+	height: 36px;
+    padding: 10px 14px;
+    text-decoration: initial;
+	border-right: 1px solid #b3b3b3;
+}
+#admin-header .nav-btn.active {
+	background: #e2e2e2;
+}
 
 /* Language specific CSS */
 
diff --git a/public/css/tomorrow.css b/public/css/tomorrow.css
index dc1bf900..628657cd 100644
--- a/public/css/tomorrow.css
+++ b/public/css/tomorrow.css
@@ -199,6 +199,18 @@ td.tr-le, .error-text {
    border-color: #ae875b;
 }
 
+#admin-header {
+    background: hsla(222, 5%, 16%, 0.85);
+    border-color: #141517;
+}
+#admin-header .nav-btn {
+    border-color: #141517;
+    color: #c5c8c6;
+}
+#admin-header .nav-btn.active {
+    border-color: #363a3e;
+}
+
 .torrent-preview-table>table {
     border-color: #141115;	
 }
diff --git a/templates/layouts/index_admin.jet.html b/templates/layouts/index_admin.jet.html
index ac1dc95e..0a6dad44 100644
--- a/templates/layouts/index_admin.jet.html
+++ b/templates/layouts/index_admin.jet.html
@@ -4,11 +4,10 @@
 
 {* We apply the menu in the base template *}
 {{ block menu()}}
-{{include "partials/menu/admin"}}
+{{include "partials/menu/site"}}
 {{end}}
 
-{* We add the class content for admin *}
-{{ block contclass()}}content-admin{{end}}
+{{ block contclass()}}{{end}}
 
 {* We add the mod panel title and the title block *}
 {{block titleBase()}} Moderation Panel - {{block title()}}{{end}}
@@ -16,6 +15,7 @@
 
 {* We add the mod panel search refine and the body block *}
 {{ block content_body_base()}}
+{{include "partials/menu/admin"}}
 {{ block content_body()}}
 {{end}}
 {{end}}
diff --git a/templates/layouts/partials/menu/admin.jet.html b/templates/layouts/partials/menu/admin.jet.html
index 15e0500e..f4cae2fc 100644
--- a/templates/layouts/partials/menu/admin.jet.html
+++ b/templates/layouts/partials/menu/admin.jet.html
@@ -1,55 +1,11 @@
-{{ import "layouts/partials/helpers/search" }}
-<div class="container">
-  <div class="h-left">
-    <div class="h-logo">
-      <a href="{{URL.Parse("/mod/")}}">
-        <img class="hide-md" src="/img/{{if Sukebei()}}sukebei_logo.png{{else}}logo.png{{end}}" alt="NyaaPantsu">
-        <img class="visible-md" src="/img/logo_s.png"/>
-      </a>
+    <div id="admin-header">
+      <a href="{{URL.Parse("/")}}" class="nav-btn">{{ T("nyaa_pantsu")}}</a>
+      <a href="{{URL.Parse("/mod/")}}" class="nav-btn{{if URL.String() == "/mod/"}} active{{end}}">{{ T("moderation")}}</a>
+      <a href="{{URL.Parse("/mod/torrents")}}" class="nav-btn{{if URL.String() == "/mod/torrents"}} active{{end}}">{{ T("torrents")}}</a>
+      <a href="{{URL.Parse("/mod/users")}}" class="nav-btn{{if URL.String() == "/mod/users"}} active{{end}}">{{ T("users")}}</a>
+      <a href="{{URL.Parse("/mod/comments")}}" class="nav-btn{{if URL.String() == "/mod/comments"}} active{{end}}">{{ T("comments")}}</a>
+      <a href="{{URL.Parse("/mod/oauth_client")}}" class="nav-btn{{if URL.String() == "/mod/oauth_client"}} active{{end}}">{{ T("oauth_clients_list")}}</a>
+      <a href="{{URL.Parse("/mod/announcement")}}" class="nav-btn{{if URL.String() == "/mod/announcement"}} active{{end}}">{{ T("announcements")}}</a>
+      <a href="{{URL.Parse("/mod/reports")}}" class="nav-btn{{if URL.String() == "/mod/reports"}} active{{end}}">{{ T("torrent_reports")}}</a>
+      <a href="{{URL.Parse("/mod/reassign")}}" class="nav-btn{{if URL.String() == "/mod/reassign"}} active{{end}}">{{ T("torrent_reassign")}}</a>
     </div>
-    <div class="h-nav">
-      <a href="{{URL.Parse("/")}}" class="nav-btn">
-        <span class="hide-md">{{ T("nyaa_pantsu")}}</span>
-      </a>
-      <a href="{{URL.Parse("/mod/torrents")}}" class="nav-btn">
-        <div class="visible-md icon-magnet"></div>
-        <span class="hide-md">{{ T("torrents")}}</span>
-      </a>
-      <a href="{{URL.Parse("/mod/users")}}" class="nav-btn">
-        <div class="visible-md icon-users"></div>
-        <span class="hide-md">{{ T("users")}}</span>
-      </a>
-      <a href="{{URL.Parse("/mod/comments")}}" class="nav-btn">
-        <div class="visible-md icon-chat"></div>
-        <span class="hide-md">{{ T("comments")}}</span>
-      </a>
-      <a href="{{URL.Parse("/mod/oauth_client")}}" class="nav-btn">
-        <div class="visible-md icon-chat"></div>
-        <span class="hide-md">{{ T("oauth_clients_list")}}</span>
-      </a>
-      <a href="{{URL.Parse("/mod/announcement")}}" class="nav-btn">
-        <div class="visible-md icon-chat"></div>
-        <span class="hide-md">{{ T("announcements")}}</span>
-      </a>
-      <a href="{{URL.Parse("/mod/reports")}}" class="nav-btn">
-        <div class="visible-md icon-attention"></div>
-        <span class="hide-md">{{ T("torrent_reports")}}</span>
-      </a>
-      <a href="{{URL.Parse("/mod/reassign")}}" class="nav-btn">
-        <div class="visible-md icon-user-plus"></div>
-        <span class="hide-md">{{ T("torrent_reassign")}}</span>
-      </a>
-    </div>
-  </div>
-  <div class="h-right">
-    {{ include "layouts/partials/helpers/badgemenu" }}
-
-  </div>
-  <div style="clear:both;"></div>
-    <div class="h-search">
-      <form role="search" action="{{URL.Parse("/mod/torrents")}}" method="get">
-        {{ yield search_common() }}
-        {{ yield search_button() }}
-      </form>
-    </div>
-</div>
diff --git a/templates/site/torrents/listing.jet.html b/templates/site/torrents/listing.jet.html
index 665938ff..539885c4 100644
--- a/templates/site/torrents/listing.jet.html
+++ b/templates/site/torrents/listing.jet.html
@@ -1,7 +1,7 @@
 {{ extends "layouts/index_site" }}
 {{ import "layouts/partials/helpers/search" }}
 {{block title()}}{{ T("home")}}{{end}}
-{{block contclass()}}{{if User.HasAdmin() }}content-admin{{end}}{{end}}
+{{block contclass()}}{{end}}
 {{block content_body()}}
 <!-- Contain the table within a grid, as for better sizing  -->
 <div class="results box">