diff --git a/src/components/font_control/font_control.js b/src/components/font_control/font_control.js
index 45e5fde81..c52c31bfe 100644
--- a/src/components/font_control/font_control.js
+++ b/src/components/font_control/font_control.js
@@ -1,6 +1,7 @@
 import Checkbox from 'src/components/checkbox/checkbox.vue'
 import Popover from 'src/components/popover/popover.vue'
 import Select from '../select/select.vue'
+import LocalSettingIndicator from 'src/components/settings_modal/helpers/local_setting_indicator.vue'
 
 import { useInterfaceStore } from 'src/stores/interface.js'
 
@@ -18,8 +19,9 @@ export default {
     Select,
     Checkbox,
     Popover,
+    LocalSettingIndicator,
   },
-  props: ['name', 'label', 'modelValue', 'fallback', 'options', 'no-inherit'],
+  props: ['name', 'label', 'modelValue', 'fallback', 'options', 'no-inherit', 'isLocal'],
   mounted() {
     useInterfaceStore().queryLocalFonts()
   },
diff --git a/src/components/font_control/font_control.vue b/src/components/font_control/font_control.vue
index 5124fd53a..06bd07edf 100644
--- a/src/components/font_control/font_control.vue
+++ b/src/components/font_control/font_control.vue
@@ -8,6 +8,8 @@
         :model-value="present"
         @change="$emit('update:modelValue', typeof modelValue === 'undefined' ? fallback : undefined)"
       >
+        <LocalSettingIndicator :is-local="isLocal" />
+        {{ ' ' }}
         <i18n-t
           scope="global"
           keypath="settings.style.fonts.override"
diff --git a/src/components/settings_modal/tabs/developer_tab.vue b/src/components/settings_modal/tabs/developer_tab.vue
index 1544c02a9..3e0fe71cb 100644
--- a/src/components/settings_modal/tabs/developer_tab.vue
+++ b/src/components/settings_modal/tabs/developer_tab.vue
@@ -28,13 +28,17 @@
       <h3>{{ $t('settings.debug') }}</h3>
       <ul class="setting-list">
         <li>
-          <BooleanSetting path="virtualScrolling">
+          <BooleanSetting
+            :local="true"
+            path="virtualScrolling"
+          >
             {{ $t('settings.virtual_scrolling') }}
           </BooleanSetting>
         </li>
         <li>
           <BooleanSetting
             path="themeDebug"
+            :local="true"
             :expert="1"
           >
             {{ $t('settings.theme_debug') }}
@@ -43,6 +47,7 @@
         <li>
           <BooleanSetting
             path="forceThemeRecompilation"
+            :local="true"
             :expert="1"
           >
             {{ $t('settings.force_theme_recompilation_debug') }}
diff --git a/src/components/settings_modal/tabs/general_tab.js b/src/components/settings_modal/tabs/general_tab.js
index df9691900..d67bc948d 100644
--- a/src/components/settings_modal/tabs/general_tab.js
+++ b/src/components/settings_modal/tabs/general_tab.js
@@ -67,7 +67,7 @@ const GeneralTab = {
         })
     },
     updateFont(key, value) {
-      useSyncConfigStore().setSimplePrefAndSave({
+      useLocalConfigStore().set({
         path: 'theme3hacks',
         value: {
           ...this.mergedConfig.theme3hacks,
diff --git a/src/components/settings_modal/tabs/general_tab.vue b/src/components/settings_modal/tabs/general_tab.vue
index aa0554285..905a2baec 100644
--- a/src/components/settings_modal/tabs/general_tab.vue
+++ b/src/components/settings_modal/tabs/general_tab.vue
@@ -68,6 +68,7 @@
             name="ui"
             :label="$t('settings.style.fonts.components_inline.interface')"
             :fallback="{ family: 'sans-serif' }"
+            :is-local="true"
             no-inherit="1"
             @update:model-value="v => updateFont('interface', v)"
           />
@@ -76,6 +77,7 @@
           <FontControl
             :model-value="theme3hacks.fonts.input"
             name="input"
+            :is-local="true"
             :fallback="{ family: 'inherit' }"
             :label="$t('settings.style.fonts.components_inline.input')"
             @update:model-value="v => updateFont('input', v)"
@@ -85,6 +87,7 @@
           <UnitSetting
             path="emojiSize"
             :step="0.1"
+            :local="true"
             :units="['px', 'rem']"
             :reset-default="{ 'px': 32, 'rem': 2.2 }"
           >
@@ -124,6 +127,7 @@
         <li>
           <BooleanSetting
             path="useStreamingApi"
+            :local="true"
             expert="1"
           >
             {{ $t('settings.useStreamingApi') }}
diff --git a/src/components/settings_modal/tabs/layout_tab.vue b/src/components/settings_modal/tabs/layout_tab.vue
index b52c106b9..e0082ab0d 100644
--- a/src/components/settings_modal/tabs/layout_tab.vue
+++ b/src/components/settings_modal/tabs/layout_tab.vue
@@ -50,6 +50,7 @@
           <UnitSetting
             path="navbarSize"
             :step="0.1"
+            :local="true"
             :units="['px', 'rem']"
             :reset-default="{ 'px': 55, 'rem': 3.5 }"
           >
@@ -72,6 +73,7 @@
         <li>
           <UnitSetting
             path="panelHeaderSize"
+            :local="true"
             :step="0.1"
             :units="['px', 'rem']"
             :reset-default="{ 'px': 52, 'rem': 3.2 }"
@@ -105,6 +107,7 @@
           <div class="column-settings">
             <UnitSetting
               v-for="column in columns"
+              :local="true"
               :key="column"
               :path="column + 'ColumnWidth'"
               :units="horizontalUnits"
diff --git a/src/components/settings_modal/tabs/notifications_tab.vue b/src/components/settings_modal/tabs/notifications_tab.vue
index d08f07b68..ba50f5b21 100644
--- a/src/components/settings_modal/tabs/notifications_tab.vue
+++ b/src/components/settings_modal/tabs/notifications_tab.vue
@@ -249,6 +249,7 @@
         <li>
           <BooleanSetting
             path="webPushNotifications"
+            :local="true"
             expert="1"
           >
             {{ $t('settings.enable_web_push_notifications') }}
@@ -257,6 +258,7 @@
             <li>
               <BooleanSetting
                 path="webPushAlwaysShowNotifications"
+                :local="true"
                 :disabled="!mergedConfig.webPushNotifications"
               >
                 {{ $t('settings.enable_web_push_always_show') }}
@@ -273,6 +275,7 @@
         <li>
           <BooleanSetting
             source="profile"
+            :local="true"
             path="webPushHideContents"
             expert="1"
           >
diff --git a/src/components/settings_modal/tabs/posts_tab.vue b/src/components/settings_modal/tabs/posts_tab.vue
index 0a864d179..d14475fc3 100644
--- a/src/components/settings_modal/tabs/posts_tab.vue
+++ b/src/components/settings_modal/tabs/posts_tab.vue
@@ -58,6 +58,7 @@
           <FontControl
             :model-value="mergedConfig.theme3hacks.fonts.post"
             name="post"
+            :is-local="true"
             :fallback="{ family: 'inherit' }"
             :label="$t('settings.style.fonts.components.post')"
             @update:model-value="v => updateFont('post', v)"
@@ -66,6 +67,7 @@
         <li>
           <FontControl
             :model-value="mergedConfig.theme3hacks.fonts.monospace"
+            :is-local="true"
             name="postCode"
             :fallback="{ family: 'monospace' }"
             :label="$t('settings.style.fonts.components.monospace')"