diff --git a/frontend/resources/styles/common/framework.scss b/frontend/resources/styles/common/framework.scss
index 529a19b77..257ea2e31 100644
--- a/frontend/resources/styles/common/framework.scss
+++ b/frontend/resources/styles/common/framework.scss
@@ -914,9 +914,12 @@ input[type="range"]:focus::-ms-fill-upper {
   height: 8px;
   width: 8px;
 }
-::-webkit-scrollbar-track {
+
+::-webkit-scrollbar-track,
+::-webkit-scrollbar-corner {
   background-color: transparent;
 }
+
 ::-webkit-scrollbar-thumb {
   background-color: $color-gray-20;
 
diff --git a/frontend/resources/styles/common/refactor/common-refactor.scss b/frontend/resources/styles/common/refactor/common-refactor.scss
index 3149fc6cc..c2297c66b 100644
--- a/frontend/resources/styles/common/refactor/common-refactor.scss
+++ b/frontend/resources/styles/common/refactor/common-refactor.scss
@@ -16,23 +16,3 @@
 @import "common/refactor/z-index.scss";
 @import "common/refactor/mixins.scss";
 @import "common/refactor/basic-rules.scss";
-
-::-webkit-scrollbar {
-  background-color: transparent;
-  cursor: pointer;
-  height: $s-8;
-  width: $s-12;
-}
-::-webkit-scrollbar-track {
-  background-color: transparent;
-}
-::-webkit-scrollbar-thumb {
-  background-color: rgba(170, 181, 186, 0.3);
-  background-clip: content-box;
-  border: $s-2 solid transparent;
-  border-radius: $br-8;
-  &:hover {
-    background-color: rgba(170, 181, 186, 0.7);
-    outline: none;
-  }
-}
diff --git a/frontend/resources/styles/common/refactor/fonts.scss b/frontend/resources/styles/common/refactor/fonts.scss
index 6bd7533c1..d60499e2d 100644
--- a/frontend/resources/styles/common/refactor/fonts.scss
+++ b/frontend/resources/styles/common/refactor/fonts.scss
@@ -29,11 +29,3 @@ $fs-44: math.div(44, $fs-base) + rem;
 $fw400: 400; // Regular (CSS value: 'normal')
 $fw500: 500; // Medium
 $fw700: 700; // Bold (CSS value: 'bold')
-
-// Work Sans
-@include font-face("worksans", "WorkSans-Regular", normal);
-@include font-face("worksans", "WorkSans-Medium", "500");
-@include font-face("worksans", "WorkSans-Bold", bold);
-
-// Space mono
-@include font-face("spacemono", "SpaceMono-Regular", normal);
diff --git a/frontend/resources/styles/common/refactor/spacing.scss b/frontend/resources/styles/common/refactor/spacing.scss
index d61d82664..81180d27d 100644
--- a/frontend/resources/styles/common/refactor/spacing.scss
+++ b/frontend/resources/styles/common/refactor/spacing.scss
@@ -6,11 +6,6 @@
 
 @use "sass:math";
 
-:root {
-  --s-4: 0.25rem;
-  --layer-indentation-size: calc(var(--s-4) * 5);
-}
-
 $s-0: 0px;
 $s-2: math.div(0.25rem, 2);
 $s-4: var(--s-4);
diff --git a/frontend/src/app/main/ui/workspace.cljs b/frontend/src/app/main/ui/workspace.cljs
index 65f66f16b..090fd7f75 100644
--- a/frontend/src/app/main/ui/workspace.cljs
+++ b/frontend/src/app/main/ui/workspace.cljs
@@ -5,6 +5,7 @@
 ;; Copyright (c) KALEIDOS INC
 
 (ns app.main.ui.workspace
+  (:require-macros [app.main.style :refer [css]])
   (:require
    [app.common.data.macros :as dm]
    [app.main.data.modal :as modal]
@@ -193,7 +194,8 @@
         [:& (mf/provider ctx/components-v2) {:value components-v2?}
          [:& (mf/provider ctx/new-css-system) {:value new-css?}
           [:& (mf/provider ctx/workspace-read-only?) {:value read-only?}
-           [:section#workspace {:style {:background-color background-color
+           [:section#workspace {:class (when new-css? (css :workspace))
+                                :style {:background-color background-color
                                         :touch-action "none"}}
             (when (not (:hide-ui layout))
               [:& header {:file file
diff --git a/frontend/src/app/main/ui/workspace.css.json b/frontend/src/app/main/ui/workspace.css.json
new file mode 100644
index 000000000..f37e8f34f
--- /dev/null
+++ b/frontend/src/app/main/ui/workspace.css.json
@@ -0,0 +1 @@
+{"button-primary":"ui_workspace_button-primary_FZJ-T","button-secondary":"ui_workspace_button-secondary_oDzCJ","button-icon":"ui_workspace_button-icon_L5y8h","button-icon-small":"ui_workspace_button-icon-small_Ppp3W","workspace":"ui_workspace_workspace_xutJr"}
\ No newline at end of file
diff --git a/frontend/src/app/main/ui/workspace.scss b/frontend/src/app/main/ui/workspace.scss
new file mode 100644
index 000000000..251aa975a
--- /dev/null
+++ b/frontend/src/app/main/ui/workspace.scss
@@ -0,0 +1,38 @@
+@import "refactor/common-refactor.scss";
+
+// Work Sans
+@include font-face("worksans", "WorkSans-Regular", normal);
+@include font-face("worksans", "WorkSans-Medium", "500");
+@include font-face("worksans", "WorkSans-Bold", bold);
+
+// Space mono
+@include font-face("spacemono", "SpaceMono-Regular", normal);
+
+:global(:root) {
+  --s-4: 0.25rem;
+  --layer-indentation-size: calc(var(--s-4) * 5);
+}
+
+.workspace {
+  ::-webkit-scrollbar {
+    background-color: transparent;
+    cursor: pointer;
+    height: $s-12;
+    width: $s-12;
+  }
+  ::-webkit-scrollbar-track,
+  ::-webkit-scrollbar-corner {
+    background-color: transparent;
+  }
+
+  ::-webkit-scrollbar-thumb {
+    background-color: rgba(170, 181, 186, 0.3);
+    background-clip: content-box;
+    border: $s-2 solid transparent;
+    border-radius: $br-8;
+    &:hover {
+      background-color: rgba(170, 181, 186, 0.7);
+      outline: none;
+    }
+  }
+}