diff --git a/js/apps/system/aardvark/frontend/js/templates/collectionsView.ejs b/js/apps/system/aardvark/frontend/js/templates/collectionsView.ejs
index 7d737cf701..37c7c5455a 100644
--- a/js/apps/system/aardvark/frontend/js/templates/collectionsView.ejs
+++ b/js/apps/system/aardvark/frontend/js/templates/collectionsView.ejs
@@ -2,7 +2,13 @@
   <div id="transparentHeader">
 
     <div class="pagination pagination-small pagination-right btn-group">
-      <ul><li class="enabled"><a id="collectionsToggle" class="arangoHeaderA"><span class="icon_arangodb_settings2" title="Settings"></span></a></li></ul>
+      <ul>
+        <li class="enabled">
+          <a id="collectionsToggle" class="headerButton">
+            <span class="icon_arangodb_settings2" title="Settings"></span>
+          </a>
+        </li>
+      </ul>
     </div>
 
     <div id="transparentPlaceholder">
diff --git a/js/apps/system/aardvark/frontend/js/templates/dashboardView.ejs b/js/apps/system/aardvark/frontend/js/templates/dashboardView.ejs
index fa1ef8923b..8438052ecd 100644
--- a/js/apps/system/aardvark/frontend/js/templates/dashboardView.ejs
+++ b/js/apps/system/aardvark/frontend/js/templates/dashboardView.ejs
@@ -1,11 +1,16 @@
 <ul class="thumbnails2">
-  <div id="dashboardHeader">
+  <div id="dashboardHeader" class="headerBar">
     <div class="pull-left">
       <a class="arangoHeader">Dashboard</a>
     </div>
-
-    <div class="pagination pagination-small pull-right btn-group">
-      <ul><li class="enabled"><a id="dashboardToggle" class="arangoHeaderA"><span class="icon_arangodb_settings2" title="Settings"></span></a></li></ul>
+    <div class="pagination pagination-small pull-right">
+      <ul>
+        <li class="enabled">
+          <a id="dashboardToggle" class="headerButton">
+            <span class="icon_arangodb_settings2" title="Settings"></span>
+          </a>
+        </li>
+      </ul>
     </div>
   </div>
 
diff --git a/js/apps/system/aardvark/frontend/js/templates/queryView.ejs b/js/apps/system/aardvark/frontend/js/templates/queryView.ejs
index 66d3a5a26c..f1d1bbfb54 100644
--- a/js/apps/system/aardvark/frontend/js/templates/queryView.ejs
+++ b/js/apps/system/aardvark/frontend/js/templates/queryView.ejs
@@ -1,8 +1,20 @@
 <ul class="thumbnails2">
   <div id="transparentHeader">
     <div class="pagination pagination-small pagination-right toolbarUL">
-      <ul><li class="enabled" style="visibility:hidden"><a id="aqlToggle" class="arangoHeaderA"><span class="glyphicon glyphicon-cog" title="Settings"></span></a></li></ul>
-      <ul><li class="enabled"><a id="editAQL" class="arangoHeaderA"><span class="icon_arangodb_checklist" title="Edit custom Queries"></span></a></li></ul>
+      <ul>
+        <li class="enabled" style="visibility:hidden">
+          <a id="aqlToggle" class="headerButton">
+            <span class="glyphicon glyphicon-cog" title="Settings"></span>
+          </a>
+        </li>
+      </ul>
+      <ul>
+        <li class="enabled">
+          <a id="editAQL" class="headerButton">
+            <span class="icon_arangodb_checklist" title="Edit custom Queries"></span>
+          </a>
+        </li>
+      </ul>
     </div>
     <a class="arangoHeader">AQL Editor</a>
   </div>