diff --git a/e107_core/templates/admin_template.php b/e107_core/templates/admin_template.php
index 24e48ad24..20c5db5cb 100644
--- a/e107_core/templates/admin_template.php
+++ b/e107_core/templates/admin_template.php
@@ -50,10 +50,10 @@ $ADMIN_TEMPLATE['nav']['button_active'] = '
 
 // Leave Admin Area. 
 $ADMIN_TEMPLATE['nav']['button_enav_home'] = '
-	<li class="dropdown">
-		<a class="dropdown-toggle" style="display:inline-block; margin-right:0;" title="'.ADLAN_53.'" href="'.e_HTTP.'" >
+	<li class="dropdown admin-nav-home">
+		<a class="dropdown-toggle nav-home-main" title="'.ADLAN_53.'" href="'.e_HTTP.'" >
 		 {LINK_IMAGE} {LINK_TEXT} 
-		 </a><a style="display:inline-block;border-left:0;margin-left:0;padding-left:4px;" class="dropdown-toggle" title="'.ADLAN_53.'" role="button" data-toggle="dropdown" data-target="#" href="{LINK_URL}" >
+		 </a><a class="dropdown-toggle nav-home-caret" title="'.ADLAN_53.'" role="button" data-toggle="dropdown" data-target="#" href="{LINK_URL}" >
 		 <b class="caret"></b>
 		</a>
 		{SUB_MENU}
@@ -62,7 +62,7 @@ $ADMIN_TEMPLATE['nav']['button_enav_home'] = '
 
 // Change Language
 $ADMIN_TEMPLATE['nav']['button_enav_language'] = '
-	<li class="dropdown">
+	<li class="dropdown admin-nav-language">
 		<a class="dropdown-toggle" title="'.LAN_CHANGE_LANGUAGE.'" role="button" data-toggle="dropdown" data-target="#" href="{LINK_URL}" >
 		  {LINK_TEXT} 
 		<b class="caret"></b>
diff --git a/e107_themes/bootstrap3/admin_style.css b/e107_themes/bootstrap3/admin_style.css
index 1f8683d55..00438ffb2 100644
--- a/e107_themes/bootstrap3/admin_style.css
+++ b/e107_themes/bootstrap3/admin_style.css
@@ -1930,6 +1930,9 @@ div.admin-left-panel-collapsed .nav-pills > li > a > span > i { opacity: 1 }
 .bootstrap-switch-on + .e-expandit-container { max-height:500px; overflow:hidden; transition:all 1s ease-in-out; }
 .bootstrap-switch-off + .e-expandit-container { max-height:0; overflow:hidden; transition: all 1s ease-in-out;  }
 
+.admin-nav-home .nav-home-main { display:inline-block; margin-right:0; padding-right:0}
+.admin-nav-home .nav-home-caret { display:inline-block;border-left:0; margin-left:0; padding-left:2px; }
+
 
 @media (min-width: 1101px ){
 .navbar-fixed-top { height: 51px; }
diff --git a/e107_themes/bootstrap3/css/modern-light.css b/e107_themes/bootstrap3/css/modern-light.css
index f08083bdd..d3e9eec62 100644
--- a/e107_themes/bootstrap3/css/modern-light.css
+++ b/e107_themes/bootstrap3/css/modern-light.css
@@ -669,7 +669,7 @@
         select[multiple],select[size]{height:auto}
         input[type=file]:focus,input[type=checkbox]:focus,input[type=radio]:focus{outline:-webkit-focus-ring-color auto 5px;outline-offset:-2px}
         output{padding-top:9px}
-        .form-control{width:100%;height:40px;padding:8px 12px;background-color:rgba(0,0,0,0.05);border:1px solid rgba(0,0,0,0.3);border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);-webkit-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;-o-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s}
+        .form-control{width:100%;height:40px;padding:8px 12px;background-color: #e6e6e6;;border:1px solid rgba(0,0,0,0.3);border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);-webkit-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;-o-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s}
         .form-control:focus{border-color:#66afe9;outline:0;}
         .form-control::-moz-placeholder{color:#999;opacity:1}
         .form-control:-ms-input-placeholder{color:#999}
@@ -1289,7 +1289,7 @@
         .tooltip.bottom{margin-top:3px;padding:5px 0}
         .tooltip.left{margin-left:-3px;padding:0 5px}
         .tooltip-inner{max-width:200px;padding:3px 8px;color:#fff;text-align:left;background-color:rgba(0,0,0,.9);border-radius:4px}
-        .popover,.popover-title{font-size:16px;background-color:#337ab7}
+        .popover,.popover-title{font-size:16px;background-color:#337ab7; color: white}
         .tooltip-arrow{position:absolute;width:0;height:0;border-color:transparent;border-style:solid}
         .tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-width:5px 5px 0;border-top-color:rgba(0,0,0,.9)}
         .tooltip.top-left .tooltip-arrow{right:5px}