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 10ed5b732..89e5f4a0f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivityKind.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivityKind.java
@@ -150,7 +150,7 @@ public enum ActivityKind {
     DANCE(0x0400005c, R.string.activity_type_dance),
     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),
+    FREE_TRAINING(0x0400005e, R.string.activity_type_free_training, R.drawable.ic_activity_free_training),
     DYNAMIC_CYCLE(0x0400005f, R.string.activity_type_dynamic_cycle),
     KICKBOXING(0x04000060, R.string.activity_type_kickboxing),
     FITNESS_EXERCISES(0x04000061, R.string.activity_type_fitness_exercises),
@@ -231,7 +231,7 @@ public enum ActivityKind {
     PARKOUR(0x040000af, R.string.activity_type_parkour),
     INDOOR_RUNNING(0x040000b0, R.string.activity_type_indoor_running, R.drawable.ic_activity_indoor_running),
     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_WALKING(0x040000b2, R.string.activity_type_outdoor_walking, R.drawable.ic_activity_outdoor_walking),
     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),
@@ -274,7 +274,7 @@ public enum ActivityKind {
     SQUARE_DANCE(0x040000da, R.string.activity_type_square_dance),
     STAIR_CLIMBER(0x040000db, R.string.activity_type_stair_climber),
     STEPPER(0x040000dc, R.string.activity_type_stepper),
-    STRETCHING(0x040000dd, R.string.activity_type_stretching),
+    STRETCHING(0x040000dd, R.string.activity_type_stretching, R.drawable.ic_activity_stretching),
     TABLE_FOOTBALL(0x040000de, R.string.activity_type_table_football),
     TUG_OF_WAR(0x040000df, R.string.activity_type_tug_of_war),
     WALL_BALL(0x040000e0, R.string.activity_type_wall_ball),
@@ -293,8 +293,8 @@ public enum ActivityKind {
     BIATHLON(0x040000ee, R.string.activity_type_biathlon),
     BUNGEE_JUMPING(0x040000ef, R.string.activity_type_bungee_jumping),
     ORIENTEERING(0x040000f0, R.string.activity_type_orienteering),
-    TREKKING(0x040000f1, R.string.activity_type_trekking),
-    TRAIL_RUN(0x040000f2, R.string.activity_type_trail_run),
+    TREKKING(0x040000f1, R.string.activity_type_trekking, R.drawable.ic_activity_hiking),
+    TRAIL_RUN(0x040000f2, R.string.activity_type_trail_run, R.drawable.ic_activity_trail_run),
     ;
 
     private final int code;
diff --git a/app/src/main/res/drawable/ic_activity_free_training.xml b/app/src/main/res/drawable/ic_activity_free_training.xml
new file mode 100644
index 000000000..2cb6b97a5
--- /dev/null
+++ b/app/src/main/res/drawable/ic_activity_free_training.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="25dp"
+    android:height="25dp"
+    android:tint="#7E7E7E"
+    android:viewportWidth="25"
+    android:viewportHeight="25">
+    <path
+        android:fillColor="#000000"
+        android:pathData="M 12 2 C 13.1 2 14 2.9 14 4 C 14 5.1 13.1 6 12 6 C 10.9 6 10 5.1 10 4 C 10 2.9 10.9 2 12 2 Z M 20.644 6.167 L 15.028 7.781 L 15 22 L 13 22 L 13 16 L 11 16 L 11 22 L 9 22 L 9.01 9.26 L 3.94 10.56 L 3.536 8.999 L 20.104 4.573 Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_activity_outdoor_walking.xml b/app/src/main/res/drawable/ic_activity_outdoor_walking.xml
new file mode 100644
index 000000000..c45b081eb
--- /dev/null
+++ b/app/src/main/res/drawable/ic_activity_outdoor_walking.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="45sp"
+    android:height="45sp"
+    android:tint="#7E7E7E"
+    android:viewportWidth="45"
+    android:viewportHeight="45">
+    <path
+        android:fillColor="#000000"
+        android:pathData="M 22.651 3.58 C 20.926 3.761 19.691 5.286 19.872 7.011 C 20.054 8.734 21.579 9.971 23.304 9.789 C 25.027 9.608 26.263 8.082 26.082 6.358 C 25.901 4.634 24.374 3.398 22.651 3.58 Z M 21.173 10.628 C 20.863 10.66 20.593 10.741 20.327 10.855 C 18.649 11.367 18.187 15.545 18.187 15.545 L 14.6 41.032 L 17.527 41.026 L 20.805 27.857 L 25.387 32.795 L 26.158 40.986 L 29.398 41.09 L 28.236 30.038 L 23.12 22.663 L 23.856 17.58 L 26.048 20.523 L 33.197 19.772 L 35.372 40.462 L 35.892 40.373 L 33.847 19.704 L 34.463 19.639 L 34.137 16.534 L 33.52 16.599 L 33.414 15.591 L 32.765 15.66 L 32.871 16.667 L 27.896 17.19 L 23.845 11.811 C 23.237 11.003 22.243 10.515 21.173 10.628 Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_activity_stretching.xml b/app/src/main/res/drawable/ic_activity_stretching.xml
new file mode 100644
index 000000000..713cc99b7
--- /dev/null
+++ b/app/src/main/res/drawable/ic_activity_stretching.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="25dp"
+    android:height="25dp"
+    android:tint="#7E7E7E"
+    android:viewportWidth="25"
+    android:viewportHeight="25">
+    <path
+        android:fillColor="#000000"
+        android:pathData="M 15.559 4.564 C 14.611 4.247 14.106 3.234 14.423 2.286 C 14.741 1.338 15.753 0.833 16.701 1.15 C 17.65 1.467 18.155 2.48 17.837 3.428 C 17.52 4.377 16.507 4.881 15.559 4.564 Z M 11.591 10.906 L 10.643 12.717 L 9.668 11.293 L 10.616 9.593 L 12.93 5.315 C 13.373 4.936 14.72 4.686 15.308 4.883 C 15.479 4.94 16.231 5.067 16.227 5.927 C 16.227 5.927 16.435 6.518 16.357 8.319 L 15.071 23.485 L 13.131 23.465 L 13.79 14.998 L 11.482 17.71 L 7.882 12.015 L 9.125 10.89 L 11.588 14.411 L 12.691 11.712 L 12.91 8.758" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_activity_trail_run.xml b/app/src/main/res/drawable/ic_activity_trail_run.xml
new file mode 100644
index 000000000..0ff3c0ed3
--- /dev/null
+++ b/app/src/main/res/drawable/ic_activity_trail_run.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="45sp"
+    android:height="45sp"
+    android:tint="#7E7E7E"
+    android:viewportWidth="25"
+    android:viewportHeight="25">
+    <path
+        android:fillColor="#000000"
+        android:pathData="M 13.5 5.5 C 14.59 5.5 15.5 4.443 15.5 3.5 C 15.5 2.557 14.443 1.5 13.5 1.5 C 12.557 1.5 11.5 2.557 11.5 3.5 C 11.5 4.443 12.39 5.5 13.5 5.5 M 9.89 19.38 L 10.89 15 L 13 17 L 13 23 L 15 23 L 15 15.5 L 12.89 13.5 L 13.5 10.5 C 14.79 12 16.79 13 19 13 L 19 11 C 17.09 11 15.5 10 14.69 8.58 L 13.69 7 C 13.29 6.38 12.69 6 12 6 C 11.69 6 11.5 6.08 11.19 6.08 L 6 8.28 L 6 13 L 8 13 L 8 9.58 L 9.79 8.88 L 8.19 17 L 3.29 16 L 2.89 18 Z M 10.121 22.68 C 10.679 21.598 10.148 20.821 9.205 20.821 C 8.262 20.821 7.225 20.743 7.225 21.685 C 7.225 22.628 7.397 22.953 8.472 22.668 M 6.249 22.353 C 7.119 21.965 6.587 21.527 5.47 21.595 C 4.529 21.654 4.235 21.501 4.235 22.444 C 4.235 23.387 5.296 22.477 6.072 22.567 M 18.484 21.79 C 17.794 20.797 17.672 21.166 17.226 21.256 C 16.684 21.366 15.865 21.934 16.073 22.446 C 16.346 23.121 17.05 22.661 18.258 22.513 M 12.556 21.791 C 12.41 21.227 12.961 21.223 11.798 21.442 C 10.945 21.603 10.928 21.399 11.221 22.208 C 11.637 23.356 11.691 22.546 12.432 22.366" />
+</vector>