diff --git a/UI/Templates/UIxTopnavToolbar.wox b/UI/Templates/UIxTopnavToolbar.wox
index f787fe0e9..3afc77f7f 100644
--- a/UI/Templates/UIxTopnavToolbar.wox
+++ b/UI/Templates/UIxTopnavToolbar.wox
@@ -26,58 +26,56 @@
     <p class="sg-md-display-3 sg-date-today hide show-gt-md" ng-bind="currentDay.day"><!-- day --></p>
   </div>
   <div class="md-toolbar-tools sg-toolbar-group-last" layout="row" layout-align="end center">
-    <div layout="row" layout-align="space-around start">
-      <md-button class="md-icon-button"
-                 ng-show="activeUser.path.calendar.length"
-                 ng-disabled="baseURL.endsWith('/Calendar/')"
-                 var:ng-click="navButtonClick"
-                 ng-href="{{activeUser.path.calendar}}">
-        <md-tooltip><var:string label:value="Calendar"/></md-tooltip>
-        <md-icon>event</md-icon>
-      </md-button>
-      <md-button class="md-icon-button"
-                 ng-disabled="baseURL.endsWith('/Contacts/')"
-                 var:ng-click="navButtonClick"
-                 ng-href="{{activeUser.path.contacts}}">
-        <md-icon>contacts</md-icon>
-        <md-tooltip><var:string label:value="Address Book"/></md-tooltip>
-      </md-button>
-      <md-button class="md-icon-button"
-                 ng-show="activeUser.path.mail.length"
-                 ng-disabled="baseURL.endsWith('/Mail/')"
-                 var:ng-click="navButtonClick"
-                 ng-href="{{activeUser.path.mail}}">
-        <md-icon>email</md-icon>
-        <var:if condition="userHasVacationEnabled">
-          <md-icon class="md-default-theme md-warn md-bg sg-icon--badge" label:aria-label="Vacation message is enabled">forward</md-icon>
-        </var:if>
-        <md-tooltip><var:string label:value="Mail"/></md-tooltip>
-      </md-button>
-      <md-button class="md-icon-button"
-                 ng-disabled="baseURL.endsWith('/Administration/')"
-                 ng-show="activeUser.isSuperUser"
-                 var:ng-click="navButtonClick"
-                 ng-href="{{activeUser.path.administration}}">
-        <md-icon>settings_applications</md-icon>
-        <md-tooltip><var:string label:value="Administration"/></md-tooltip>
-      </md-button>
-      <div class="hide-xs" style="width: 40px"
-           ng-show="activeUser.path.logoff.length"><!-- divider --></div>
-      <md-button class="md-icon-button"
-                 ng-show="activeUser.path.help.length"
-                 ng-href="{{activeUser.path.help}}"
-                 target="_blank">
-        <md-icon>help_outline</md-icon>
-        <md-tooltip><var:string label:value="Help"/></md-tooltip>
-      </md-button>
-      <md-button class="md-icon-button"
-                 ng-show="activeUser.path.logoff.length"
-                 var:ng-click="navButtonClick"
-                 ng-href="{{activeUser.path.logoff}}">
-        <md-icon>settings_power</md-icon>
-        <md-tooltip><var:string label:value="Disconnect"/></md-tooltip>
-      </md-button>
-    </div>
+    <md-button class="md-icon-button"
+               ng-show="activeUser.path.calendar.length"
+               ng-disabled="baseURL.endsWith('/Calendar/')"
+               var:ng-click="navButtonClick"
+               ng-href="{{activeUser.path.calendar}}">
+      <md-tooltip><var:string label:value="Calendar"/></md-tooltip>
+      <md-icon>event</md-icon>
+    </md-button>
+    <md-button class="md-icon-button"
+               ng-disabled="baseURL.endsWith('/Contacts/')"
+               var:ng-click="navButtonClick"
+               ng-href="{{activeUser.path.contacts}}">
+      <md-icon>contacts</md-icon>
+      <md-tooltip><var:string label:value="Address Book"/></md-tooltip>
+    </md-button>
+    <md-button class="md-icon-button"
+               ng-show="activeUser.path.mail.length"
+               ng-disabled="baseURL.endsWith('/Mail/')"
+               var:ng-click="navButtonClick"
+               ng-href="{{activeUser.path.mail}}">
+      <md-icon>email</md-icon>
+      <var:if condition="userHasVacationEnabled">
+        <md-icon class="md-default-theme md-warn md-bg sg-icon--badge" label:aria-label="Vacation message is enabled">forward</md-icon>
+      </var:if>
+      <md-tooltip><var:string label:value="Mail"/></md-tooltip>
+    </md-button>
+    <md-button class="md-icon-button"
+               ng-disabled="baseURL.endsWith('/Administration/')"
+               ng-show="activeUser.isSuperUser"
+               var:ng-click="navButtonClick"
+               ng-href="{{activeUser.path.administration}}">
+      <md-icon>settings_applications</md-icon>
+      <md-tooltip><var:string label:value="Administration"/></md-tooltip>
+    </md-button>
+    <div class="hide-xs" style="width: 40px"
+         ng-show="activeUser.path.logoff.length"><!-- divider --></div>
+    <md-button class="md-icon-button"
+               ng-show="activeUser.path.help.length"
+               ng-href="{{activeUser.path.help}}"
+               target="_blank">
+      <md-icon>help_outline</md-icon>
+      <md-tooltip><var:string label:value="Help"/></md-tooltip>
+    </md-button>
+    <md-button class="md-icon-button"
+               ng-show="activeUser.path.logoff.length"
+               var:ng-click="navButtonClick"
+               ng-href="{{activeUser.path.logoff}}">
+      <md-icon>settings_power</md-icon>
+      <md-tooltip><var:string label:value="Disconnect"/></md-tooltip>
+    </md-button>
   </div>
 
 </container>