diff --git a/src/main/frontend/components/settings.cljs b/src/main/frontend/components/settings.cljs
index a4c6fa8b8af..52c82cd2e5c 100644
--- a/src/main/frontend/components/settings.cljs
+++ b/src/main/frontend/components/settings.cljs
@@ -378,4 +378,4 @@
               (ui/button (t :user/delete-your-account)
                          :on-click (fn []
                                      (ui-handler/toggle-settings-modal!)
-                                     (js/setTimeout #(state/set-modal! delete-account-confirm))))]]]])]])))
\ No newline at end of file
+                                     (js/setTimeout #(state/set-modal! delete-account-confirm))))]]]])]])))
diff --git a/src/main/frontend/components/sidebar.css b/src/main/frontend/components/sidebar.css
index 0c84c8c9eb2..43dd14d2888 100644
--- a/src/main/frontend/components/sidebar.css
+++ b/src/main/frontend/components/sidebar.css
@@ -53,12 +53,8 @@
 }
 
 .settings-modal {
-  background-color: var(--ls-primary-background-color);
-
   max-height: 80vh;
-  overflow: auto;
-  margin: -25px;
-  padding: 20px;
+  overflow-y: auto;
 
   @screen sm {
     width: 768px;
diff --git a/src/main/frontend/handler/web/nfs.cljs b/src/main/frontend/handler/web/nfs.cljs
index 721ede002e9..102393ff1cc 100644
--- a/src/main/frontend/handler/web/nfs.cljs
+++ b/src/main/frontend/handler/web/nfs.cljs
@@ -178,7 +178,7 @@
   (when-not (util/electron?)
     (fn [close-fn]
       [:div
-       [:p.text-gray-700
+       [:p
         "Grant native filesystem permission for directory: "
         [:b (config/get-local-dir repo)]]
        (ui/button
diff --git a/src/main/frontend/ui.cljs b/src/main/frontend/ui.cljs
index c5083b04807..5ee89d71937 100644
--- a/src/main/frontend/ui.cljs
+++ b/src/main/frontend/ui.cljs
@@ -425,7 +425,7 @@
 
 (rum/defc modal-panel
   [panel-content transition-state close-fn]
-  [:div.ui__modal-panel.transform.transition-all.sm:min-w-lg.sm.p-6
+  [:div.ui__modal-panel.transform.transition-all.sm:min-w-lg.sm
    {:class (case transition-state
              "entering" "ease-out duration-300 opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
              "entered" "ease-out duration-300 opacity-100 translate-y-0 sm:scale-100"
@@ -444,7 +444,8 @@
         :stroke-linejoin "round"
         :stroke-linecap  "round"}]]]]
 
-   (panel-content close-fn)])
+   [:div.panel-content
+    (panel-content close-fn)]])
 
 (rum/defc modal < rum/reactive
   (mixins/event-mixin
diff --git a/src/main/frontend/ui.css b/src/main/frontend/ui.css
index 20e9e62c896..0e77453b157 100644
--- a/src/main/frontend/ui.css
+++ b/src/main/frontend/ui.css
@@ -66,7 +66,11 @@
   }
 
   &-panel {
-    @apply relative rounded-md p-8 shadow-xl;
+      @apply relative rounded-md shadow-xl;
+      background: var(--ls-secondary-background-color);
+      .panel-content {
+          padding: 2rem;
+      }
   }
 
   &-close {