diff --git a/src/components/settings_modal/admin_tabs/instance_tab.vue b/src/components/settings_modal/admin_tabs/instance_tab.vue
index fa55cef41..1ad84113a 100644
--- a/src/components/settings_modal/admin_tabs/instance_tab.vue
+++ b/src/components/settings_modal/admin_tabs/instance_tab.vue
@@ -49,15 +49,11 @@
           <PWAManifestIconsSetting path=":pleroma.:manifest.:icons" />
         </li>
         <li>
-          <ColorSetting hide-draft-buttons path=":pleroma.:manifest.:theme_color" />
+          <ColorSetting path=":pleroma.:manifest.:theme_color" />
         </li>
         <li>
-          <ColorSetting hide-draft-buttons path=":pleroma.:manifest.:background_color" />
+          <ColorSetting path=":pleroma.:manifest.:background_color" />
         </li>
-        <li>
-          <GroupSetting path=":pleroma.:manifest" />
-        </li>
-        <h4>{{ $t('admin_dash.instance.misc_brand') }}</H4>
         <li>
           <AttachmentSetting path=":pleroma.:instance.:background_image" />
         </li>
diff --git a/src/components/settings_modal/helpers/pwa_manifest_icons_setting.vue b/src/components/settings_modal/helpers/pwa_manifest_icons_setting.vue
index 20e50fe25..d75eb44b0 100644
--- a/src/components/settings_modal/helpers/pwa_manifest_icons_setting.vue
+++ b/src/components/settings_modal/helpers/pwa_manifest_icons_setting.vue
@@ -131,14 +131,13 @@
         </li>
       </ul>
     </div>
+    <DraftButtons />
   </div>
 </template>
 
 <script src="./pwa_manifest_icons_setting.js"></script>
 <style lang="scss">
 div.PWAManifestIconsSetting {
-  margin-left: 3em;
-
   &.setting-item {
     display: grid;
     grid-template-areas:
diff --git a/src/components/settings_modal/settings_modal.js b/src/components/settings_modal/settings_modal.js
index 789ebd0ee..b4677fe7f 100644
--- a/src/components/settings_modal/settings_modal.js
+++ b/src/components/settings_modal/settings_modal.js
@@ -170,7 +170,7 @@ const SettingsModal = {
   },
   computed: {
     ...mapState(useInterfaceStore, {
-      temporaryChangesCountdown: store => store.temporaryChangesCountdown,
+      temporaryChangesTimeoutId: store => store.temporaryChangesTimeoutId,
       currentSaveStateNotice: store => store.settings.currentSaveStateNotice,
       modalActivated: store => store.settingsModalState !== 'hidden',
       modalMode: store => store.settingsModalMode,
diff --git a/src/components/settings_modal/settings_modal.scss b/src/components/settings_modal/settings_modal.scss
index 032b603fa..53add37fa 100644
--- a/src/components/settings_modal/settings_modal.scss
+++ b/src/components/settings_modal/settings_modal.scss
@@ -70,6 +70,7 @@
     .setting-label {
       grid-area: label;
       text-align: right;
+      align-self: baseline;
     }
 
     .ModifiedIndicator,
@@ -217,13 +218,6 @@
       .setting-label {
         text-align: left;
       }
-
-      .checkbox {
-        .label {
-          text-align: left;
-          margin-left: 0;
-        }
-      }
     }
 
     ul {
diff --git a/src/components/settings_modal/settings_modal.vue b/src/components/settings_modal/settings_modal.vue
index d2b4f60ee..b4ccba191 100644
--- a/src/components/settings_modal/settings_modal.vue
+++ b/src/components/settings_modal/settings_modal.vue
@@ -158,14 +158,14 @@
     </div>
     <teleport to="#modal">
       <ConfirmModal
-        v-if="temporaryChangesCountdown > 0"
+        v-if="temporaryChangesTimeoutId"
         :title="$t('settings.confirm_new_setting')"
         :cancel-text="$t('settings.revert')"
         :confirm-text="$t('settings.confirm')"
         @cancelled="temporaryChangesRevert"
         @accepted="temporaryChangesConfirm"
       >
-        {{ $t('settings.confirm_new_question_countdown', temporaryChangesCountdown) }}
+        {{ $t('settings.confirm_new_question') }}
       </ConfirmModal>
     </teleport>
   </Modal>
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 05a2d5ae5..763d77d20 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -411,7 +411,6 @@
     "appearance": "Appearance",
     "confirm_new_setting": "Confirm new setting?",
     "confirm_new_question": "Does this look ok? Setting will be reverted in 10 seconds.",
-    "confirm_new_question_countdown": "Does this look ok? Setting will be reverted in 1 second. | Does this look ok? Setting will be reverted in {count} seconds.",
     "revert": "Revert",
     "confirm": "Confirm",
     "text_size": "Text and interface size",
@@ -1405,7 +1404,6 @@
           "maskable": "Maskable"
         }
       },
-      "misc_brand": "Miscellaneous elements",
       "branding": "Branding",
       "access": "Instance access",
       "rich_metadata": "Metadata",
diff --git a/src/modules/config.js b/src/modules/config.js
index 8b4691341..7b54225ef 100644
--- a/src/modules/config.js
+++ b/src/modules/config.js
@@ -116,6 +116,7 @@ const config = {
       }
 
       useInterfaceStore().setTemporaryChanges({
+        timeoutId: setTimeout(revert, 10000),
         confirm,
         revert
       })
diff --git a/src/stores/interface.js b/src/stores/interface.js
index 51ed42f65..56999217f 100644
--- a/src/stores/interface.js
+++ b/src/stores/interface.js
@@ -18,10 +18,9 @@ export const useInterfaceStore = defineStore('interface', {
     paletteDataUsed: null,
     themeNameUsed: null,
     themeDataUsed: null,
-    temporaryChangesTimeoutId: null,
-    temporaryChangesCountdown: -1,     // used for temporary options that revert after a timeout
+    temporaryChangesTimeoutId: null, // used for temporary options that revert after a timeout
     temporaryChangesConfirm: () => {}, // used for applying temporary options
-    temporaryChangesRevert: () => {},  // used for reverting temporary options
+    temporaryChangesRevert: () => {}, // used for reverting temporary options
     settingsModalState: 'hidden',
     settingsModalLoadedUser: false,
     settingsModalLoadedAdmin: false,
@@ -45,25 +44,14 @@ export const useInterfaceStore = defineStore('interface', {
     lastTimeline: null
   }),
   actions: {
-    setTemporaryChanges ({ confirm, revert }) {
-      this.temporaryChangesCountdown = 10
+    setTemporaryChanges ({ timeoutId, confirm, revert }) {
+      this.temporaryChangesTimeoutId = timeoutId
       this.temporaryChangesConfirm = confirm
       this.temporaryChangesRevert = revert
-      const countdownFunc = () => {
-        if (this.temporaryChangesCountdown === 1) {
-          this.temporaryChangesRevert()
-          this.clearTemporaryChanges()
-        } else {
-          this.temporaryChangesCountdown--
-          this.temporaryChangesTimeoutId = setTimeout(countdownFunc, 1000)
-        }
-      }
-      this.temporaryChangesTimeoutId = setTimeout(countdownFunc, 1000)
     },
     clearTemporaryChanges () {
-      this.temporaryChangesTimeoutId ?? clearTimeout(this.temporaryChangesTimeoutId)
+      clearTimeout(this.temporaryChangesTimeoutId)
       this.temporaryChangesTimeoutId = null
-      this.temporaryChangesCountdown = -1
       this.temporaryChangesConfirm = () => {}
       this.temporaryChangesRevert = () => {}
     },