diff --git a/src/components/MessageList.vue b/src/components/MessageList.vue
index 00fb2b9..394d738 100644
--- a/src/components/MessageList.vue
+++ b/src/components/MessageList.vue
@@ -260,29 +260,33 @@ const hasCountData = computed(() => {
         <div class="selection-actions">
           <v-btn
             size="small"
+            icon="mdi-folder-move-outline"
             variant="text"
-            prepend-icon="mdi-folder-move-outline"
             :disabled="!hasSelection"
             @click="emit('moveSelection')"
           >
-            Move
+            <v-icon>mdi-folder-move-outline</v-icon>
+            <v-tooltip activator="parent" location="bottom">Move Selected</v-tooltip>
           </v-btn>
           <v-btn
             size="small"
+            icon="mdi-delete-outline"
             variant="text"
-            prepend-icon="mdi-delete-outline"
             :disabled="!hasSelection"
             @click="emit('deleteSelection')"
           >
-            Delete
+            <v-icon>mdi-delete-outline</v-icon>
+            <v-tooltip activator="parent" location="bottom">Delete Selected</v-tooltip>
           </v-btn>
           <v-btn
             size="small"
+            icon="mdi-close"
             variant="text"
             :disabled="!hasSelection"
             @click="emit('clearSelection')"
           >
-            Clear
+            <v-icon>mdi-close</v-icon>
+            <v-tooltip activator="parent" location="bottom">Clear Selected</v-tooltip>
           </v-btn>
         </div>
       </div>
diff --git a/src/components/reader/ReaderToolbar.vue b/src/components/reader/ReaderToolbar.vue
index ebc4151..77d86c5 100644
--- a/src/components/reader/ReaderToolbar.vue
+++ b/src/components/reader/ReaderToolbar.vue
@@ -144,31 +144,23 @@ const currentSecurityLevel = computed(() => {
 
     <v-spacer />
 
-    <v-menu>
-      <template #activator="{ props: menuProps }">
-        <v-btn
-          v-bind="menuProps"
-          icon="mdi-dots-vertical"
-          variant="text"
-        >
-          <v-icon>mdi-dots-vertical</v-icon>
-          <v-tooltip activator="parent" location="bottom">More Actions</v-tooltip>
-        </v-btn>
-      </template>
+    <v-btn
+      icon="mdi-folder-move-outline"
+      variant="text"
+      @click="emit('move')"
+    >
+      <v-icon>mdi-folder-move-outline</v-icon>
+      <v-tooltip activator="parent" location="bottom">Move To Folder</v-tooltip>
+    </v-btn>
 
-      <v-list density="compact">
-        <v-list-item
-          prepend-icon="mdi-folder-move-outline"
-          title="Move To Folder"
-          @click="emit('move')"
-        />
-        <v-list-item
-          prepend-icon="mdi-delete-outline"
-          title="Delete"
-          @click="emit('delete')"
-        />
-      </v-list>
-    </v-menu>
+    <v-btn
+      icon="mdi-delete-outline"
+      variant="text"
+      @click="emit('delete')"
+    >
+      <v-icon>mdi-delete-outline</v-icon>
+      <v-tooltip activator="parent" location="bottom">Delete</v-tooltip>
+    </v-btn>
   </v-toolbar>
 </template>