diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivityKind.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivityKind.java
index 700c38df0..9d05c262c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivityKind.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivityKind.java
@@ -62,29 +62,29 @@ public enum ActivityKind {
     NAVIGATE(0x04000000, R.string.activity_type_navigate),
     INDOOR_TRACK(0x04000001, R.string.activity_type_indoor_track),
     HANDCYCLING(0x04000002, R.string.activity_type_handcycling),
-    E_BIKE(0x04000003, R.string.activity_type_e_bike),
-    BIKE_COMMUTE(0x04000004, R.string.activity_type_bike_commute),
+    E_BIKE(0x04000003, R.string.activity_type_e_bike, R.drawable.ic_activity_biking),
+    BIKE_COMMUTE(0x04000004, R.string.activity_type_bike_commute, R.drawable.ic_activity_biking),
     HANDCYCLING_INDOOR(0x04000005, R.string.activity_type_handcycling_indoor),
     TRANSITION(0x04000006, R.string.activity_type_transition),
     FITNESS_EQUIPMENT(0x04000007, R.string.activity_type_fitness_equipment),
     STAIR_STEPPER(0x04000008, R.string.activity_type_stair_stepper),
     PILATES(0x04000009, R.string.activity_type_pilates),
-    POOL_SWIM(0x0400000a, R.string.activity_type_pool_swimming),
+    POOL_SWIM(0x0400000a, R.string.activity_type_pool_swimming, R.drawable.ic_activity_swimming),
     TENNIS(0x0400000b, R.string.activity_type_tennis),
     PLATFORM_TENNIS(0x0400000c, R.string.activity_type_platform_tennis),
-    TABLE_TENNIS(0x0400000d, R.string.activity_type_table_tennis),
+    TABLE_TENNIS(0x0400000d, R.string.activity_type_table_tennis, R.drawable.ic_activity_pingpong),
     AMERICAN_FOOTBALL(0x0400000e, R.string.activity_type_american_football),
     TRAINING(0x0400000f, R.string.activity_type_training),
     CARDIO(0x04000010, R.string.activity_type_cardio),
     BREATHWORK(0x04000011, R.string.activity_type_breathwork),
-    INDOOR_WALKING(0x04000012, R.string.activity_type_indoor_walking),
+    INDOOR_WALKING(0x04000012, R.string.activity_type_indoor_walking, R.drawable.ic_activity_walking),
     XC_CLASSIC_SKI(0x04000013, R.string.activity_type_xc_classic_ski),
     SKIING(0x04000014, R.string.activity_type_skiing),
     SNOWBOARDING(0x04000015, R.string.activity_type_snowboarding),
-    ROWING(0x04000016, R.string.activity_type_rowing),
-    MOUNTAINEERING(0x04000017, R.string.activity_type_mountaineering),
+    ROWING(0x04000016, R.string.activity_type_rowing, R.drawable.ic_activity_rowing),
+    MOUNTAINEERING(0x04000017, R.string.activity_type_mountaineering, R.drawable.ic_activity_climbing),
     MULTISPORT(0x04000019, R.string.activity_type_multisport),
-    PADDLING(0x0400001a, R.string.activity_type_paddling),
+    PADDLING(0x0400001a, R.string.activity_type_paddling, R.drawable.ic_activity_rowing),
     FLYING(0x0400001b, R.string.activity_type_flying),
     MOTORCYCLING(0x0400001d, R.string.activity_type_motorcycling),
     BOATING(0x0400001e, R.string.activity_type_boating),
@@ -107,8 +107,8 @@ public enum ActivityKind {
     SURFING(0x04000031, R.string.activity_type_surfing),
     WAKEBOARDING(0x04000032, R.string.activity_type_wakeboarding),
     WATER_SKIING(0x04000033, R.string.activity_type_water_skiing),
-    KAYAKING(0x04000034, R.string.activity_type_kayaking),
-    RAFTING(0x04000035, R.string.activity_type_rafting),
+    KAYAKING(0x04000034, R.string.activity_type_kayaking, R.drawable.ic_activity_rowing),
+    RAFTING(0x04000035, R.string.activity_type_rafting, R.drawable.ic_activity_rowing),
     WINDSURFING(0x04000036, R.string.activity_type_windsurfing),
     KITESURFING(0x04000037, R.string.activity_type_kitesurfing),
     TACTICAL(0x04000038, R.string.activity_type_tactical),
@@ -148,7 +148,7 @@ public enum ActivityKind {
     WAKESURFING(0x0400005a, R.string.activity_type_wakesurfing),
     MIXED_MARTIAL_ARTS(0x0400005b, R.string.activity_type_mixed_martial_arts), // aka MMA
     DANCE(0x0400005c, R.string.activity_type_dance),
-    MOUNTAIN_HIKE(0x040000e2, R.string.activity_type_mountain_hike),
+    MOUNTAIN_HIKE(0x040000e2, R.string.activity_type_mountain_hike, R.drawable.ic_activity_climbing),
     CROSS_TRAINER(0x0400005d, R.string.activity_type_cross_trainer),
     FREE_TRAINING(0x0400005e, R.string.activity_type_free_training),
     DYNAMIC_CYCLE(0x0400005f, R.string.activity_type_dynamic_cycle),
@@ -230,9 +230,9 @@ public enum ActivityKind {
     PARACHUTING(0x040000ae, R.string.activity_type_parachuting),
     PARKOUR(0x040000af, R.string.activity_type_parkour),
     INDOOR_RUNNING(0x040000b0, R.string.activity_type_indoor_running),
-    OUTDOOR_RUNNING(0x040000b1, R.string.activity_type_outdoor_running),
-    OUTDOOR_WALKING(0x040000b2, R.string.activity_type_outdoor_walking),
-    OUTDOOR_CYCLING(0x040000b3, R.string.activity_type_outdoor_cycling),
+    OUTDOOR_RUNNING(0x040000b1, R.string.activity_type_outdoor_running, R.drawable.ic_activity_running),
+    OUTDOOR_WALKING(0x040000b2, R.string.activity_type_outdoor_walking, R.drawable.ic_activity_hiking),
+    OUTDOOR_CYCLING(0x040000b3, R.string.activity_type_outdoor_cycling, R.drawable.ic_activity_biking),
     AEROBIC_COMBO(0x040000b4, R.string.activity_type_aerobic_combo),
     AEROBICS(0x040000b5, R.string.activity_type_aerobics),
     AIR_WALKER(0x040000b6, R.string.activity_type_air_walker),