diff --git a/src/components/settings_modal/helpers/unit_setting.vue b/src/components/settings_modal/helpers/unit_setting.vue
index c076df855..d23745fa4 100644
--- a/src/components/settings_modal/helpers/unit_setting.vue
+++ b/src/components/settings_modal/helpers/unit_setting.vue
@@ -7,9 +7,13 @@
       :for="path"
       class="setting-label size-label"
     >
+      <ModifiedIndicator
+        :changed="isChanged"
+        :onclick="reset"
+      />
+      {{ ' ' }}
       <slot />
     </label>
-    {{ ' ' }}
     <span class="no-break setting-control">
       <input
         :id="path"
@@ -38,10 +42,6 @@
       </Select>
     </span>
     {{ ' ' }}
-    <ModifiedIndicator
-      :changed="isChanged"
-      :onclick="reset"
-    />
   </span>
 </template>
 
diff --git a/src/components/settings_modal/settings_modal.scss b/src/components/settings_modal/settings_modal.scss
index fd26d144a..c757d2964 100644
--- a/src/components/settings_modal/settings_modal.scss
+++ b/src/components/settings_modal/settings_modal.scss
@@ -62,7 +62,7 @@
       "label control"
       ".    desc"
       ".   draft";
-    grid-template-columns: 2fr 3fr;
+    grid-template-columns: 4fr 5fr;
     column-gap: 0.5em;
     align-items: baseline;
     padding: 0.5em 0;
diff --git a/src/components/settings_modal/tabs/filtering_tab.vue b/src/components/settings_modal/tabs/filtering_tab.vue
index e19f7bdd8..a51b0e4b7 100644
--- a/src/components/settings_modal/tabs/filtering_tab.vue
+++ b/src/components/settings_modal/tabs/filtering_tab.vue
@@ -13,22 +13,24 @@
             {{ $t('settings.replies_in_timeline') }}
           </ChoiceSetting>
         </li>
-        <li class="setting-item">
-          <span class="setting-label">
-            {{ $t('user_card.default_mute_expiration') }}
-          </span>
-          <Select
-            id="onMuteDefaultActionLv1"
-            v-model="onMuteDefaultActionLv1"
-          >
-            <option
-              v-for="option in muteBlockLv1Options"
-              :key="option.key"
-              :value="option.value"
+        <li>
+          <span class="setting-item">
+            <span class="setting-label">
+              {{ $t('user_card.default_mute_expiration') }}
+            </span>
+            <Select
+              id="onMuteDefaultActionLv1"
+              v-model="onMuteDefaultActionLv1"
             >
-              {{ option.label }}
-            </option>
-          </Select>
+              <option
+                v-for="option in muteBlockLv1Options"
+                :key="option.key"
+                :value="option.value"
+              >
+                {{ option.label }}
+              </option>
+            </Select>
+          </span>
           <ul
             v-if="onMuteDefaultActionLv1 === 'temporarily'"
             class="setting-list suboptions"
@@ -45,26 +47,25 @@
             </li>
           </ul>
         </li>
-        <li
-          class="setting-item"
-          v-if="blockExpirationSupported"
-        >
-          <span class="setting-label">
-            {{ $t('user_card.default_block_expiration') }}
-          </span>
-          <Select
-            id="onBlockDefaultActionLv1"
-            class="setting-control"
-            v-model="onBlockDefaultActionLv1"
-          >
-            <option
-              v-for="option in muteBlockLv1Options"
-              :key="option.key"
-              :value="option.value"
+        <li v-if="blockExpirationSupported">
+          <span class="setting-item">
+            <span class="setting-label">
+              {{ $t('user_card.default_block_expiration') }}
+            </span>
+            <Select
+              id="onBlockDefaultActionLv1"
+              class="setting-control"
+              v-model="onBlockDefaultActionLv1"
             >
-              {{ option.label }}
-            </option>
-          </Select>
+              <option
+                v-for="option in muteBlockLv1Options"
+                :key="option.key"
+                :value="option.value"
+              >
+                {{ option.label }}
+              </option>
+            </Select>
+          </span>
           <ul
             v-if="onBlockDefaultActionLv1 === 'temporarily'"
             class="setting-list suboptions"