diff --git a/app/assets/javascripts/app/views/agent_ticket_view/navbar.jst.eco b/app/assets/javascripts/app/views/agent_ticket_view/navbar.jst.eco
index bd944ae07..f3d4eb867 100644
--- a/app/assets/javascripts/app/views/agent_ticket_view/navbar.jst.eco
+++ b/app/assets/javascripts/app/views/agent_ticket_view/navbar.jst.eco
@@ -1,7 +1,12 @@
 <ul class="nav nav-pills nav-stacked">
   <% if @items: %>
     <% for item in @items: %>
-      <li <% if item.active: %>class="active"<% end %>><a href="<%= item.target %>"><span class="local"><%- @T(item.name) %></span><span class="badge pull-right"><%= item.count %></span></a></li>
+      <li <% if item.active: %>class="active"<% end %>>
+        <a class="horizontal center" href="<%= item.target %>">
+          <span class="local contain-text"><%- @T(item.name) %></span>
+          <span class="badge"><%= item.count %></span>
+        </a>
+      </li>
     <% end %>
   <% end %>
 </ul>
diff --git a/app/assets/javascripts/app/views/dashboard/ticket.jst.eco b/app/assets/javascripts/app/views/dashboard/ticket.jst.eco
index ccf04b71a..91cb33b69 100644
--- a/app/assets/javascripts/app/views/dashboard/ticket.jst.eco
+++ b/app/assets/javascripts/app/views/dashboard/ticket.jst.eco
@@ -1,5 +1,5 @@
 <div>
-  <div class="page-header horizontal">
+  <div class="horizontal">
     <div class="page-header-title">
       <h2 class="can-move"><%- @T( @overview.name ) %> <small><a href="#" data-type="settings" class="glyphicon glyphicon-edit"></a></small></h2>
     </div>
diff --git a/app/assets/stylesheets/zzz.css.erb b/app/assets/stylesheets/zzz.css.erb
index 227f2b98f..c6d3d9a06 100644
--- a/app/assets/stylesheets/zzz.css.erb
+++ b/app/assets/stylesheets/zzz.css.erb
@@ -576,8 +576,12 @@ label {
   margin-bottom: 15px;
 }
 
+.page-header-title h2 {
+  margin-top: 10px;
+}
+
 .page-header-meta {
-  margin-top: 18px;
+  margin-top: 5px;
   margin-left: auto;
 }
 
@@ -990,7 +994,7 @@ ol.tabs li {
   }
 
   .twitter.channel.icon {
-    background-position: -68px -141px;
+    background-position: -67px -141px;
   }
 
   .gray.email.channel.icon {
@@ -1913,13 +1917,19 @@ footer {
 }
 
 .sidebar {
-  width: 270px;
-  padding: 1px 20px 20px;
+  width: 32%;
+  max-width: 353px;
+  padding: 20px;
   background: white;
   border-right: 1px solid #e6e6e6;
   overflow: auto;
 }
 
+.NavBarAdmin.sidebar {
+  padding-top: 1px;
+  width: 270px;
+}
+
   .nav-stacked > li + li {
     margin-top: 0;
   }
@@ -1961,6 +1971,29 @@ footer {
     margin-right: -10px;
   }
 
+  .sidebar:not(.NavBarAdmin) .nav-pills > li:first-child > a {
+    border-top: none;
+  }
+
+  .badge {
+    padding: 0;
+    font-size: inherit;
+    font-weight: normal;
+    color: #d0d2d3;
+    background: none;
+    border-radius: 0;
+  }
+
+  .nav-pills > li > a > .badge {
+    margin-left: auto;
+  }
+
+  a.list-group-item.active > .badge, 
+  .nav-pills > .active > a > .badge {
+    color: #96969b;
+    background: none;
+  }
+
 .main {
   padding: 10px 20px;
   background: #f8f9fa;
@@ -2038,7 +2071,7 @@ footer {
   }
 
 .stat-widgets {
-  margin: 0 -7px;
+  margin: 0 -7px 20px;
 }
 
   .stat-widget {