diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AppManagerActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AppManagerActivity.java
index e82d1b23..56a324dd 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AppManagerActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AppManagerActivity.java
@@ -22,6 +22,7 @@ import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.ListIterator;
 import java.util.UUID;
 
 import nodomain.freeyourgadget.gadgetbridge.GBApplication;
@@ -47,7 +48,6 @@ public class AppManagerActivity extends GBActivity {
             if (action.equals(GBApplication.ACTION_QUIT)) {
                 finish();
             } else if (action.equals(ACTION_REFRESH_APPLIST)) {
-                //appList.clear();
                 int appCount = intent.getIntExtra("app_count", 0);
                 for (Integer i = 0; i < appCount; i++) {
                     String appName = intent.getStringExtra("app_name" + i.toString());
@@ -55,11 +55,21 @@ public class AppManagerActivity extends GBActivity {
                     UUID uuid = UUID.fromString(intent.getStringExtra("app_uuid" + i.toString()));
                     GBDeviceApp.Type appType = GBDeviceApp.Type.values()[intent.getIntExtra("app_type" + i.toString(), 0)];
 
-                    appList.add(new GBDeviceApp(uuid, appName, appCreator, "", appType));
-                }
-
-                if (prefs.getBoolean("pebble_force_untested", false)) {
-                    appList.addAll(getSystemApps());
+                    boolean found = false;
+                    for (final ListIterator<GBDeviceApp> iter = appList.listIterator(); iter.hasNext(); ) {
+                        final GBDeviceApp app = iter.next();
+                        if (app.getName().equals(appName) && app.getCreator().equals(appCreator)) {
+                            app.setOnDevice(true);
+                            iter.set(app);
+                            found = true;
+                            break;
+                        }
+                    }
+                    if (!found) {
+                        GBDeviceApp app = new GBDeviceApp(uuid, appName, appCreator, "", appType);
+                        app.setOnDevice(true);
+                        appList.add(app);
+                    }
                 }
 
                 mGBDeviceAppAdapter.notifyDataSetChanged();
@@ -76,8 +86,10 @@ public class AppManagerActivity extends GBActivity {
 
     private List<GBDeviceApp> getSystemApps() {
         List<GBDeviceApp> systemApps = new ArrayList<>();
-        systemApps.add(new GBDeviceApp(UUID.fromString("4dab81a6-d2fc-458a-992c-7a1f3b96a970"), "Sports (System)", "Pebble Inc.", "", GBDeviceApp.Type.APP_SYSTEM));
-        systemApps.add(new GBDeviceApp(UUID.fromString("cf1e816a-9db0-4511-bbb8-f60c48ca8fac"), "Golf (System)", "Pebble Inc.", "", GBDeviceApp.Type.APP_SYSTEM));
+        if (prefs.getBoolean("pebble_force_untested", false)) {
+            systemApps.add(new GBDeviceApp(UUID.fromString("4dab81a6-d2fc-458a-992c-7a1f3b96a970"), "Sports (System)", "Pebble Inc.", "", GBDeviceApp.Type.APP_SYSTEM));
+            systemApps.add(new GBDeviceApp(UUID.fromString("cf1e816a-9db0-4511-bbb8-f60c48ca8fac"), "Golf (System)", "Pebble Inc.", "", GBDeviceApp.Type.APP_SYSTEM));
+        }
         if (mGBDevice != null && !"aplite".equals(PebbleUtils.getPlatformName(mGBDevice.getHardwareVersion()))) {
             systemApps.add(new GBDeviceApp(PebbleProtocol.UUID_PEBBLE_HEALTH, "Health (System)", "Pebble Inc.", "", GBDeviceApp.Type.APP_SYSTEM));
         }
@@ -149,9 +161,7 @@ public class AppManagerActivity extends GBActivity {
 
         appList.addAll(getCachedApps());
 
-        if (prefs.getBoolean("pebble_force_untested", false)) {
-            appList.addAll(getSystemApps());
-        }
+        appList.addAll(getSystemApps());
 
         IntentFilter filter = new IntentFilter();
         filter.addAction(GBApplication.ACTION_QUIT);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBDeviceAppAdapter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBDeviceAppAdapter.java
index 5a813792..d4ae263f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBDeviceAppAdapter.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBDeviceAppAdapter.java
@@ -41,7 +41,15 @@ public class GBDeviceAppAdapter extends ArrayAdapter<GBDeviceApp> {
         ImageView deviceImageView = (ImageView) view.findViewById(R.id.item_image);
 
         deviceAppVersionAuthorLabel.setText(getContext().getString(R.string.appversion_by_creator, deviceApp.getVersion(), deviceApp.getCreator()));
-        deviceAppNameLabel.setText(deviceApp.getName());
+
+        // FIXME: replace with small icons
+        String appNameLabelText = deviceApp.getName();
+        if (deviceApp.isInCache() || deviceApp.isOnDevice()) {
+            appNameLabelText += " (" + (deviceApp.isInCache() ? "C" : "")
+                    + (deviceApp.isOnDevice() ? "D" : "") + ")";
+        }
+        deviceAppNameLabel.setText(appNameLabelText);
+
         switch (deviceApp.getType()) {
             case APP_GENERIC:
                 deviceImageView.setImageResource(R.drawable.ic_watchapp);
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDeviceApp.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDeviceApp.java
index d2280d17..f5587645 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDeviceApp.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDeviceApp.java
@@ -12,6 +12,7 @@ public class GBDeviceApp {
     private final UUID uuid;
     private final Type type;
     private final boolean inCache;
+    private boolean isOnDevice;
     private final boolean configurable;
 
     public GBDeviceApp(UUID uuid, String name, String creator, String version, Type type) {
@@ -23,6 +24,7 @@ public class GBDeviceApp {
         //FIXME: do not assume
         this.inCache = false;
         this.configurable = false;
+        this.isOnDevice = false;
     }
 
     public GBDeviceApp(JSONObject json, boolean configurable) {
@@ -52,10 +54,18 @@ public class GBDeviceApp {
         this.configurable = configurable;
     }
 
+    public void setOnDevice(boolean isOnDevice) {
+        this.isOnDevice = isOnDevice;
+    }
+
     public boolean isInCache() {
         return inCache;
     }
 
+    public boolean isOnDevice() {
+        return isOnDevice;
+    }
+
     public String getName() {
         return name;
     }