diff --git a/changelog.d/mute-nsfw.add b/changelog.d/mute-nsfw.add
deleted file mode 100644
index b1794a0c2..000000000
--- a/changelog.d/mute-nsfw.add
+++ /dev/null
@@ -1 +0,0 @@
-Added ability to mute sensitive posts (ported from eintei)
diff --git a/src/components/quick_filter_settings/quick_filter_settings.js b/src/components/quick_filter_settings/quick_filter_settings.js
index 0d667df5c..e67e3a4b1 100644
--- a/src/components/quick_filter_settings/quick_filter_settings.js
+++ b/src/components/quick_filter_settings/quick_filter_settings.js
@@ -63,13 +63,6 @@ const QuickFilterSettings = {
         const value = !this.muteBotStatuses
         this.$store.dispatch('setOption', { name: 'muteBotStatuses', value })
       }
-    },
-    muteSensitiveStatuses: {
-      get () { return this.mergedConfig.muteSensitiveStatuses },
-      set () {
-        const value = !this.muteSensitiveStatuses
-        this.$store.dispatch('setOption', { name: 'muteSensitiveStatuses', value })
-      }
     }
   }
 }
diff --git a/src/components/quick_filter_settings/quick_filter_settings.vue b/src/components/quick_filter_settings/quick_filter_settings.vue
index adb969168..082d84975 100644
--- a/src/components/quick_filter_settings/quick_filter_settings.vue
+++ b/src/components/quick_filter_settings/quick_filter_settings.vue
@@ -71,18 +71,6 @@
             :aria-hidden="true"
           />{{ $t('settings.mute_bot_posts') }}
         </button>
-        <button
-          class="menu-item dropdown-item"
-          role="menuitemcheckbox"
-          :aria-checked="muteSensitiveStatuses"
-          @click="muteSensitiveStatuses = !muteSensitiveStatuses"
-        >
-          <span
-            class="input menu-checkbox"
-            :class="{ 'menu-checkbox-checked': muteSensitiveStatuses }"
-            :aria-hidden="true"
-          />{{ $t('settings.mute_sensitive_posts') }}
-        </button>
         <button
           class="menu-item dropdown-item"
           role="menuitemcheckbox"
diff --git a/src/components/quick_view_settings/quick_view_settings.js b/src/components/quick_view_settings/quick_view_settings.js
index e35fd579d..67aa6713e 100644
--- a/src/components/quick_view_settings/quick_view_settings.js
+++ b/src/components/quick_view_settings/quick_view_settings.js
@@ -61,13 +61,6 @@ const QuickViewSettings = {
         const value = !this.muteBotStatuses
         this.$store.dispatch('setOption', { name: 'muteBotStatuses', value })
       }
-    },
-    muteSensitiveStatuses: {
-      get () { return this.mergedConfig.muteSensitiveStatuses },
-      set () {
-        const value = !this.muteSensitiveStatuses
-        this.$store.dispatch('setOption', { name: 'muteSensitiveStatuses', value })
-      }
     }
   }
 }
diff --git a/src/components/settings_modal/helpers/unit_setting.js b/src/components/settings_modal/helpers/size_setting.js
similarity index 81%
rename from src/components/settings_modal/helpers/unit_setting.js
rename to src/components/settings_modal/helpers/size_setting.js
index c9c23cb0b..12cef705a 100644
--- a/src/components/settings_modal/helpers/unit_setting.js
+++ b/src/components/settings_modal/helpers/size_setting.js
@@ -17,10 +17,6 @@ export default {
     units: {
       type: Array,
       default: () => allCssUnits
-    },
-    unitSet: {
-      type: String,
-      default: 'none'
     }
   },
   computed: {
@@ -34,10 +30,6 @@ export default {
   },
   methods: {
     ...Setting.methods,
-    getUnitString (value) {
-      if (this.unitSet === 'none') return value
-      return this.$t(['settings', 'units', this.unitSet, value].join('.'))
-    },
     updateValue (e) {
       this.configSink(this.path, parseInt(e.target.value) + this.stateUnit)
     },
diff --git a/src/components/settings_modal/helpers/unit_setting.vue b/src/components/settings_modal/helpers/size_setting.vue
similarity index 77%
rename from src/components/settings_modal/helpers/unit_setting.vue
rename to src/components/settings_modal/helpers/size_setting.vue
index 68f52b1cd..0a2206b2b 100644
--- a/src/components/settings_modal/helpers/unit_setting.vue
+++ b/src/components/settings_modal/helpers/size_setting.vue
@@ -1,7 +1,7 @@
 <template>
   <span
     v-if="matchesExpertLevel"
-    class="UnitSetting"
+    class="SizeSetting"
   >
     <label
       :for="path"
@@ -23,7 +23,7 @@
       :id="path"
       :model-value="stateUnit"
       :disabled="disabled"
-      class="unit-input unstyled"
+      class="css-unit-input"
       @change="updateUnit"
     >
       <option
@@ -31,7 +31,7 @@
         :key="option"
         :value="option"
       >
-        {{ getUnitString(option) }}
+        {{ option }}
       </option>
     </Select>
     {{ ' ' }}
@@ -42,19 +42,20 @@
   </span>
 </template>
 
-<script src="./unit_setting.js"></script>
+<script src="./size_setting.js"></script>
 
 <style lang="scss">
-.UnitSetting {
+.SizeSetting {
   .number-input {
     max-width: 6.5em;
-    text-align: right;
   }
 
-  .unit-input,
-  .unit-input select {
+  .css-unit-input,
+  .css-unit-input select {
+    margin-left: 0.5em;
+    width: 4em;
+    max-width: 4em;
     min-width: 4em;
-    width: auto;
   }
 }
 
diff --git a/src/components/settings_modal/settings_modal_admin_content.scss b/src/components/settings_modal/settings_modal_admin_content.scss
index a5314fe12..bd619d7fa 100644
--- a/src/components/settings_modal/settings_modal_admin_content.scss
+++ b/src/components/settings_modal/settings_modal_admin_content.scss
@@ -31,6 +31,10 @@
       margin-bottom: 1em;
     }
 
+    select {
+      min-width: 10em;
+    }
+
     textarea {
       width: 100%;
       max-width: 100%;
diff --git a/src/components/settings_modal/settings_modal_user_content.scss b/src/components/settings_modal/settings_modal_user_content.scss
index a5314fe12..bd619d7fa 100644
--- a/src/components/settings_modal/settings_modal_user_content.scss
+++ b/src/components/settings_modal/settings_modal_user_content.scss
@@ -31,6 +31,10 @@
       margin-bottom: 1em;
     }
 
+    select {
+      min-width: 10em;
+    }
+
     textarea {
       width: 100%;
       max-width: 100%;
diff --git a/src/components/settings_modal/tabs/filtering_tab.js b/src/components/settings_modal/tabs/filtering_tab.js
index fbace15df..06f238af7 100644
--- a/src/components/settings_modal/tabs/filtering_tab.js
+++ b/src/components/settings_modal/tabs/filtering_tab.js
@@ -1,7 +1,7 @@
 import { filter, trim, debounce } from 'lodash'
 import BooleanSetting from '../helpers/boolean_setting.vue'
 import ChoiceSetting from '../helpers/choice_setting.vue'
-import UnitSetting from '../helpers/unit_setting.vue'
+import SizeSetting from '../helpers/size_setting.vue'
 import IntegerSetting from '../helpers/integer_setting.vue'
 
 import SharedComputedObject from '../helpers/shared_computed_object.js'
@@ -20,7 +20,7 @@ const FilteringTab = {
   components: {
     BooleanSetting,
     ChoiceSetting,
-    UnitSetting,
+    SizeSetting,
     IntegerSetting
   },
   computed: {
diff --git a/src/components/settings_modal/tabs/filtering_tab.vue b/src/components/settings_modal/tabs/filtering_tab.vue
index 821ca7500..758f4234d 100644
--- a/src/components/settings_modal/tabs/filtering_tab.vue
+++ b/src/components/settings_modal/tabs/filtering_tab.vue
@@ -44,29 +44,6 @@
             {{ $t('settings.mute_bot_posts') }}
           </BooleanSetting>
         </li>
-        <li>
-          <BooleanSetting path="muteSensitiveStatuses">
-            {{ $t('settings.mute_sensitive_posts') }}
-          </BooleanSetting>
-        </li>
-        <li>
-          <BooleanSetting path="hideMutedFederationRestrictions">
-            {{ $t('settings.hide_muted_federation_restrictions') }}
-          </BooleanSetting>
-          <ul
-            class="setting-list suboptions"
-            :class="[{disabled: !streaming}]"
-          >
-            <li
-              v-for="item in muteFederationRestrictionsLevels"
-              :key="'mute_' + item + '_federation_restriction'"
-            >
-              <BooleanSetting :path="'muteFederationRestrictions.' + item">
-                {{ $t('settings.mute_' + item + '_federation_restriction') }}
-              </BooleanSetting>
-            </li>
-          </ul>
-        </li>
         <li>
           <BooleanSetting path="hidePostStats">
             {{ $t('settings.hide_post_stats') }}
@@ -120,15 +97,14 @@
           </BooleanSetting>
         </li>
         <li>
-          <UnitSetting
+          <SizeSetting
             key="hideScrobblesAfter"
             path="hideScrobblesAfter"
             :units="['m', 'h', 'd']"
-            unitSet="time"
             expert="1"
           >
             {{ $t('settings.hide_scrobbles_after') }}
-          </UnitSetting>
+          </SizeSetting>
         </li>
       </ul>
     </div>
diff --git a/src/components/settings_modal/tabs/general_tab.js b/src/components/settings_modal/tabs/general_tab.js
index 7d701d34f..3f2bcb13b 100644
--- a/src/components/settings_modal/tabs/general_tab.js
+++ b/src/components/settings_modal/tabs/general_tab.js
@@ -3,7 +3,7 @@ import ChoiceSetting from '../helpers/choice_setting.vue'
 import ScopeSelector from 'src/components/scope_selector/scope_selector.vue'
 import IntegerSetting from '../helpers/integer_setting.vue'
 import FloatSetting from '../helpers/float_setting.vue'
-import UnitSetting, { defaultHorizontalUnits } from '../helpers/unit_setting.vue'
+import SizeSetting, { defaultHorizontalUnits } from '../helpers/size_setting.vue'
 import InterfaceLanguageSwitcher from 'src/components/interface_language_switcher/interface_language_switcher.vue'
 
 import SharedComputedObject from '../helpers/shared_computed_object.js'
@@ -64,7 +64,7 @@ const GeneralTab = {
     ChoiceSetting,
     IntegerSetting,
     FloatSetting,
-    UnitSetting,
+    SizeSetting,
     InterfaceLanguageSwitcher,
     ScopeSelector,
     ProfileSettingIndicator
diff --git a/src/components/settings_modal/tabs/general_tab.vue b/src/components/settings_modal/tabs/general_tab.vue
index 208c49ee3..424ee7e4a 100644
--- a/src/components/settings_modal/tabs/general_tab.vue
+++ b/src/components/settings_modal/tabs/general_tab.vue
@@ -134,7 +134,7 @@
         <li v-if="expertLevel > 0">
           {{ $t('settings.column_sizes') }}
           <div class="column-settings">
-            <UnitSetting
+            <SizeSetting
               v-for="column in columns"
               :key="column"
               :path="column + 'ColumnWidth'"
@@ -142,7 +142,7 @@
               expert="1"
             >
               {{ $t('settings.column_sizes_' + column) }}
-            </UnitSetting>
+            </SizeSetting>
           </div>
         </li>
         <li class="select-multiple">
diff --git a/src/components/status/status.js b/src/components/status/status.js
index 190f89164..36f6c602f 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -238,9 +238,6 @@ const Status = {
     showActorTypeIndicator () {
       return !this.hideBotIndication
     },
-    sensitiveStatus () {
-      return this.status.nsfw
-    },
     mentionsLine () {
       if (!this.headTailLinks) return []
       const writtenSet = new Set(this.headTailLinks.writtenMentions.map(_ => _.url))
@@ -268,9 +265,7 @@ const Status = {
         // Wordfiltered
         this.muteWordHits.length > 0 ||
         // bot status
-        (this.muteBotStatuses && this.botStatus && !this.compact) ||
-        // sensitive status
-        (this.muteSensitiveStatuses && this.sensitiveStatus && !this.compact)
+        (this.muteBotStatuses && this.botStatus && !this.compact)
       return !this.unmuted && !this.shouldNotMute && reasonsToMute
     },
     userIsMuted () {
@@ -376,9 +371,6 @@ const Status = {
     muteBotStatuses () {
       return this.mergedConfig.muteBotStatuses
     },
-    muteSensitiveStatuses () {
-      return this.mergedConfig.muteSensitiveStatuses
-    },
     hideBotIndication () {
       return this.mergedConfig.hideBotIndication
     },
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 2a17bb139..4d9e1c3c7 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -30,12 +30,6 @@
             :at="false"
           />
         </small>
-        <small
-          v-if="muteSensitiveStatuses && status.nsfw"
-          class="mute-thread"
-        >
-          {{ $t('status.sensitive_muted') }}
-        </small>
         <small
           v-if="showReasonMutedThread"
           class="mute-thread"
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 4f724b1b6..13c521b2b 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -394,14 +394,6 @@
         "desc": "To enable two-factor authentication, enter the code from your two-factor app:"
       }
     },
-    "units": {
-      "time": {
-        "m": "minutes",
-        "s": "seconds",
-        "h": "hours",
-        "d": "days"
-      }
-    },
     "lists_navigation": "Show lists in navigation",
     "allow_following_move": "Allow auto-follow when following account moves",
     "attachmentRadius": "Attachments",
@@ -510,7 +502,6 @@
     "hide_actor_type_indication": "Hide actor type (bots, groups, etc.) indication in posts",
     "hide_scrobbles": "Hide scrobbles",
     "hide_scrobbles_after": "Hide scrobbles older than",
-    "mute_sensitive_posts": "Mute sensitive posts",
     "hide_all_muted_posts": "Hide muted posts",
     "max_thumbnails": "Maximum amount of thumbnails per post (empty = no limit)",
     "hide_isp": "Hide instance-specific panel",
@@ -1085,7 +1076,6 @@
     "external_source": "External source",
     "thread_muted": "Thread muted",
     "thread_muted_and_words": ", has words:",
-    "sensitive_muted": "Muting sensitive content",
     "show_full_subject": "Show full subject",
     "hide_full_subject": "Hide full subject",
     "show_content": "Show content",
diff --git a/src/modules/config.js b/src/modules/config.js
index 8001b854b..8c7a41b25 100644
--- a/src/modules/config.js
+++ b/src/modules/config.js
@@ -37,7 +37,6 @@ export const defaultState = {
   hideMutedThreads: undefined, // instance default
   hideWordFilteredPosts: undefined, // instance default
   muteBotStatuses: undefined, // instance default
-  muteSensitiveStatuses: undefined, // instance default
   collapseMessageWithSubject: undefined, // instance default
   padEmoji: true,
   hideAttachments: false,
diff --git a/src/modules/instance.js b/src/modules/instance.js
index 0a5c1ae76..a0a9e9acf 100644
--- a/src/modules/instance.js
+++ b/src/modules/instance.js
@@ -71,7 +71,6 @@ const defaultState = {
   hideSitename: false,
   hideUserStats: false,
   muteBotStatuses: false,
-  muteSensitiveStatuses: false,
   modalOnRepeat: false,
   modalOnUnfollow: false,
   modalOnBlock: true,
diff --git a/src/services/style_setter/style_setter.js b/src/services/style_setter/style_setter.js
index 369d2c9f1..17682bd40 100644
--- a/src/services/style_setter/style_setter.js
+++ b/src/services/style_setter/style_setter.js
@@ -1,6 +1,6 @@
 import { hex2rgb } from '../color_convert/color_convert.js'
 import { generatePreset } from '../theme_data/theme_data.service.js'
-import { init, getEngineChecksum } from '../theme_data/theme_data_3.service.js'
+import { init, getChecksum } from '../theme_data/theme_data_3.service.js'
 import { convertTheme2To3 } from '../theme_data/theme2_to_theme3.js'
 import { getCssRules } from '../theme_data/css_utils.js'
 import { defaultState } from '../../modules/config.js'
@@ -97,7 +97,7 @@ export const tryLoadCache = () => {
     console.error('Failed to decode theme cache:', e)
     return false
   }
-  if (cache.engineChecksum === getEngineChecksum()) {
+  if (cache.checksum === getChecksum()) {
     const styleSheet = new CSSStyleSheet()
     const lazyStyleSheet = new CSSStyleSheet()
 
@@ -108,7 +108,7 @@ export const tryLoadCache = () => {
 
     return true
   } else {
-    console.warn('Engine checksum doesn\'t match, cache not usable, clearing')
+    console.warn('Checksum doesn\'t match, cache not usable, clearing')
     localStorage.removeItem('pleroma-fe-theme-cache')
   }
 }
@@ -136,7 +136,7 @@ export const applyTheme = async (input, onFinish = (data) => {}) => {
       },
       onLazyFinished () {
         document.adoptedStyleSheets = [styleSheet, lazyStyleSheet]
-        const cache = { engineChecksum: getEngineChecksum(), data: [styleArray, lazyStyleArray] }
+        const cache = { checksum: getChecksum(), data: [styleArray, lazyStyleArray] }
         onFinish(cache)
         localStorage.setItem('pleroma-fe-theme-cache', JSON.stringify(cache))
       }
diff --git a/src/services/theme_data/theme_data_3.service.js b/src/services/theme_data/theme_data_3.service.js
index 15b4493e3..844e951a6 100644
--- a/src/services/theme_data/theme_data_3.service.js
+++ b/src/services/theme_data/theme_data_3.service.js
@@ -143,11 +143,11 @@ componentsContext.keys().forEach(key => {
   components[component.name] = component
 })
 
-const engineChecksum = sum(components)
+const checksum = sum(components)
 
 const ruleToSelector = genericRuleToSelector(components)
 
-export const getEngineChecksum = () => engineChecksum
+export const getChecksum = () => checksum
 
 export const init = (extraRuleset, ultimateBackgroundColor) => {
   const staticVars = {}
@@ -469,6 +469,6 @@ export const init = (extraRuleset, ultimateBackgroundColor) => {
     lazy: result.filter(x => typeof x === 'function'),
     eager: result.filter(x => typeof x !== 'function'),
     staticVars,
-    engineChecksum
+    checksum
   }
 }