diff --git a/frontend/src/app/main/ui/workspace.scss b/frontend/src/app/main/ui/workspace.scss
index b15b47f5e..ab26cbdbb 100644
--- a/frontend/src/app/main/ui/workspace.scss
+++ b/frontend/src/app/main/ui/workspace.scss
@@ -34,7 +34,7 @@
     justify-content: center;
     align-items: center;
     grid-area: viewport;
-    svg {
+    :global(svg#loader-pencil) {
       fill: var(--icon-foreground);
     }
   }
diff --git a/frontend/src/app/main/ui/workspace/left_header.cljs b/frontend/src/app/main/ui/workspace/left_header.cljs
index 5c3a70532..6cac41258 100644
--- a/frontend/src/app/main/ui/workspace/left_header.cljs
+++ b/frontend/src/app/main/ui/workspace/left_header.cljs
@@ -819,7 +819,6 @@
        {:class (stl/css :project-name)
         :on-click nav-to-project}
        (:name project)]
-
       (if ^boolean editing?
         [:input
          {:class (stl/css :file-name-input)
@@ -833,9 +832,9 @@
          {:class (stl/css :file-name)
           :title file-name
           :on-double-click start-editing-name}
-         file-name])
-      (when ^boolean shared?
-        [:div {:class (stl/css :shared-badge)} i/library-refactor])]
+         file-name])]
+     (when ^boolean shared?
+       [:span {:class (stl/css :shared-badge)} i/library-refactor])
      [:div {:class (stl/css :menu-section)}
       [:& menu {:layout layout
                 :file file
diff --git a/frontend/src/app/main/ui/workspace/left_header.scss b/frontend/src/app/main/ui/workspace/left_header.scss
index b85729050..d7318bbe1 100644
--- a/frontend/src/app/main/ui/workspace/left_header.scss
+++ b/frontend/src/app/main/ui/workspace/left_header.scss
@@ -60,14 +60,16 @@
   }
   .shared-badge {
     @include flexCenter;
-    width: $s-32;
+    width: $s-16;
     height: $s-32;
+    margin-right: $s-4;
     svg {
-      height: $s-28;
-      width: $s-28;
+      stroke: var(--button-secondary-foreground-color-rest);
+      fill: none;
+      height: $s-16;
+      width: $s-16;
     }
   }
-
   .menu-btn {
     @extend .button-tertiary;
     height: $s-32;
diff --git a/frontend/src/app/main/ui/workspace/right_header.cljs b/frontend/src/app/main/ui/workspace/right_header.cljs
index 80ff56c66..2ff54d9bf 100644
--- a/frontend/src/app/main/ui/workspace/right_header.cljs
+++ b/frontend/src/app/main/ui/workspace/right_header.cljs
@@ -119,7 +119,6 @@
                    :on-click on-increase}
           [:span {:class (stl/css :zoom-icon)}
            i/add-refactor]]]
-
         [:button {:class (stl/css :reset-btn)
                   :on-click on-zoom-reset}
          (tr "workspace.header.reset-zoom")]]
@@ -128,13 +127,15 @@
         (tr "workspace.header.zoom-fit-all")
         [:span {:class (stl/css :shortcuts)}
          (for [sc (scd/split-sc (sc/get-tooltip :fit-all))]
-           [:span {:class (dom/classnames (stl/css :shortcut-key) true)} sc])]]
+           [:span {:class (dom/classnames (stl/css :shortcut-key) true)
+                   :key (str "zoom-fit-" sc)} sc])]]
        [:li {:class (stl/css :zoom-option)
              :on-click on-zoom-selected}
         (tr "workspace.header.zoom-selected")
         [:span {:class (stl/css :shortcuts)}
          (for [sc (scd/split-sc (sc/get-tooltip :zoom-selected))]
-           [:span {:class (dom/classnames (stl/css :shortcut-key) true)} sc])]]]]]))
+           [:span {:class (dom/classnames (stl/css :shortcut-key) true)
+                   :key (str "zoom-selected-" sc)} sc])]]]]]))
 
 ;; --- Header Component
 
diff --git a/frontend/src/app/main/ui/workspace/sidebar.scss b/frontend/src/app/main/ui/workspace/sidebar.scss
index b7b95448b..49aade146 100644
--- a/frontend/src/app/main/ui/workspace/sidebar.scss
+++ b/frontend/src/app/main/ui/workspace/sidebar.scss
@@ -30,7 +30,7 @@ $width-settings-bar-max: $s-500;
     display: grid;
     grid-template-columns: 100%;
     grid-template-rows: 100%;
-    height: calc(100% - 50px);
+    height: calc(100vh - $s-52);
     .tabs-wrapper {
       .layers-tab {
         display: grid;