diff --git a/lib/widgets/collection/app_bar.dart b/lib/widgets/collection/app_bar.dart
index 8436686b6..973f89e15 100644
--- a/lib/widgets/collection/app_bar.dart
+++ b/lib/widgets/collection/app_bar.dart
@@ -200,33 +200,33 @@ class _CollectionAppBarState extends State<CollectionAppBar> with SingleTickerPr
                 PopupMenuItem(
                   key: Key('menu-sort'),
                   value: CollectionAction.sort,
-                  child: MenuRow(text: 'Sort...', icon: AIcons.sort),
+                  child: MenuRow(text: 'Sort…', icon: AIcons.sort),
                 ),
                 if (collection.sortFactor == EntrySortFactor.date)
                   PopupMenuItem(
                     key: Key('menu-group'),
                     value: CollectionAction.group,
-                    child: MenuRow(text: 'Group...', icon: AIcons.group),
+                    child: MenuRow(text: 'Group…', icon: AIcons.group),
                   ),
                 if (collection.isBrowsing) ...[
+                  if (kDebugMode)
+                    PopupMenuItem(
+                      value: CollectionAction.refresh,
+                      child: MenuRow(text: 'Refresh', icon: AIcons.refresh),
+                    ),
                   if (AvesApp.mode == AppMode.main)
-                    if (kDebugMode)
-                      PopupMenuItem(
-                        value: CollectionAction.refresh,
-                        child: MenuRow(text: 'Refresh', icon: AIcons.refresh),
-                      ),
-                  PopupMenuItem(
-                    value: CollectionAction.select,
-                    child: MenuRow(text: 'Select', icon: AIcons.select),
-                  ),
+                    PopupMenuItem(
+                      value: CollectionAction.select,
+                      child: MenuRow(text: 'Select', icon: AIcons.select),
+                    ),
                   PopupMenuItem(
                     value: CollectionAction.stats,
                     child: MenuRow(text: 'Stats', icon: AIcons.stats),
                   ),
-                  if (canAddShortcuts)
+                  if (AvesApp.mode == AppMode.main && canAddShortcuts)
                     PopupMenuItem(
                       value: CollectionAction.addShortcut,
-                      child: MenuRow(text: 'Add shortcut', icon: AIcons.addShortcut),
+                      child: MenuRow(text: 'Add shortcut…', icon: AIcons.addShortcut),
                     ),
                 ],
                 if (collection.isSelecting) ...[
diff --git a/lib/widgets/filter_grids/common/filter_grid_page.dart b/lib/widgets/filter_grids/common/filter_grid_page.dart
index ecc8ae752..6e54cf5bf 100644
--- a/lib/widgets/filter_grids/common/filter_grid_page.dart
+++ b/lib/widgets/filter_grids/common/filter_grid_page.dart
@@ -87,7 +87,7 @@ class FilterNavigationPage extends StatelessWidget {
         ),
         settings.navRemoveRoutePredicate(CollectionPage.routeName),
       ),
-      onLongPress: (filter, tapPosition) => _showMenu(context, filter, tapPosition),
+      onLongPress: AvesApp.mode == AppMode.main ? (filter, tapPosition) => _showMenu(context, filter, tapPosition) : null,
     );
   }
 
@@ -119,7 +119,7 @@ class FilterNavigationPage extends StatelessWidget {
             PopupMenuItem(
               key: Key('menu-sort'),
               value: ChipSetAction.sort,
-              child: MenuRow(text: 'Sort...', icon: AIcons.sort),
+              child: MenuRow(text: 'Sort…', icon: AIcons.sort),
             ),
           ];
         },
diff --git a/lib/widgets/fullscreen/info/maps/common.dart b/lib/widgets/fullscreen/info/maps/common.dart
index a1e24be9e..d0d67dae5 100644
--- a/lib/widgets/fullscreen/info/maps/common.dart
+++ b/lib/widgets/fullscreen/info/maps/common.dart
@@ -62,7 +62,7 @@ class MapButtonPanel extends StatelessWidget {
                 MapOverlayButton(
                   icon: AIcons.openInNew,
                   onPressed: () => AndroidAppService.openMap(geoUri),
-                  tooltip: 'Show on map...',
+                  tooltip: 'Show on map…',
                 ),
                 SizedBox(height: padding),
                 MapOverlayButton(
@@ -81,7 +81,7 @@ class MapButtonPanel extends StatelessWidget {
                       MapStyleChangedNotification().dispatch(context);
                     }
                   },
-                  tooltip: 'Style map...',
+                  tooltip: 'Style map…',
                 ),
                 Spacer(),
                 MapOverlayButton(