diff --git a/main.go b/main.go
index 88c941e..74795bf 100644
--- a/main.go
+++ b/main.go
@@ -5554,27 +5554,39 @@ func (u *ui) mainMenu(gtx layout.Context) layout.Dimensions {
 	return compactCard(gtx, func(gtx layout.Context) layout.Dimensions {
 		return layout.Flex{Axis: layout.Vertical}.Layout(gtx,
 			layout.Rigid(func(gtx layout.Context) layout.Dimensions {
-				return tonedButton(gtx, u.theme, &u.showEntries, "Entries")
+				return rightAlignedMenuButton(gtx, func(gtx layout.Context) layout.Dimensions {
+					return tonedButton(gtx, u.theme, &u.showEntries, "Entries")
+				})
 			}),
 			layout.Rigid(layout.Spacer{Height: unit.Dp(6)}.Layout),
 			layout.Rigid(func(gtx layout.Context) layout.Dimensions {
-				return tonedButton(gtx, u.theme, &u.showRecycle, "Recycle Bin")
+				return rightAlignedMenuButton(gtx, func(gtx layout.Context) layout.Dimensions {
+					return tonedButton(gtx, u.theme, &u.showRecycle, "Recycle Bin")
+				})
 			}),
 			layout.Rigid(layout.Spacer{Height: unit.Dp(6)}.Layout),
 			layout.Rigid(func(gtx layout.Context) layout.Dimensions {
-				return tonedButton(gtx, u.theme, &u.showAPITokens, "API Tokens")
+				return rightAlignedMenuButton(gtx, func(gtx layout.Context) layout.Dimensions {
+					return tonedButton(gtx, u.theme, &u.showAPITokens, "API Tokens")
+				})
 			}),
 			layout.Rigid(layout.Spacer{Height: unit.Dp(6)}.Layout),
 			layout.Rigid(func(gtx layout.Context) layout.Dimensions {
-				return tonedButton(gtx, u.theme, &u.showAPIAudit, "API Audit")
+				return rightAlignedMenuButton(gtx, func(gtx layout.Context) layout.Dimensions {
+					return tonedButton(gtx, u.theme, &u.showAPIAudit, "API Audit")
+				})
 			}),
 			layout.Rigid(layout.Spacer{Height: unit.Dp(6)}.Layout),
 			layout.Rigid(func(gtx layout.Context) layout.Dimensions {
-				return tonedButton(gtx, u.theme, &u.showAbout, "About")
+				return rightAlignedMenuButton(gtx, func(gtx layout.Context) layout.Dimensions {
+					return tonedButton(gtx, u.theme, &u.showAbout, "About")
+				})
 			}),
 			layout.Rigid(layout.Spacer{Height: unit.Dp(6)}.Layout),
 			layout.Rigid(func(gtx layout.Context) layout.Dimensions {
-				return tonedButton(gtx, u.theme, &u.openSecuritySettings, "Settings")
+				return rightAlignedMenuButton(gtx, func(gtx layout.Context) layout.Dimensions {
+					return tonedButton(gtx, u.theme, &u.openSecuritySettings, "Settings")
+				})
 			}),
 		)
 	})
@@ -5715,20 +5727,26 @@ func (u *ui) syncMenu(gtx layout.Context) layout.Dimensions {
 				}
 				return layout.Flex{Axis: layout.Vertical}.Layout(gtx,
 					layout.Rigid(func(gtx layout.Context) layout.Dimensions {
-						return tonedButton(gtx, u.theme, &u.shareCurrentVault, "Share Vault")
+						return rightAlignedMenuButton(gtx, func(gtx layout.Context) layout.Dimensions {
+							return tonedButton(gtx, u.theme, &u.shareCurrentVault, "Share Vault")
+						})
 					}),
 					layout.Rigid(layout.Spacer{Height: unit.Dp(6)}.Layout),
 				)
 			}),
 			layout.Rigid(func(gtx layout.Context) layout.Dimensions {
-				return tonedButton(gtx, u.theme, &u.openAdvancedSync, "Open Advanced Sync")
+				return rightAlignedMenuButton(gtx, func(gtx layout.Context) layout.Dimensions {
+					return tonedButton(gtx, u.theme, &u.openAdvancedSync, "Open Advanced Sync")
+				})
 			}),
 		}
 		if u.shouldShowRemoteSyncSetupShortcut() {
 			rows = append(rows,
 				layout.Rigid(layout.Spacer{Height: unit.Dp(6)}.Layout),
 				layout.Rigid(func(gtx layout.Context) layout.Dimensions {
-					return tonedButton(gtx, u.theme, &u.useSavedAdvancedSyncRemote, u.remoteSyncSetupShortcutLabel())
+					return rightAlignedMenuButton(gtx, func(gtx layout.Context) layout.Dimensions {
+						return tonedButton(gtx, u.theme, &u.useSavedAdvancedSyncRemote, u.remoteSyncSetupShortcutLabel())
+					})
 				}),
 			)
 		}
@@ -5736,7 +5754,9 @@ func (u *ui) syncMenu(gtx layout.Context) layout.Dimensions {
 			rows = append(rows,
 				layout.Rigid(layout.Spacer{Height: unit.Dp(6)}.Layout),
 				layout.Rigid(func(gtx layout.Context) layout.Dimensions {
-					return tonedButton(gtx, u.theme, &u.openSelectedVaultRemote, u.directRemoteSyncShortcutLabel())
+					return rightAlignedMenuButton(gtx, func(gtx layout.Context) layout.Dimensions {
+						return tonedButton(gtx, u.theme, &u.openSelectedVaultRemote, u.directRemoteSyncShortcutLabel())
+					})
 				}),
 			)
 		}
@@ -5744,7 +5764,9 @@ func (u *ui) syncMenu(gtx layout.Context) layout.Dimensions {
 			rows = append(rows,
 				layout.Rigid(layout.Spacer{Height: unit.Dp(6)}.Layout),
 				layout.Rigid(func(gtx layout.Context) layout.Dimensions {
-					return tonedButton(gtx, u.theme, &u.useSavedAdvancedSyncRemote, u.remoteSyncSettingsShortcutLabel())
+					return rightAlignedMenuButton(gtx, func(gtx layout.Context) layout.Dimensions {
+						return tonedButton(gtx, u.theme, &u.useSavedAdvancedSyncRemote, u.remoteSyncSettingsShortcutLabel())
+					})
 				}),
 			)
 		}
@@ -5752,7 +5774,9 @@ func (u *ui) syncMenu(gtx layout.Context) layout.Dimensions {
 			rows = append(rows,
 				layout.Rigid(layout.Spacer{Height: unit.Dp(6)}.Layout),
 				layout.Rigid(func(gtx layout.Context) layout.Dimensions {
-					return tonedButton(gtx, u.theme, &u.removeSelectedRemoteBinding, u.removeRemoteSyncShortcutLabel())
+					return rightAlignedMenuButton(gtx, func(gtx layout.Context) layout.Dimensions {
+						return tonedButton(gtx, u.theme, &u.removeSelectedRemoteBinding, u.removeRemoteSyncShortcutLabel())
+					})
 				}),
 			)
 		}
@@ -7422,6 +7446,17 @@ func syncChoiceButton(gtx layout.Context, th *material.Theme, click *widget.Clic
 	return btn.Layout(gtx)
 }
 
+func rightAlignedMenuButton(gtx layout.Context, child layout.Widget) layout.Dimensions {
+	return layout.Flex{Alignment: layout.Middle}.Layout(gtx,
+		layout.Flexed(1, func(gtx layout.Context) layout.Dimensions {
+			return layout.Dimensions{}
+		}),
+		layout.Rigid(func(gtx layout.Context) layout.Dimensions {
+			return child(gtx)
+		}),
+	)
+}
+
 func syncDialogSectionLabel(th *material.Theme, text string) layout.Widget {
 	return func(gtx layout.Context) layout.Dimensions {
 		lbl := material.Label(th, unit.Sp(12), strings.ToUpper(text))