diff --git a/F-Droid/res/values/strings.xml b/F-Droid/res/values/strings.xml
index 0c1b7fb40..a533e7bcf 100644
--- a/F-Droid/res/values/strings.xml
+++ b/F-Droid/res/values/strings.xml
@@ -81,6 +81,8 @@
     <string name="tab_available_apps">Available</string>
     <string name="tab_installed_apps">Installed</string>
     <string name="tab_updates">Updates</string>
+    <string name="tab_installed_apps_i18n">Installed (%d)</string>
+    <string name="tab_updates_i18n">Updates (%d)</string>
     <string name="one_update_available">1 update is available.</string>
     <string name="many_updates_available">%d updates are available.</string>
     <string name="fdroid_updates_available">F-Droid Updates Available</string>
@@ -375,4 +377,5 @@
     <string name="theme_light">Light</string>
     <string name="theme_dark">Dark</string>
     <string name="theme_night">Night</string>
+    <string name="installed_title">Installed</string>
 </resources>
diff --git a/F-Droid/src/org/fdroid/fdroid/FDroid.java b/F-Droid/src/org/fdroid/fdroid/FDroid.java
index 0be1356db..84dcc8197 100644
--- a/F-Droid/src/org/fdroid/fdroid/FDroid.java
+++ b/F-Droid/src/org/fdroid/fdroid/FDroid.java
@@ -355,6 +355,7 @@ public class FDroid extends ActionBarActivity {
 
     private void refreshUpdateTabLabel() {
         getTabManager().refreshTabLabel(TabManager.INDEX_CAN_UPDATE);
+        getTabManager().refreshTabLabel(TabManager.INDEX_INSTALLED);
     }
 
     public void removeNotification(int id) {
diff --git a/F-Droid/src/org/fdroid/fdroid/views/AppListFragmentPagerAdapter.java b/F-Droid/src/org/fdroid/fdroid/views/AppListFragmentPagerAdapter.java
index 6de85f127..49fd5b9db 100644
--- a/F-Droid/src/org/fdroid/fdroid/views/AppListFragmentPagerAdapter.java
+++ b/F-Droid/src/org/fdroid/fdroid/views/AppListFragmentPagerAdapter.java
@@ -24,11 +24,14 @@ public class AppListFragmentPagerAdapter extends FragmentPagerAdapter {
         this.parent = parent;
     }
 
+    private String getInstalledTabTitle() {
+        int installedCount = AppProvider.Helper.count(parent, AppProvider.getInstalledUri());
+        return parent.getString(R.string.tab_installed_apps_i18n, installedCount);
+    }
+
     private String getUpdateTabTitle() {
         int updateCount = AppProvider.Helper.count(parent, AppProvider.getCanUpdateUri());
-
-        // TODO: Make RTL friendly, probably by having a different string for both tab_updates_none and tab_updates
-        return parent.getString(R.string.tab_updates) + " (" + updateCount + ")";
+        return parent.getString(R.string.tab_updates_i18n, updateCount);
     }
 
     @Override
@@ -54,7 +57,7 @@ public class AppListFragmentPagerAdapter extends FragmentPagerAdapter {
             case TabManager.INDEX_AVAILABLE:
                 return parent.getString(R.string.tab_available_apps);
             case TabManager.INDEX_INSTALLED:
-                return parent.getString(R.string.tab_installed_apps);
+                return getInstalledTabTitle();
             case TabManager.INDEX_CAN_UPDATE:
                 return getUpdateTabTitle();
             default:
diff --git a/F-Droid/src/org/fdroid/fdroid/views/fragments/CanUpdateAppsFragment.java b/F-Droid/src/org/fdroid/fdroid/views/fragments/CanUpdateAppsFragment.java
index e767077b9..20402afe0 100644
--- a/F-Droid/src/org/fdroid/fdroid/views/fragments/CanUpdateAppsFragment.java
+++ b/F-Droid/src/org/fdroid/fdroid/views/fragments/CanUpdateAppsFragment.java
@@ -20,7 +20,7 @@ public class CanUpdateAppsFragment extends AppListFragment {
 
     @Override
     protected String getFromTitle() {
-        return getString(R.string.tab_updates);
+        return getString(R.string.updates);
     }
 
     @Override
diff --git a/F-Droid/src/org/fdroid/fdroid/views/fragments/InstalledAppsFragment.java b/F-Droid/src/org/fdroid/fdroid/views/fragments/InstalledAppsFragment.java
index d5078b80f..662f91a66 100644
--- a/F-Droid/src/org/fdroid/fdroid/views/fragments/InstalledAppsFragment.java
+++ b/F-Droid/src/org/fdroid/fdroid/views/fragments/InstalledAppsFragment.java
@@ -20,7 +20,7 @@ public class InstalledAppsFragment extends AppListFragment {
 
     @Override
     protected String getFromTitle() {
-        return getString(R.string.tab_installed_apps);
+        return getString(R.string.installed_title);
     }
 
     @Override