diff --git a/src/App.scss b/src/App.scss
index c38c2e53..67e40540 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -749,9 +749,8 @@ option {
     margin-top: -1em;
   }
 
-  &.badge-neutral {
-    background-color: $fallback--cGreen;
-    background-color: var(--badgeNeutral, $fallback--cGreen);
+  &.-neutral {
+    background-color: var(--badgeNeutral);
     color: white;
     color: var(--badgeNeutralText, white);
   }
diff --git a/src/components/draft/draft.vue b/src/components/draft/draft.vue
index daa890d8..d9d35612 100644
--- a/src/components/draft/draft.vue
+++ b/src/components/draft/draft.vue
@@ -72,18 +72,14 @@
 <script src="./draft.js"></script>
 
 <style lang="scss">
-@import "src/variables";
-
 .Draft {
   margin: 1em;
 
   .status-content {
-    border: 1px solid $fallback--faint;
-    border-color: var(--faint, $fallback--faint);
-    border-radius: $fallback--inputRadius;
-    border-radius: var(--inputRadius, $fallback--inputRadius);
-    color: $fallback--text;
-    color: var(--text, $fallback--text);
+    border: 1px solid;
+    border-color: var(--faint);
+    border-radius: var(--inputRadius);
+    color: var(--text);
     padding: 0.5em;
     margin: 0.5em 0;
   }
diff --git a/src/components/draft_closer/draft_closer.vue b/src/components/draft_closer/draft_closer.vue
index e5ab9e7f..1afb1f44 100644
--- a/src/components/draft_closer/draft_closer.vue
+++ b/src/components/draft_closer/draft_closer.vue
@@ -5,7 +5,7 @@
       v-body-scroll-lock="true"
       class="confirm-modal"
       :on-cancel="cancel"
-      >
+    >
       <template #header>
         <span>
           {{ $t('post_status.close_confirm_title') }}
diff --git a/src/components/navigation/navigation_entry.vue b/src/components/navigation/navigation_entry.vue
index 990209c1..9b04bdbb 100644
--- a/src/components/navigation/navigation_entry.vue
+++ b/src/components/navigation/navigation_entry.vue
@@ -34,8 +34,8 @@
       <slot />
       <div
         v-if="item.badgeGetter && getters[item.badgeGetter]"
-        class="badge -notification"
-        :class="[`badge-${item.badgeStyle}`]"
+        class="badge"
+        :class="[`-${item.badgeStyle}`]"
       >
         {{ getters[item.badgeGetter] }}
       </div>
diff --git a/src/components/navigation/navigation_pins.vue b/src/components/navigation/navigation_pins.vue
index ce9f18e7..37351b91 100644
--- a/src/components/navigation/navigation_pins.vue
+++ b/src/components/navigation/navigation_pins.vue
@@ -19,8 +19,8 @@
       >{{ item.iconLetter }}</span>
       <div
         v-if="item.badgeGetter && getters[item.badgeGetter]"
-        class="badge -dot -notification"
-        :class="[`alert-dot-${item.badgeStyle}`]"
+        class="badge -dot"
+        :class="[`-${item.badgeStyle}`]"
       />
     </router-link>
   </span>
@@ -36,13 +36,11 @@
   height: 100%;
 
   &.alert-dot-notification {
-    background-color: $fallback--cRed;
-    background-color: var(--badgeNotification, $fallback--cRed);
+    background-color: var(--badgeNotification);
   }
 
   &.alert-dot-neutral {
-    background-color: $fallback--cGreen;
-    background-color: var(--badgeNeutral, $fallback--cGreen);
+    background-color: var(--badgeNeutral);
   }
 
   .pinned-item {
diff --git a/src/components/side_drawer/side_drawer.vue b/src/components/side_drawer/side_drawer.vue
index f6382520..311e377a 100644
--- a/src/components/side_drawer/side_drawer.vue
+++ b/src/components/side_drawer/side_drawer.vue
@@ -255,7 +255,7 @@
             /> {{ $t('nav.drafts') }}
             <span
               v-if="draftCount"
-              class="badge badge-neutral"
+              class="badge -neutral"
             >
               {{ draftCount }}
             </span>