diff --git a/js/apps/system/aardvark/test/specs/graphViewer/helper/uiMatchers.js b/js/apps/system/aardvark/test/specs/graphViewer/helper/uiMatchers.js
index c9a6166292..7a5ad0456d 100644
--- a/js/apps/system/aardvark/test/specs/graphViewer/helper/uiMatchers.js
+++ b/js/apps/system/aardvark/test/specs/graphViewer/helper/uiMatchers.js
@@ -92,9 +92,8 @@ var uiMatchers = uiMatchers || {};
         expect(box).toBeOfClass("btn-group-vertical");
         expect(box).toBeOfClass("toolbox");
         _.each(box.children, function(btn) {
-          expect(btn).toBeTag("button");
-          expect(btn).toBeOfClass("btn");
-          expect(btn).toBeOfClass("btn-icon");
+          expect(btn).toBeTag("div");
+          expect(btn).toBeOfClass("gv_action_button");
         });
         return true;
       },
diff --git a/js/apps/system/aardvark/test/specs/graphViewer/specEvents/eventDispatcherUISpec.js b/js/apps/system/aardvark/test/specs/graphViewer/specEvents/eventDispatcherUISpec.js
index 7c367a531e..57b860715f 100644
--- a/js/apps/system/aardvark/test/specs/graphViewer/specEvents/eventDispatcherUISpec.js
+++ b/js/apps/system/aardvark/test/specs/graphViewer/specEvents/eventDispatcherUISpec.js
@@ -179,13 +179,18 @@
       this.addMatchers({
         toConformToToolbox: function() {
           var box = this.actual,
+            icon = $("h6", $(box))[0],
+            title = $("h6", $(box))[1],
             foundActive = false,
             failed = false;
           _.each(box.children, function(btn) {
-            expect(btn).toBeTag("button");
-            expect(btn).toBeOfClass("btn btn-icon");
-            expect(btn).toBeOfClass("btn-icon");
-            expect(btn).toBeOfClass("gv-icon-btn");
+            expect(btn).toBeTag("div");
+            expect(btn).toBeOfClass("gv_action_button");
+            expect(icon).toBeTag("h6");
+            expect(icon).toBeOfClass("fa");
+            expect(icon).toBeOfClass("gv_icon_icon");
+            expect(title).toBeTag("h6");
+            expect(title).toBeOfClass("gv_button_title");
             if ($(btn).hasClass("active")) {
               if (foundActive) {
                 failed = true;