diff --git a/js/apps/system/aardvark/frontend/js/graphViewer/ui/graphViewerUI.js b/js/apps/system/aardvark/frontend/js/graphViewer/ui/graphViewerUI.js
index 5fe31c0046..b6cf5f90d0 100644
--- a/js/apps/system/aardvark/frontend/js/graphViewer/ui/graphViewerUI.js
+++ b/js/apps/system/aardvark/frontend/js/graphViewer/ui/graphViewerUI.js
@@ -384,7 +384,7 @@ function GraphViewerUI(container, adapterConfig, optWidth, optHeight, viewerConf
       menubar.id = "menubar";
       menubar.className = "thumbnails2";
       
-      transparentHeader.className = "headerBar"
+      transparentHeader.className = "headerBar";
       
       buttons.id = "modifiers";
 
diff --git a/js/apps/system/aardvark/test/specs/graphViewer/specGraphViewer/graphViewerUISpec.js b/js/apps/system/aardvark/test/specs/graphViewer/specGraphViewer/graphViewerUISpec.js
index 23393a3cb4..b9505e67d4 100644
--- a/js/apps/system/aardvark/test/specs/graphViewer/specGraphViewer/graphViewerUISpec.js
+++ b/js/apps/system/aardvark/test/specs/graphViewer/specGraphViewer/graphViewerUISpec.js
@@ -182,17 +182,18 @@
       });
       
       it('should contain a position for the layout buttons', function() {
-        expect($("#contentDiv #menubar #modifiers").length).toEqual(1);
-        expect($("#contentDiv #menubar #modifiers")[0].className).toEqual("pull-right");
+        var buttonBar = $("#contentDiv #menubar #modifiers");
+        expect(buttonBar.length).toEqual(1);
+        expect(buttonBar).toBeOfClass("headerButtonBar");
+        expect(buttonBar).toBeOfClass("pull-right");
       });
       
       it('should contain a general configure menu', function() {
         var menuSelector = "#contentDiv #menubar #configuremenu",
           dropDownSelector = "#configureDropdown .dropdownInner ul";
         expect($(menuSelector).length).toEqual(1);
-        expect($("span", menuSelector).attr("data-original-title")).toEqual("Configure");
-        expect($("span", menuSelector)).toBeOfClass("glyphicon");
-        expect($("span", menuSelector)).toBeOfClass("glyphicon-cog");
+        expect($("span", menuSelector).attr("title")).toEqual("Configure");
+        expect($("span", menuSelector)).toBeOfClass("arangodb_icon_settings2");
         expect($(dropDownSelector +  " #control_adapter_collections").length).toEqual(1);
         expect($(dropDownSelector +  " #control_node_labelandcolourlist").length).toEqual(1);
         expect($(dropDownSelector +  " #control_adapter_priority").length).toEqual(1);