diff --git a/frontend/resources/styles/main/partials/workspace-bar.scss b/frontend/resources/styles/main/partials/workspace-bar.scss
index 7295c8a03..de1c2794f 100644
--- a/frontend/resources/styles/main/partials/workspace-bar.scss
+++ b/frontend/resources/styles/main/partials/workspace-bar.scss
@@ -134,25 +134,6 @@
 
         }
 
-        &.view-mode {
-          background-color: $intense-ui-icons;
-
-          svg {
-            fill: $secondary-ui-bg;
-          }
-
-          &:hover {
-            background-color: $color-white;
-            border-color: $soft-ui-border;
-
-            svg {
-              fill: $intense-ui-icons;
-            }
-
-          }
-
-        }
-
       }
 
     }
@@ -282,6 +263,46 @@
 
 }
 
+.secondary-options {
+  align-items: center;
+  display: flex;
+
+  .view-mode {
+    background-color: $intense-ui-icons;
+    align-items: center;
+    border-radius: $br-small;
+    cursor: pointer;
+    display: flex;
+    flex-shrink: 0;
+    height: 30px;
+    justify-content: center;
+    margin: 0 $small;
+    position: relative;
+    width: 30px;
+
+    a {
+      padding-top: 6px;
+    }
+
+    svg {
+      fill: $secondary-ui-bg;
+      height: 18px;
+      width: 18px;
+    }
+
+    &:hover {
+      background-color: $main-ui-color;
+
+      svg {
+        fill: $soft-ui-icons;
+      }
+
+    }
+
+  }
+
+}
+
 .user-multi {
   align-items: center;
   cursor: pointer;
diff --git a/frontend/src/uxbox/main/ui/workspace/header.cljs b/frontend/src/uxbox/main/ui/workspace/header.cljs
index f3aa5fffa..7181e5b8e 100644
--- a/frontend/src/uxbox/main/ui/workspace/header.cljs
+++ b/frontend/src/uxbox/main/ui/workspace/header.cljs
@@ -176,16 +176,16 @@
         {:alt (tr "header.grid-snap")
          :class (when (contains? flags :grid-snap) "selected")
          :on-click (partial toggle :grid-snap)}
-        i/grid-snap]]
+        i/grid-snap]]]
       ;; [:li.tooltip.tooltip-bottom
       ;; {:alt (tr "header.align")}
       ;; i/alignment]]
-      [:ul.options-btn
-       [:li.tooltip.tooltip-bottom.view-mode
-        {:alt (tr "header.view-mode")
+     ;;[:& user]
+     [:div.secondary-options
+       [:& zoom-widget]
+       [:a.tooltip.tooltip-bottom.view-mode
+       {:alt (tr "header.view-mode")
          ;; :on-click #(st/emit! (dw/->OpenView (:id page)))
          }
-        i/play]]]
-     ;;[:& user]
-     [:& zoom-widget]
+       i/play]]
      ]))