diff --git a/frontend/src/app/main/ui/settings/options.cljs b/frontend/src/app/main/ui/settings/options.cljs
index 12ba30ef6a..b841f3567d 100644
--- a/frontend/src/app/main/ui/settings/options.cljs
+++ b/frontend/src/app/main/ui/settings/options.cljs
@@ -58,7 +58,10 @@
                  :on-submit on-submit
                  :form form}
 
-     [:h3 (tr "labels.language")]
+     [:> heading* {:level 3
+                   :typography t/headline-small
+                   :class (stl/css :section-title)}
+      (tr "labels.language")]
 
      [:div {:class (stl/css :fields-row)}
       [:& fm/select {:options (into [{:label "Auto (browser)" :value ""}]
@@ -68,7 +71,10 @@
                      :name :lang
                      :data-testid "setting-lang"}]]
 
-     [:h3 (tr "dashboard.theme-change")]
+     [:> heading* {:level 3
+                   :typography t/headline-small
+                   :class (stl/css :section-title)}
+      (tr "dashboard.theme-change")]
      [:div {:class (stl/css :fields-row)}
       [:& fm/select {:label (tr "dashboard.select-ui-theme")
                      :name :theme
@@ -128,7 +134,7 @@
       [:div {:class (stl/css :form-container) :data-testid "settings-form"}
        [:> heading* {:level 2
                      :typography t/title-large
-                     :class (stl/css :color-primary)
+                     :class (stl/css :page-title)
                      :id "options-section-title"}
         (tr "labels.settings")]
        [:> options-form*]]
diff --git a/frontend/src/app/main/ui/settings/options.scss b/frontend/src/app/main/ui/settings/options.scss
index cdae1e185b..91cf8dc3c4 100644
--- a/frontend/src/app/main/ui/settings/options.scss
+++ b/frontend/src/app/main/ui/settings/options.scss
@@ -13,6 +13,16 @@
   display: grid;
 }
 
+.options-form {
+  display: flex;
+  flex-direction: column;
+}
+
+.section-title {
+  color: var(--color-foreground-primary);
+  margin-block: var(--sp-s);
+}
+
 .form-container {
   --menu-max-height-up: #{px2rem(180)};