diff --git a/upload/styles/cb_27/layout/header.html b/upload/styles/cb_27/layout/header.html
index aa01ac11..80c9bbef 100644
--- a/upload/styles/cb_27/layout/header.html
+++ b/upload/styles/cb_27/layout/header.html
@@ -98,7 +98,7 @@
         <!-- Shown to small devices only Start-->
         <form id="search" class="navbar-form navbar-search navbar-left" name="search" method="get" role="search" action="{link name='search_result'}">
 
-            <div class="input-group cbsearchtype">
+            <div class="input-group mtxs cbsearchtype">
                 <input type="text" class="form-control" name="query" value="{'query'|get_form_val:true}" id="query">
                 <div class="input-group-btn">
                     <input tabindex="-1" type="submit" name="cbsearch" id="cbsearch" value="{lang code='Go'}" class="btn btn-default" />
@@ -145,15 +145,13 @@
                     <li><a href="{link name='my_account' }{userid}">{lang code="my_account"}</a></li>
                     <li><a href="{link name='my_videos'}">{lang code="Manage Videos"}</a></li>
                     <li><a href="{link name='channels'}">{lang code="View Channels"}</a></li>
-<!--                         <li><a href="{link name='upload'}">{lang code="Upload"}</a></li> -->
-
                     <li class="divider"></li>
                     <li><a href="{link name='logout'}">{lang code="Logout"}</a></li>
                 </ul>
             </li>
             {else}
             <li>
-                <div>
+                <div class="mrl">
                     <a href="{link name='signup'}" class="btn btn-primary btn-success btn-sm">{lang code="Create Account"}</a>
                     <a href="#" data-toggle="modal" data-target="#login-modal" class="btn btn-primary btn-sm">{lang code="Login"}</a>
                 </div>
@@ -222,10 +220,28 @@
             
                 </form>
             </div>
-            {if !userid()}
-            <li class="fix-md-user-icon"><a class="" data-target="#login-modal" data-toggle="modal" href="#"><i class="glyphicon glyphicon-user"></i></a></li>
+            {if userid()}
+            <li class="dropdown myaccount-dd">
+                <span class="dropdown-toggle theme_color col-md-12" data-toggle="dropdown"><img class="img-circle" src="{$userquery->getUserThumb('','small',userid())}" style="width: 40px; height: 40px;"/><b class="caret"></b></span>
+                <ul class="dropdown-menu">
+
+                    {if has_access('admin_access')}
+                        <li><a href="{$admin_baseurl}">{lang code="Admin area"}</a></li>
+                    {/if}
+                    <li><a href="{link name='my_account' }{userid}">{lang code="my_account"}</a></li>
+                    <li><a href="{link name='my_videos'}">{lang code="Manage Videos"}</a></li>
+                    <li><a href="{link name='channels'}">{lang code="View Channels"}</a></li>
+                    <li class="divider"></li>
+                    <li><a href="{link name='logout'}">{lang code="Logout"}</a></li>
+                </ul>
+            </li>
             {else}
-            <li  class="fix-md-user-icon"><a class="no-padding" href="{link name='logout'}" title="{lang('logout')}"><i class="glyphicon glyphicon-user"></i></a></li>
+            <li>
+                <div class="">
+                    <a href="#" data-toggle="modal" data-target="#login-modal" class="btn btn-primary btn-sm">{lang code="Login"}</a>
+                </div>
+
+            </li>
             {/if}
             
 
diff --git a/upload/styles/cb_27/theme/css/header.css b/upload/styles/cb_27/theme/css/header.css
index b72afbba..a95afc5a 100644
--- a/upload/styles/cb_27/theme/css/header.css
+++ b/upload/styles/cb_27/theme/css/header.css
@@ -45,7 +45,7 @@
 
 .left-margin-xero{ margin-left: 0px !important;}
 
-.mrxll{ margin-right: 50px;}
+.mrxll{ margin-right: 5px;}
 .form-small{
   position: absolute;
   right:0%;
@@ -78,7 +78,7 @@
 .upload-dropdown-btn-d{
   position: absolute;
   top:0;
-  right: 140px;
+  right: 114px;
 }
 .upload-btn-pad{ padding:3px 5px !important; }
 .navbar-collapse.manual-height{
@@ -93,10 +93,6 @@
     display:none;
 }
 }
-@media (min-width: 768px) and (max-width:980px) {
-}
-}
-
 @media (min-width: 768px) and (max-width:900px) {
 .upload-vid-photo-icon {
     background-image: url("../../images/h-upload-icon.png");
@@ -110,6 +106,12 @@
 .upload-dropdown-btn-d{
   position: absolute;
   top:1px;
-  right:88px;
+  right:108px;
+}
+.mrxll{ margin-right:0px;}
+}
+@media (min-width: 768px) and (max-width:786px) {
+.navbar-nav > li > a{ 
+    padding:15px 10px; 
 }
 }
\ No newline at end of file