diff --git a/frontend/resources/styles/main/partials/modal.scss b/frontend/resources/styles/main/partials/modal.scss
index 92100c35e..f4b4429b2 100644
--- a/frontend/resources/styles/main/partials/modal.scss
+++ b/frontend/resources/styles/main/partials/modal.scss
@@ -59,7 +59,7 @@
 // NEW GEN MODALS
 
 .modal-container {
-  border-radius: 8px;
+  border-radius: $br-medium;
   display: flex;
   flex-direction: column;
   width: 448px;
@@ -78,10 +78,12 @@
   .modal-header-title {
     display: flex;
     align-items: center;
-    font-size: $fs24;
+    font-size: $fs18;
     padding-left: 16px;
 
     h2 {
+      font-size: $fs18;
+      font-weight: 400;
       margin: 0;
     }
   }
@@ -204,8 +206,9 @@
 }
 
 .libraries-dialog {
-  width: 920px;
+  border-radius: $br-medium;
   height: 664px;
+  width: 920px;
 
   .modal-content {
     display: flex;
@@ -319,9 +322,9 @@
     }
 
     .libraries-search {
-      border: 1px solid $color-gray-30;
+      border: 1px solid $color-gray-20;
       margin: $size-4;
-      padding: $x-small;
+      padding: $x-small $small;
       display: flex;
       align-items: center;
 
diff --git a/frontend/resources/styles/main/partials/viewer-header.scss b/frontend/resources/styles/main/partials/viewer-header.scss
index 219048f6b..4648e1c09 100644
--- a/frontend/resources/styles/main/partials/viewer-header.scss
+++ b/frontend/resources/styles/main/partials/viewer-header.scss
@@ -126,8 +126,8 @@
 
       svg {
         fill: $color-gray-20;
-        width: 24px;
-        height: 24px;
+        width: 20px;
+        height: 20px;
       }
 
       &.active {
diff --git a/frontend/src/app/main/ui/viewer/header.cljs b/frontend/src/app/main/ui/viewer/header.cljs
index 4992e4b95..62bcb539a 100644
--- a/frontend/src/app/main/ui/viewer/header.cljs
+++ b/frontend/src/app/main/ui/viewer/header.cljs
@@ -164,12 +164,12 @@
       [:span.counters (str (inc index) " / " total)]]
 
      [:div.mode-zone
-      [:button.mode-zone-button {:on-click #(when (not= screen :viewer)
+      [:button.mode-zone-button.tooltip.tooltip-bottom {:on-click #(when (not= screen :viewer)
                                               (change-screen :viewer))
-                                 :class (when (= screen :viewer) "active")} i/play]
-      [:button.mode-zone-button {:on-click #(when (not= screen :handoff)
+                                 :class (when (= screen :viewer) "active") :alt "View mode"} i/play]
+      [:button.mode-zone-button.tooltip.tooltip-bottom {:on-click #(when (not= screen :handoff)
                                               (change-screen :handoff))
-                                 :class (when (= screen :handoff) "active")} i/code]]
+                                 :class (when (= screen :handoff) "active") :alt "Code mode"} i/code]]
 
      [:div.options-zone
       [:& interactions-menu {:interactions-mode interactions-mode}]
diff --git a/frontend/src/app/main/ui/workspace/header.cljs b/frontend/src/app/main/ui/workspace/header.cljs
index 3ceaa5aaf..2ec8e2e0b 100644
--- a/frontend/src/app/main/ui/workspace/header.cljs
+++ b/frontend/src/app/main/ui/workspace/header.cljs
@@ -258,7 +258,7 @@
         :on-zoom-fit #(st/emit! dw/zoom-to-fit-all)
         :on-zoom-selected #(st/emit! dw/zoom-to-selected-shape)}]
 
-      [:a.btn-icon-dark.btn-small
+      [:a.btn-icon-dark.btn-small.tooltip.tooltip-bottom
        {;; :target "__blank"
         :alt (t locale "workspace.header.viewer")
         :href (str "#" view-url)} i/play]]]))