diff --git a/changelog.d/roundup4.skip b/changelog.d/roundup4.skip
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/App.scss b/src/App.scss
index 6fa3a95b7..78c20c0f9 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -498,6 +498,8 @@ nav {
   box-sizing: content-box;
   color: inherit;
 
+  --shadow: none;
+
   &.-link {
     /* stylelint-disable-next-line declaration-no-important */
     color: var(--link) !important;
@@ -1094,8 +1096,3 @@ option {
     }
   }
 }
-
-@property --shadow {
-  syntax: "*";
-  inherits: false;
-}
diff --git a/src/components/checkbox/checkbox.vue b/src/components/checkbox/checkbox.vue
index b6eab3ef7..e447595f2 100644
--- a/src/components/checkbox/checkbox.vue
+++ b/src/components/checkbox/checkbox.vue
@@ -85,8 +85,6 @@ export default {
     width: 1.2em;
     height: 1.2em;
     box-shadow: none;
-
-    --_shadow: var(--shadow);
   }
 
   &-indicator::before {
@@ -98,7 +96,7 @@ export default {
     width: 1.1em;
     height: 1.1em;
     border-radius: var(--roundness);
-    box-shadow: var(--_shadow);
+    box-shadow: var(--shadow);
     background-color: var(--background);
     vertical-align: top;
     text-align: center;
diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index f9eb1bdcd..944c43153 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -363,12 +363,6 @@ const PostStatusForm = {
       }
     },
     safeToSaveDraft () {
-      console.log('safe', (
-        this.newStatus.status ||
-        this.newStatus.spoilerText ||
-        this.newStatus.files?.length ||
-        this.newStatus.hasPoll
-      ) && this.saveable)
       return (
         this.newStatus.status ||
         this.newStatus.spoilerText ||
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index 260a89cb7..e5eaa3af8 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -334,26 +334,22 @@
                 class="dropdown-menu"
                 role="menu"
               >
-                <div
+                <button
+                  v-if="!hideDraft || !disableDraft"
                   class="menu-item dropdown-item"
+                  role="menu"
+                  :disabled="!safeToSaveDraft && saveable"
                   :class="{ disabled: !safeToSaveDraft }"
+                  @click.prevent="saveDraft"
+                  @click="close"
                 >
-                  <button
-                    v-if="!hideDraft || !disableDraft"
-                    class="main-button"
-                    role="menu"
-                    :disabled="!safeToSaveDraft"
-                    @click.prevent="saveDraft"
-                    @click="close"
-                  >
-                    <template v-if="closeable">
-                      {{ $t('post_status.save_to_drafts_and_close_button') }}
-                    </template>
-                    <template v-else>
-                      {{ $t('post_status.save_to_drafts_button') }}
-                    </template>
-                  </button>
-                </div>
+                  <template v-if="closeable">
+                    {{ $t('post_status.save_to_drafts_and_close_button') }}
+                  </template>
+                  <template v-else>
+                    {{ $t('post_status.save_to_drafts_button') }}
+                  </template>
+                </button>
               </div>
             </template>
           </Popover>
diff --git a/src/components/settings_modal/tabs/general_tab.vue b/src/components/settings_modal/tabs/general_tab.vue
index c8db96c5e..9d23630a9 100644
--- a/src/components/settings_modal/tabs/general_tab.vue
+++ b/src/components/settings_modal/tabs/general_tab.vue
@@ -269,17 +269,14 @@
             {{ $t('settings.image_compression') }}
           </BooleanSetting>
         </li>
-        <ul class="setting-list suboptions">
-          <li>
-            <BooleanSetting
-              path="alwaysUseJpeg"
-              expert="1"
-              parent-path="imageCompression"
-            >
-              {{ $t('settings.always_use_jpeg') }}
-            </BooleanSetting>
-          </li>
-        </ul>
+        <li>
+          <BooleanSetting
+            path="alwaysUseJpeg"
+            expert="1"
+          >
+            {{ $t('settings.always_use_jpeg') }}
+          </BooleanSetting>
+        </li>
         <li>
           <BooleanSetting
             path="useContainFit"
diff --git a/src/panel.scss b/src/panel.scss
index ecc39f43a..47d55aa4a 100644
--- a/src/panel.scss
+++ b/src/panel.scss
@@ -2,7 +2,6 @@
 .panel {
   --__panel-background: var(--background);
   --__panel-backdrop-filter: var(--backdrop-filter);
-  --_shadow: var(--shadow);
 
   .tab-switcher .tabs {
     background: var(--__panel-background);
@@ -30,7 +29,7 @@
     left: 0;
     right: 0;
     z-index: 5;
-    box-shadow: var(--_shadow);
+    box-shadow: var(--shadow);
     pointer-events: none;
   }
 }
@@ -155,13 +154,11 @@
     linear-gradient(to bottom, var(--background), var(--background)),
     linear-gradient(to bottom, var(--__panel-background), var(--__panel-background));
 
-  --_shadow: var(--shadow);
-
   &::after {
     background-color: var(--background);
     z-index: -2;
     border-radius: var(--roundness) var(--roundness) 0 0;
-    box-shadow: var(--_shadow);
+    box-shadow: var(--shadow);
   }
 
   &:not(.-flexible-height) {
diff --git a/src/services/theme_data/theme_data_3.service.js b/src/services/theme_data/theme_data_3.service.js
index 33d860b8a..d4f88e883 100644
--- a/src/services/theme_data/theme_data_3.service.js
+++ b/src/services/theme_data/theme_data_3.service.js
@@ -567,13 +567,7 @@ export const init = ({
       if (!liteMode && combination.state.indexOf('hover') >= 0) {
         combination.lazy = true
       }
-
-      if (
-        parent?.component !== 'Root' &&
-          !virtualComponents.has(component.name) &&
-          !transparentComponents.has(component.name) &&
-          extraCompileComponents.has(component.name)
-      ) {
+      if (extraCompileComponents.has(component.name)) {
         combination.lazy = true
       }