diff --git a/src/App.scss b/src/App.scss
index 1b781304e..dc784fdd0 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -402,10 +402,6 @@ nav {
     color: var(--text);
     font-size: 100%;
   }
-
-  &.disabled {
-    cursor: not-allowed;
-  }
 }
 
 .menu-item,
diff --git a/src/components/dialog_modal/dialog_modal.vue b/src/components/dialog_modal/dialog_modal.vue
index 096c8ac8c..7ed22f6e9 100644
--- a/src/components/dialog_modal/dialog_modal.vue
+++ b/src/components/dialog_modal/dialog_modal.vue
@@ -71,7 +71,6 @@
     margin: 0;
     padding: 1rem;
     white-space: normal;
-    text-align: center;
   }
 
   .dialog-modal-footer {
@@ -115,7 +114,7 @@
 
     button {
       grid-column: 1;
-      height: 3em;
+      height: 2em;
     }
   }
 }
diff --git a/src/components/draft/draft.js b/src/components/draft/draft.js
index 55ee11a15..e31d02964 100644
--- a/src/components/draft/draft.js
+++ b/src/components/draft/draft.js
@@ -5,15 +5,6 @@ import StatusContent from 'src/components/status_content/status_content.vue'
 import Gallery from 'src/components/gallery/gallery.vue'
 import { cloneDeep } from 'lodash'
 
-import { library } from '@fortawesome/fontawesome-svg-core'
-import {
-  faPollH
-} from '@fortawesome/free-solid-svg-icons'
-
-library.add(
-  faPollH
-)
-
 const Draft = {
   components: {
     PostStatusForm,
diff --git a/src/components/draft/draft.vue b/src/components/draft/draft.vue
index 46227b684..6ccf8695d 100644
--- a/src/components/draft/draft.vue
+++ b/src/components/draft/draft.vue
@@ -27,15 +27,7 @@
         />
       </div>
       <div class="status-preview">
-        <span class="status_content">
-          <p v-if="draft.spoilerText">
-            <i>
-              {{ draft.spoilerText }}:
-            </i>
-          </p>
-          <p v-if="draft.status">{{ draft.status }}</p>
-          <p v-else class="faint">{{ $t('drafts.empty') }}</p>
-        </span>
+        <p>{{ draft.status }}</p>
         <gallery
           v-if="draft.files?.length !== 0"
           class="attachments media-body"
@@ -47,18 +39,6 @@
           @play="$emit('mediaplay', attachment.id)"
           @pause="$emit('mediapause', attachment.id)"
         />
-        <div
-          v-if="draft.poll.options"
-          class="poll-indicator-container"
-          :title="$t('drafts.poll_tooltip')"
-        >
-          <div class="poll-indicator">
-            <FAIcon
-              icon="poll-h"
-              size="3x"
-            />
-          </div>
-        </div>
       </div>
     </div>
     <div v-if="editing">
@@ -108,6 +88,12 @@
 <style lang="scss">
 .Draft {
   position: relative;
+  line-height: 1.1;
+  font-size: initial;
+
+  a {
+    color: var(--link);
+  }
 
   .status-content {
     padding: 0.5em;
@@ -116,11 +102,8 @@
 
   .status-preview {
     display: grid;
-    grid-template-columns: 1fr;
-    grid-auto-columns: 10em;
-    grid-auto-flow: column;
+    grid-template-columns: 1fr 10em;
     grid-gap: 0.5em;
-    align-items: start;
     max-width: 100%;
 
     p {
@@ -128,32 +111,6 @@
       white-space: normal;
       overflow-x: hidden;
     }
-
-    .poll-indicator-container {
-      border-radius: var(--roundness);
-      display: grid;
-      justify-items: center;
-      align-items: center;
-      align-self: start;
-      height: 0;
-      padding-bottom: 62.5%;
-      position: relative;
-    }
-
-    .poll-indicator {
-      box-sizing: border-box;
-      border: 1px solid var(--border);
-      position: absolute;
-      top: 0;
-      bottom: 0;
-      left: 0;
-      right: 0;
-      display: grid;
-      justify-items: center;
-      align-items: center;
-      width: 100%;
-      height: 100%;
-    }
   }
 
   .actions {
diff --git a/src/components/drafts/drafts.vue b/src/components/drafts/drafts.vue
index 9c9b3d584..796993524 100644
--- a/src/components/drafts/drafts.vue
+++ b/src/components/drafts/drafts.vue
@@ -13,7 +13,6 @@
         <List
           v-else
           :items="drafts"
-          :non-interactive="true"
         >
           <template #item="{ item: draft }">
             <Draft
diff --git a/src/components/menu_item.style.js b/src/components/menu_item.style.js
index d7fe0f7c7..5b3ff699c 100644
--- a/src/components/menu_item.style.js
+++ b/src/components/menu_item.style.js
@@ -11,9 +11,8 @@ export default {
     'Avatar'
   ],
   states: {
-    hover: ':hover:not(.disabled)',
-    active: '.-active',
-    disabled: '.disabled'
+    hover: ':hover',
+    active: '.-active'
   },
   defaultRules: [
     {
@@ -86,28 +85,6 @@ export default {
         textColor: '--link',
         textAuto: 'no-preserve'
       }
-    },
-    {
-      component: 'Text',
-      parent: {
-        component: 'MenuItem',
-        state: ['disabled']
-      },
-      directives: {
-        textOpacity: 0.25,
-        textOpacityMode: 'blend'
-      }
-    },
-    {
-      component: 'Icon',
-      parent: {
-        component: 'MenuItem',
-        state: ['disabled']
-      },
-      directives: {
-        textOpacity: 0.25,
-        textOpacityMode: 'blend'
-      }
     }
   ]
 }
diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index c31b86be0..352dad6fc 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -352,12 +352,6 @@ const PostStatusForm = {
         return this.$t('post_status.auto_save_nothing_new')
       }
     },
-    safeToSaveDraft () {
-      return this.newStatus.status ||
-        this.newStatus.spoilerText ||
-        this.newStatus.files?.length ||
-        this.newStatus.hasPoll
-    },
     ...mapGetters(['mergedConfig']),
     ...mapState({
       mobileLayout: state => state.interface.mobileLayout
@@ -753,7 +747,9 @@ const PostStatusForm = {
     saveDraft () {
       if (!this.disableDraft &&
           !this.saveInhibited) {
-        if (this.safeToSaveDraft) {
+        if (this.newStatus.status ||
+            this.newStatus.files?.length ||
+            this.newStatus.hasPoll) {
           return this.$store.dispatch('addOrSaveDraft', { draft: this.newStatus })
             .then(id => {
               if (this.newStatus.id !== id) {
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index 8607b5a8f..20bf81916 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -339,8 +339,6 @@
                   v-if="!disableDraft"
                   class="menu-item dropdown-item dropdown-item-icon"
                   role="menu"
-                  :disabled="!safeToSaveDraft"
-                  :class="{ disabled: !safeToSaveDraft }"
                   @click.prevent="saveDraft"
                   @click="close"
                 >
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 9f35d4342..c10b62a5f 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -1514,8 +1514,6 @@
   "drafts": {
     "drafts": "Drafts",
     "no_drafts": "You have no drafts",
-    "empty": "(No content)",
-    "poll_tooltip": "Draft contains a poll",
     "continue": "Continue composing",
     "save": "Save without posting",
     "abandon": "Abandon draft",