diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css
index dedad0d23..05fcd922e 100644
--- a/view/theme/frio/css/style.css
+++ b/view/theme/frio/css/style.css
@@ -2189,6 +2189,12 @@ ul.tabs li:hover,
 ul.tabs li.active {
 	border-bottom-width: 4px;
 }
+.tabbar.visible-xs .tabs-extended {
+	padding-top: 0;
+}
+#dropdownMenuTools-xs {
+	padding: 9px 10px;
+}
 ul.tabbar ul.tabs-extended:hover li.dropdown {
 	border-bottom: 0;
 }
diff --git a/view/theme/frio/templates/common_tabs.tpl b/view/theme/frio/templates/common_tabs.tpl
index 27ae11686..0f95d1a54 100644
--- a/view/theme/frio/templates/common_tabs.tpl
+++ b/view/theme/frio/templates/common_tabs.tpl
@@ -1,13 +1,17 @@
-
 <div class="tabbar-wrapper">
 	{{* Tab navigation bar for tablets and computer *}}
 	<ul role="menubar" class="tabbar list-inline visible-lg visible-md visible-sm hidden-xs">
 		{{* The normal tabbar *}}
 		<li>
-			<ul class="tabs flex-nav" role="menu" >
-			{{foreach $tabs as $tab}}
-				<li id="{{$tab.id}}" role="presentation" {{if $tab.sel}} class="{{$tab.sel}}" {{/if}}><a role="menuitem" href="{{$tab.url}}" {{if $tab.accesskey}}accesskey="{{$tab.accesskey}}"{{/if}} {{if $tab.title}} title="{{$tab.title}}"{{/if}}>{{$tab.label}}</a></li>
-			{{/foreach}}
+			<ul class="tabs flex-nav" role="menu">
+				{{foreach $tabs as $tab}}
+					<li id="{{$tab.id}}" role="presentation" {{if $tab.sel}} class="{{$tab.sel}}" {{/if}}>
+						<a role="menuitem" href="{{$tab.url}}" {{if $tab.accesskey}}accesskey="{{$tab.accesskey}}" {{/if}}
+							{{if $tab.title}} title="{{$tab.title}}" {{/if}}>
+							{{$tab.label}}
+						</a>
+					</li>
+				{{/foreach}}
 			</ul>
 		</li>
 
@@ -16,11 +20,12 @@
 		<li class="pull-right">
 			<ul class="tabs tabs-extended" role="menu">
 				<li role="presentation" class="dropdown flex-target">
-					<button type="button" class="btn-link dropdown-toggle" id="dropdownMenuTools" data-toggle="dropdown" aria-expanded="false">
+					<button type="button" class="btn-link dropdown-toggle" id="dropdownMenuTools" data-toggle="dropdown"
+						aria-expanded="false">
 						<i class="fa fa-chevron-down" aria-hidden="true"></i>
 					</button>
 				</li>
-			 </ul>
+			</ul>
 		</li>
 	</ul>
 
@@ -31,24 +36,33 @@
 			<ul class="tabs" role="menu">
 				{{foreach $tabs as $tab}}
 					{{if $tab.sel}}
-					<li id="{{$tab.id}}-xs" role="presentation" {{if $tab.sel}} class="{{$tab.sel}}" {{/if}}><a role="menuitem" href="{{$tab.url}}" {{if $tab.title}} title="{{$tab.title}}"{{/if}}>{{$tab.label}}</a></li>
+						<li id="{{$tab.id}}-xs" role="presentation" {{if $tab.sel}} class="{{$tab.sel}}" {{/if}}>
+							<a role="menuitem" href="{{$tab.url}}" {{if $tab.title}} title="{{$tab.title}}" {{/if}}>
+								{{$tab.label}}
+							</a>
+						</li>
 					{{else}}
-					{{$exttabs[]=$tab}}
+						{{$exttabs[]=$tab}}
 					{{/if}}
 				{{/foreach}}
 			</ul>
 		</li>
 
 		{{* All others are moved to this dropdown menu *}}
-		<li class="pull-right">
+		<li>
 			<ul class="tabs tabs-extended">
 				<li class="dropdown">
-					<button type="button" class="btn-link dropdown-toggle" id="dropdownMenuTools-xs" data-toggle="dropdown" aria-expanded="false">
+					<button type="button" class="btn-link dropdown-toggle" id="dropdownMenuTools-xs"
+						data-toggle="dropdown" aria-expanded="false">
 						<i class="fa fa-chevron-down" aria-hidden="true"></i>
 					</button>
-					<ul class="dropdown-menu pull-right" role="menu" aria-labelledby="dropdownMenuTools">
+					<ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenuTools">
 						{{foreach $exttabs as $tab}}
-						<li id="{{$tab.id}}-xs" role="presentation" {{if $tab.sel}} class="{{$tab.sel}}" {{/if}}><a role="menuitem" href="{{$tab.url}}" {{if $tab.title}} title="{{$tab.title}}"{{/if}}>{{$tab.label}}</a></li>
+							<li id="{{$tab.id}}-xs" role="presentation" {{if $tab.sel}} class="{{$tab.sel}}" {{/if}}>
+								<a role="menuitem" href="{{$tab.url}}" {{if $tab.title}} title="{{$tab.title}}" {{/if}}>
+									{{$tab.label}}
+								</a>
+							</li>
 						{{/foreach}}
 					</ul>
 				</li>