diff --git a/src/gtk/help-overlay.blp b/src/gtk/help-overlay.blp
index d88f516..bf852fc 100644
--- a/src/gtk/help-overlay.blp
+++ b/src/gtk/help-overlay.blp
@@ -26,12 +26,12 @@ ShortcutsWindow help_overlay {
       }
 
       ShortcutsShortcut {
-        title: C_("shortcut window", "Select All Flatpaks");
+        title: C_("shortcut window", "Select All Apps");
         action-name: "app.select-all-in-batch-mode";
       }
 
       ShortcutsShortcut {
-        title: C_("shortcut window", "Show Flatpak Runtimes");
+        title: C_("shortcut window", "Show Runtimes");
         action-name: "app.show-runtimes";
       }
     }
@@ -39,7 +39,7 @@ ShortcutsWindow help_overlay {
       title: C_("shortcut window", "More Functions");
 
       ShortcutsShortcut {
-        title: C_("shortcut window", "Manage Orphaned Data Folders");
+        title: C_("shortcut window", "Manage Orphaned Data");
         action-name: "app.manage-data-folders";
       }
 
diff --git a/src/remotes.py b/src/remotes.py
index be69dc3..307b678 100644
--- a/src/remotes.py
+++ b/src/remotes.py
@@ -189,7 +189,7 @@ class RemotesWindow(Adw.Window):
             label = Gtk.Label(label=install_type)
             label.add_css_class("subtitle")
             remote_row.add_suffix(label)
-            remove_button = Gtk.Button(icon_name="user-trash-symbolic", valign=Gtk.Align.CENTER, tooltip_text=_("Remove remote"))
+            remove_button = Gtk.Button(icon_name="user-trash-symbolic", valign=Gtk.Align.CENTER, tooltip_text=_("Remove {}").format(name))
             remove_button.add_css_class("flat")
             remove_button.connect("clicked", self.remove_handler, i)
             remote_row.add_suffix(remove_button)
diff --git a/src/window.blp b/src/window.blp
index 8decbcc..ff2afa0 100644
--- a/src/window.blp
+++ b/src/window.blp
@@ -78,7 +78,7 @@ template WarehouseWindow : Adw.ApplicationWindow {
       [start]
       ToggleButton batch_select_all_button {
         label: "Select All";
-        tooltip-text: _("Select all Flatpaks");
+        // tooltip-text: _("Select all Apps");
       }
       [end]
       Button batch_uninstall_button {
@@ -105,12 +105,12 @@ template WarehouseWindow : Adw.ApplicationWindow {
 menu primary_menu {
   section {
     item {
-      label: _("Show Flatpak Runtimes");
+      label: _("Show Runtimes");
       action: "app.show-runtimes";
     }
 
     item {
-      label: _("Manage Orphaned Data Folders");
+      label: _("Manage Orphaned Data");
       action: "app.manage-data-folders";
     }
 
@@ -120,7 +120,7 @@ menu primary_menu {
     }*/
 
     item {
-      label: _("Manage Flatpak Remotes");
+      label: _("Manage Remotes");
       action: "app.show-remotes-window";
     }
 
diff --git a/src/window.py b/src/window.py
index 7d1e475..b801cea 100644
--- a/src/window.py
+++ b/src/window.py
@@ -478,8 +478,7 @@ class WarehouseWindow(Adw.ApplicationWindow):
 
     def find_app_icon(self, app_id):
         try:
-            icon_path = (
-                self.icon_theme.lookup_icon(app_id, None, 512, 1, self.get_direction(), 0).get_file().get_path())
+            icon_path = (self.icon_theme.lookup_icon(app_id, None, 512, 1, self.get_direction(), 0).get_file().get_path())
         except GLib.GError:
             icon_path = None
         if icon_path: