diff --git a/frontend/src/app/main/ui/workspace.cljs b/frontend/src/app/main/ui/workspace.cljs
index 5e4a5dc6cd..d291a8e8aa 100644
--- a/frontend/src/app/main/ui/workspace.cljs
+++ b/frontend/src/app/main/ui/workspace.cljs
@@ -35,7 +35,7 @@
    [app.main.ui.workspace.tokens.modals]
    [app.main.ui.workspace.tokens.modals.export]
    [app.main.ui.workspace.tokens.modals.import]
-   [app.main.ui.workspace.tokens.modals.settings]
+   [app.main.ui.workspace.tokens.settings]
    [app.main.ui.workspace.tokens.themes.create-modal]
    [app.main.ui.workspace.viewport :refer [viewport*]]
    [app.util.debug :as dbg]
diff --git a/frontend/src/app/main/ui/workspace/tokens/settings.cljs b/frontend/src/app/main/ui/workspace/tokens/settings.cljs
new file mode 100644
index 0000000000..e5b77ce90b
--- /dev/null
+++ b/frontend/src/app/main/ui/workspace/tokens/settings.cljs
@@ -0,0 +1,17 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) KALEIDOS INC
+
+(ns app.main.ui.workspace.tokens.settings
+  (:require
+   [app.main.data.modal :as modal]
+   [app.main.ui.workspace.tokens.settings.menu :refer [token-settings*]]
+   [rumext.v2 :as mf]))
+
+(mf/defc token-settings-modal*
+  {::mf/register modal/components
+   ::mf/register-as :tokens/settings}
+  []
+  [:> token-settings*])
diff --git a/frontend/src/app/main/ui/workspace/tokens/modals/settings.cljs b/frontend/src/app/main/ui/workspace/tokens/settings/menu.cljs
similarity index 94%
rename from frontend/src/app/main/ui/workspace/tokens/modals/settings.cljs
rename to frontend/src/app/main/ui/workspace/tokens/settings/menu.cljs
index bf74eb0047..b020a370a6 100644
--- a/frontend/src/app/main/ui/workspace/tokens/modals/settings.cljs
+++ b/frontend/src/app/main/ui/workspace/tokens/settings/menu.cljs
@@ -4,7 +4,7 @@
 ;;
 ;; Copyright (c) KALEIDOS INC
 
-(ns app.main.ui.workspace.tokens.modals.settings
+(ns app.main.ui.workspace.tokens.settings.menu
   (:require-macros [app.main.style :as stl])
   (:require
    [app.common.types.file :as ctf]
@@ -25,8 +25,7 @@
    [cuerdas.core :as str]
    [rumext.v2 :as mf]))
 
-
-(mf/defc token-settings-modal*
+(mf/defc token-settings*
   {::mf/wrap-props false}
   []
   (let [file-data (deref refs/workspace-data)
@@ -107,10 +106,3 @@
                       :disabled (not is-valid)
                       :variant "primary"}
           (tr "labels.save")]]]]]]))
-
-
-(mf/defc base-font-size-modal
-  {::mf/register modal/components
-   ::mf/register-as :tokens/base-font-size}
-  []
-  [:> token-settings-modal*])
diff --git a/frontend/src/app/main/ui/workspace/tokens/modals/settings.scss b/frontend/src/app/main/ui/workspace/tokens/settings/menu.scss
similarity index 100%
rename from frontend/src/app/main/ui/workspace/tokens/modals/settings.scss
rename to frontend/src/app/main/ui/workspace/tokens/settings/menu.scss
diff --git a/frontend/src/app/main/ui/workspace/tokens/sidebar.cljs b/frontend/src/app/main/ui/workspace/tokens/sidebar.cljs
index d74843c766..f011824f9d 100644
--- a/frontend/src/app/main/ui/workspace/tokens/sidebar.cljs
+++ b/frontend/src/app/main/ui/workspace/tokens/sidebar.cljs
@@ -357,7 +357,7 @@
         (mf/use-fn
          (fn [event]
            (dom/stop-propagation event)
-           (modal/show! :tokens/base-font-size {})))]
+           (modal/show! :tokens/settings {})))]
 
     [:div {:class (stl/css :import-export-button-wrapper)}
      [:> button* {:on-click open-menu
@@ -377,7 +377,7 @@
        (tr "labels.export")]]
 
 
-     (when (contains? cf/flags :token-units)
+     (when (and can-edit? (contains? cf/flags :token-units))
        [:> icon-button* {:variant "secondary"
                          :icon "settings"
                          :aria-label "Settings"