diff --git a/src/components/interface_language_switcher/interface_language_switcher.vue b/src/components/interface_language_switcher/interface_language_switcher.vue
index 1f7d419e9..a547b98a5 100644
--- a/src/components/interface_language_switcher/interface_language_switcher.vue
+++ b/src/components/interface_language_switcher/interface_language_switcher.vue
@@ -13,8 +13,8 @@
       </label>
       <span class="setting-control btn-group">
         <Select
-          :name="uniqueId+index"
           :id="uniqueId+index"
+          :name="uniqueId+index"
           class="language-select"
           :model-value="controlledLanguage[index]"
           @update:model-value="val => setLanguageAt(index, val)"
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 043128f91..d75eb44b0 100644
--- a/src/components/settings_modal/helpers/pwa_manifest_icons_setting.vue
+++ b/src/components/settings_modal/helpers/pwa_manifest_icons_setting.vue
@@ -31,8 +31,8 @@
     <div class="setting-control">
       <ul class="item-list">
         <li
-          class="no_items"
           v-if="visibleState.length === 0"
+          class="no_items"
         >
           {{ $t('admin_dash.instance.pwa.no_icons') }}
           <button
@@ -59,8 +59,8 @@
               <div class="src-url">
                 <label for="path">{{ $t('settings.url') }}</label>
                 <input
-                  class="input string-input"
                   :id="path"
+                  class="input string-input"
                   :disabled="shouldBeDisabled"
                   :value="item[':src']"
                   @change="event => update({ event, index, eventType: 'edit', field: ':src' })"
diff --git a/src/components/settings_modal/helpers/rate_setting.vue b/src/components/settings_modal/helpers/rate_setting.vue
index 6849ee2c1..f6216223c 100644
--- a/src/components/settings_modal/helpers/rate_setting.vue
+++ b/src/components/settings_modal/helpers/rate_setting.vue
@@ -87,13 +87,13 @@
       </table>
       <Checkbox
         :model-value="isSeparate"
-        @update:model-value="event => update({ event: event ? 'join' : 'split',  eventType: 'toggleMode' })"
+        @update:model-value="event => update({ event: event ? 'join' : 'split', eventType: 'toggleMode' })"
       >
         {{ $t('admin_dash.rate_limit.separate') }}
       </Checkbox>
     </div>
-  <DraftButtons />
-</div>
+    <DraftButtons />
+  </div>
 </template>
 
 <script src="./rate_setting.js"></script>
diff --git a/src/components/settings_modal/helpers/tuple_setting.vue b/src/components/settings_modal/helpers/tuple_setting.vue
index 09e4aa9dd..e39e23344 100644
--- a/src/components/settings_modal/helpers/tuple_setting.vue
+++ b/src/components/settings_modal/helpers/tuple_setting.vue
@@ -1,7 +1,7 @@
 <template>
   <span
-    class="setting-item"
     v-if="matchesExpertLevel"
+    class="setting-item"
   >
     <label
       v-if="!hideLabel"
diff --git a/src/components/settings_modal/settings_modal.scss b/src/components/settings_modal/settings_modal.scss
index a26937bd7..53add37fa 100644
--- a/src/components/settings_modal/settings_modal.scss
+++ b/src/components/settings_modal/settings_modal.scss
@@ -208,10 +208,11 @@
       }
     }
 
+    /* stylelint-disable no-descending-specificity */
     .setting-item {
       grid-template-columns: 1fr min-content;
       column-gap: 0.5em;
-      padding: 1em 1em;
+      padding: 1em;
       align-items: center;
 
       .setting-label {
@@ -229,6 +230,8 @@
       }
     }
 
+
+
     .setting-list:not(.suboptions),
     .option-list {
       &.two-column {
diff --git a/src/components/settings_modal/tabs/composing_tab.vue b/src/components/settings_modal/tabs/composing_tab.vue
index c02a15421..f71d64600 100644
--- a/src/components/settings_modal/tabs/composing_tab.vue
+++ b/src/components/settings_modal/tabs/composing_tab.vue
@@ -4,7 +4,10 @@
       <h3>{{ $t('settings.general') }}</h3>
       <ul class="setting-list">
         <li>
-          <label class="setting-item " for="default-vis">
+          <label
+            class="setting-item "
+            for="default-vis"
+          >
             <span class="setting-label">
               <ProfileSettingIndicator :is-profile="true" />
               {{ $t('settings.default_vis') }}
diff --git a/src/components/settings_modal/tabs/filtering_tab.vue b/src/components/settings_modal/tabs/filtering_tab.vue
index a51b0e4b7..ff7498656 100644
--- a/src/components/settings_modal/tabs/filtering_tab.vue
+++ b/src/components/settings_modal/tabs/filtering_tab.vue
@@ -54,8 +54,8 @@
             </span>
             <Select
               id="onBlockDefaultActionLv1"
-              class="setting-control"
               v-model="onBlockDefaultActionLv1"
+              class="setting-control"
             >
               <option
                 v-for="option in muteBlockLv1Options"
diff --git a/src/components/settings_modal/tabs/general_tab.vue b/src/components/settings_modal/tabs/general_tab.vue
index 285fe1b68..ceb073a48 100644
--- a/src/components/settings_modal/tabs/general_tab.vue
+++ b/src/components/settings_modal/tabs/general_tab.vue
@@ -142,7 +142,9 @@
         class="setting-list"
       >
         <li class="select-multiple">
-          <h4 class="label">{{ $t('settings.confirm_dialogs') }}</h4>
+          <h4 class="label">
+            {{ $t('settings.confirm_dialogs') }}
+          </h4>
           <ul class="option-list">
             <li>
               <BooleanSetting path="modalOnRepeat">
diff --git a/src/components/settings_modal/tabs/notifications_tab.vue b/src/components/settings_modal/tabs/notifications_tab.vue
index ea859b18a..d08f07b68 100644
--- a/src/components/settings_modal/tabs/notifications_tab.vue
+++ b/src/components/settings_modal/tabs/notifications_tab.vue
@@ -40,8 +40,8 @@
         <li>
           <h4> {{ $t('settings.notification_visibility') }}</h4>
           <p
-            class="sidenote"
             v-if="expertLevel > 0"
+            class="sidenote"
           >
             {{ $t('settings.notification_setting_filters_chrome_push') }}
           </p>
diff --git a/src/components/settings_modal/tabs/profile_tab.vue b/src/components/settings_modal/tabs/profile_tab.vue
index edab1c19d..80064daf8 100644
--- a/src/components/settings_modal/tabs/profile_tab.vue
+++ b/src/components/settings_modal/tabs/profile_tab.vue
@@ -13,8 +13,8 @@
         <li>
           <div class="setting-item">
             <Checkbox
-              class="setting-label setting-control custom-boolean-setting"
               v-model="locked"
+              class="setting-label setting-control custom-boolean-setting"
             >
               <ProfileSettingIndicator :is-profile="true" />
               {{ $t('settings.lock_account_description') }}