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 a3319aefa..4138fe32d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivityKind.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivityKind.java
@@ -116,9 +116,9 @@ public class ActivityKind {
case TYPE_NOT_MEASURED:
return R.drawable.ic_activity_not_measured;
case TYPE_LIGHT_SLEEP:
- return R.drawable.ic_activity_light_sleep;
+ return R.drawable.ic_activity_sleep;
case TYPE_DEEP_SLEEP:
- return R.drawable.ic_activity_deep_sleep;
+ return R.drawable.ic_activity_sleep;
case TYPE_RUNNING:
return R.drawable.ic_activity_running;
case TYPE_WALKING:
@@ -128,7 +128,9 @@ public class ActivityKind {
case TYPE_TREADMILL:
return R.drawable.ic_activity_walking;
case TYPE_EXERCISE: // fall through
+ return R.drawable.ic_activity_exercise;
case TYPE_SWIMMING: // fall through
+ return R.drawable.ic_activity_swimming;
case TYPE_NOT_WORN: // fall through
case TYPE_ACTIVITY: // fall through
case TYPE_UNKNOWN: // fall through
diff --git a/app/src/main/res/drawable/ic_activity_biking.xml b/app/src/main/res/drawable/ic_activity_biking.xml
index 7001d100b..a2ffce6a5 100644
--- a/app/src/main/res/drawable/ic_activity_biking.xml
+++ b/app/src/main/res/drawable/ic_activity_biking.xml
@@ -1,7 +1,10 @@
-
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_activity_deep_sleep.xml b/app/src/main/res/drawable/ic_activity_deep_sleep.xml
deleted file mode 100644
index abdaea833..000000000
--- a/app/src/main/res/drawable/ic_activity_deep_sleep.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_activity_exercise.xml b/app/src/main/res/drawable/ic_activity_exercise.xml
new file mode 100644
index 000000000..9b802f2da
--- /dev/null
+++ b/app/src/main/res/drawable/ic_activity_exercise.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_activity_light_sleep.xml b/app/src/main/res/drawable/ic_activity_light_sleep.xml
deleted file mode 100644
index abdaea833..000000000
--- a/app/src/main/res/drawable/ic_activity_light_sleep.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_activity_not_measured.xml b/app/src/main/res/drawable/ic_activity_not_measured.xml
index 7a6bb2d01..d42708d7e 100644
--- a/app/src/main/res/drawable/ic_activity_not_measured.xml
+++ b/app/src/main/res/drawable/ic_activity_not_measured.xml
@@ -1,7 +1,10 @@
-
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_activity_running.xml b/app/src/main/res/drawable/ic_activity_running.xml
index 14c06266a..78ce0c027 100644
--- a/app/src/main/res/drawable/ic_activity_running.xml
+++ b/app/src/main/res/drawable/ic_activity_running.xml
@@ -1,7 +1,10 @@
-
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_activity_sleep.xml b/app/src/main/res/drawable/ic_activity_sleep.xml
new file mode 100644
index 000000000..6b13d8083
--- /dev/null
+++ b/app/src/main/res/drawable/ic_activity_sleep.xml
@@ -0,0 +1,10 @@
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_activity_swimming.xml b/app/src/main/res/drawable/ic_activity_swimming.xml
new file mode 100644
index 000000000..391cb99bd
--- /dev/null
+++ b/app/src/main/res/drawable/ic_activity_swimming.xml
@@ -0,0 +1,13 @@
+
+
+
+
diff --git a/app/src/main/res/drawable/ic_activity_unknown.xml b/app/src/main/res/drawable/ic_activity_unknown.xml
index 4e323aeaa..6bde4c5f2 100644
--- a/app/src/main/res/drawable/ic_activity_unknown.xml
+++ b/app/src/main/res/drawable/ic_activity_unknown.xml
@@ -1,7 +1,10 @@
-
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_activity_walking.xml b/app/src/main/res/drawable/ic_activity_walking.xml
index 831c0b345..97036cc9d 100644
--- a/app/src/main/res/drawable/ic_activity_walking.xml
+++ b/app/src/main/res/drawable/ic_activity_walking.xml
@@ -1,7 +1,10 @@
-
+
\ No newline at end of file