diff --git a/CHANGELOG.md b/CHANGELOG.md
index e6977a854..48a1cb361 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 * Pebble: Increase maximum notification body length from 255 to 512 bytes on firmware 3.x
 * Pebble: Support installing .pbl (language files) on firmware 3.x
 * Pebble: Correct setting the timezone on firmware 3.x (pebble expects the "ID" eg. Europe/Berlin)
+* Pebble: Show correct icon for activity tracker and watchfaces in app installer (language and fw icons still missing)
 
 ####Version 0.6.8
 * Mi Band support for Firmware upgrade/downgrade on Mi Band 1A (white LEDs, no heartrate sensor)
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PBWInstallHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PBWInstallHandler.java
index c0107932d..691ccb0e4 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PBWInstallHandler.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PBWInstallHandler.java
@@ -95,6 +95,19 @@ public class PBWInstallHandler implements InstallHandler {
             if (app != null) {
                 installItem.setName(app.getName());
                 installItem.setDetails(mContext.getString(R.string.pbwinstallhandler_app_item, app.getCreator(), app.getVersion()));
+                int drawable;
+                switch (app.getType()) {
+                    case WATCHFACE:
+                        drawable = R.drawable.ic_watchface;
+                        break;
+                    case APP_ACTIVITYTRACKER:
+                        drawable = R.drawable.ic_activitytracker;
+                        break;
+                    default:
+                        drawable = R.drawable.ic_device_pebble;
+                }
+                installItem.setIcon(drawable);
+
                 installActivity.setInfoText(mContext.getString(R.string.app_install_info, app.getName(), app.getVersion(), app.getCreator()));
                 installActivity.setInstallEnabled(true);
             } else {