diff --git a/src/config/locales/en/translation.json b/src/config/locales/en/translation.json
index ef520396..7c2933ac 100644
--- a/src/config/locales/en/translation.json
+++ b/src/config/locales/en/translation.json
@@ -55,7 +55,7 @@
     "favourite": "Favourited",
     "bookmark": "Bookmarks",
     "local": "Local timeline",
-    "public": "Public timeline",
+    "public": "Federated timeline",
     "hashtag": "Hashtags",
     "search": "Search",
     "lists": "Lists"
@@ -68,20 +68,12 @@
     "follow_requests": "Follow requests",
     "direct_messages": "Direct messages",
     "local": "Local timeline",
-    "public": "Public timeline",
+    "public": "Federated timeline",
     "hashtag": "Hashtags",
     "search": "Search",
     "lists": "Lists",
     "members": "Members",
-    "option": {
-      "title": "Option",
-      "show_reblogs": "Show boosts",
-      "show_replies": "Show replies",
-      "apply": "Apply"
-    },
-    "new_toot": "Publish",
-    "reload": "Reload",
-    "settings": "Settings"
+    "reload": "Reload"
   },
   "settings": {
     "title": "Settings",
@@ -104,13 +96,6 @@
     },
     "timeline": {
       "title": "Timeline",
-      "unread_notification": {
-        "title": "Unread notifications",
-        "description": "Customize unread notifications for each timeline.",
-        "direct": "Direct messages",
-        "local": "Local timeline",
-        "public": "Public timeline"
-      },
       "use_marker": {
         "title": "Load the timeline from the last reading position",
         "home": "Home",
@@ -280,37 +265,6 @@
     }
   },
   "modals": {
-    "new_toot": {
-      "title": "New post",
-      "cw": "Write your warning here",
-      "status": "What's on your mind?",
-      "cancel": "Cancel",
-      "toot": "Publish",
-      "close_confirm": "Are you sure you want to discard this post?",
-      "close_confirm_ok": "Discard",
-      "close_confirm_cancel": "Continue editing",
-      "description": "Add alternate text for this media",
-      "footer": {
-        "add_image": "Add images",
-        "poll": "Add a poll",
-        "change_visibility": "Change visibility",
-        "change_sensitive": "Mark media as sensitive",
-        "add_cw": "Add content warnings",
-        "pined_hashtag": "Pinned hashtag"
-      },
-      "poll": {
-        "add_choice": "Add an option",
-        "expires": {
-          "5_minutes": "5 minutes",
-          "30_minutes": "30 minutes",
-          "1_hour": "1 hour",
-          "6_hours": "6 hours",
-          "1_day": "1 day",
-          "3_days": "3 days",
-          "7_days": "7 days"
-        }
-      }
-    },
     "jump": {
       "jump_to": "Jump to..."
     },
@@ -331,13 +285,10 @@
       "title": "Keyboard shortcuts",
       "ctrl_number": "Switch accounts",
       "ctrl_k": "Jump to other timelines",
-      "ctrl_n": "Open the new post dialog",
-      "ctrl_enter": "Publish the post",
+      "ctrl_enter": "Send the post",
       "ctrl_r": "Refresh current timeline",
       "j": "Select the next post",
       "k": "Select the previous post",
-      "h": "Switch focus to the left column",
-      "l": "Switch focus to the right column",
       "r": "Reply to the selected post",
       "b": "Boost the selected post",
       "f": "Favourite the selected post",
@@ -509,7 +460,7 @@
       "require_domain_name": "A domain name is required",
       "domain_format": "Please only enter the domain name"
     },
-    "new_toot": {
+    "compose": {
       "toot_length": "Post length should be between {{min}} and {{max}}",
       "attach_length": "You can only attach up to {{max}} image",
       "attach_length_plural": "You can only attach up to {{max}} images",
@@ -554,5 +505,33 @@
       "title": "Poll expired",
       "body": "{{username}}'s poll has ended"
     }
+  },
+  "compose": {
+    "title": "New post",
+    "cw": "Write your warning here",
+    "status": "What's on your mind?",
+    "cancel": "Cancel",
+    "toot": "Post",
+    "description": "Add alternate text for this media",
+    "footer": {
+      "add_image": "Add images",
+      "poll": "Add a poll",
+      "change_visibility": "Change visibility",
+      "change_sensitive": "Mark media as sensitive",
+      "add_cw": "Add content warnings",
+      "pined_hashtag": "Pinned hashtag"
+    },
+    "poll": {
+      "add_choice": "Add an option",
+      "expires": {
+        "5_minutes": "5 minutes",
+        "30_minutes": "30 minutes",
+        "1_hour": "1 hour",
+        "6_hours": "6 hours",
+        "1_day": "1 day",
+        "3_days": "3 days",
+        "7_days": "7 days"
+      }
+    }
   }
 }
diff --git a/src/renderer/components/TimelineSpace/Compose.vue b/src/renderer/components/TimelineSpace/Compose.vue
index c6baeb0c..211c3111 100644
--- a/src/renderer/components/TimelineSpace/Compose.vue
+++ b/src/renderer/components/TimelineSpace/Compose.vue
@@ -3,14 +3,8 @@
     <Quote v-if="inReplyTo" :message="inReplyTo" @close="clearReply" />
     <Quote v-if="quoteTo" :message="quoteTo" @close="clearQuote" />
     <el-form :model="form" class="compose-form">
-      <el-input v-model="form.spoiler" class="spoiler" :placeholder="$t('modals.new_toot.cw')" v-if="cw" />
-      <el-input
-        v-model="form.status"
-        type="textarea"
-        :autosize="{ minRows: 2 }"
-        :placeholder="$t('modals.new_toot.status')"
-        ref="statusRef"
-      />
+      <el-input v-model="form.spoiler" class="spoiler" :placeholder="$t('compose.cw')" v-if="cw" />
+      <el-input v-model="form.status" type="textarea" :autosize="{ minRows: 2 }" :placeholder="$t('compose.status')" ref="statusRef" />
       <div class="preview" ref="previewRef">
         <div class="image-wrapper" v-for="media in attachments" :key="media.id">
           <img :src="media.preview_url" class="preview-image" />
@@ -18,7 +12,7 @@
         </div>
       </div>
       <div class="nsfw" v-if="attachments.length > 0">
-        <el-checkbox v-model="nsfw">{{ $t('modals.new_toot.footer.change_sensitive') }}</el-checkbox>
+        <el-checkbox v-model="nsfw">{{ $t('compose.footer.change_sensitive') }}</el-checkbox>
       </div>
       <div class="poll" v-if="poll.options.length > 0">
         <ul class="options-list">
@@ -31,7 +25,7 @@
             </el-radio>
           </li>
         </ul>
-        <el-button class="add-poll" type="info" size="small" @click="addPollOption">{{ $t('modals.new_toot.poll.add_choice') }}</el-button>
+        <el-button class="add-poll" type="info" size="small" @click="addPollOption">{{ $t('compose.poll.add_choice') }}</el-button>
         <el-select v-model="poll.expires_in" size="small" value-key="value">
           <el-option v-for="exp in expiresList" :key="exp.value" :label="exp.label" :value="exp.value"> </el-option>
         </el-select>
@@ -47,7 +41,7 @@
           </el-button>
           <div>
             <el-dropdown trigger="click" @command="changeVisibility">
-              <el-button size="default" link :title="$t('modals.new_toot.footer.change_visibility')">
+              <el-button size="default" link :title="$t('compose.footer.change_visibility')">
                 <font-awesome-icon :icon="visibilityIcon" />
               </el-button>
               <template #dropdown>
@@ -94,7 +88,7 @@
         </el-button-group>
         <div class="actions-group">
           <span>{{ statusChars }}</span>
-          <el-button type="primary" @click="post" :loading="loading"> {{ $t('modals.new_toot.toot') }} </el-button>
+          <el-button type="primary" @click="post" :loading="loading"> {{ $t('compose.toot') }} </el-button>
         </div>
       </div>
     </el-form>
@@ -152,31 +146,31 @@ export default defineComponent({
     })
     const expiresList = reactive<Array<Expire>>([
       {
-        label: i18n.t('modals.new_toot.poll.expires.5_minutes'),
+        label: i18n.t('compose.poll.expires.5_minutes'),
         value: 60 * 5
       },
       {
-        label: i18n.t('modals.new_toot.poll.expires.30_minutes'),
+        label: i18n.t('compose.poll.expires.30_minutes'),
         value: 60 * 30
       },
       {
-        label: i18n.t('modals.new_toot.poll.expires.1_hour'),
+        label: i18n.t('compose.poll.expires.1_hour'),
         value: 3600
       },
       {
-        label: i18n.t('modals.new_toot.poll.expires.6_hours'),
+        label: i18n.t('compose.poll.expires.6_hours'),
         value: 3600 * 6
       },
       {
-        label: i18n.t('modals.new_toot.poll.expires.1_day'),
+        label: i18n.t('compose.poll.expires.1_day'),
         value: 3600 * 24
       },
       {
-        label: i18n.t('modals.new_toot.poll.expires.3_days'),
+        label: i18n.t('compose.poll.expires.3_days'),
         value: 3600 * 24 * 3
       },
       {
-        label: i18n.t('modals.new_toot.poll.expires.7_days'),
+        label: i18n.t('compose.poll.expires.7_days'),
         value: 3600 * 24 * 7
       }
     ])
@@ -399,7 +393,7 @@ export default defineComponent({
       const file = e.dataTransfer?.files.item(0)
       if (file === null || (!file.type.includes('image') && !file.type.includes('video'))) {
         ElMessage({
-          message: i18n.t('validation.new_toot.attach_image'),
+          message: i18n.t('validation.compose.attach_image'),
           type: 'error'
         })
         return false