diff --git a/drawable-svg/ic_activity_scooter.svg b/drawable-svg/ic_activity_scooter.svg
new file mode 100644
index 000000000..6b53c732b
--- /dev/null
+++ b/drawable-svg/ic_activity_scooter.svg
@@ -0,0 +1,483 @@
+
+
diff --git a/src/main/java/de/dennisguse/opentracks/data/models/ActivityIcon.java b/src/main/java/de/dennisguse/opentracks/data/models/ActivityIcon.java
index 23b339b5b..02011ec1d 100644
--- a/src/main/java/de/dennisguse/opentracks/data/models/ActivityIcon.java
+++ b/src/main/java/de/dennisguse/opentracks/data/models/ActivityIcon.java
@@ -17,6 +17,7 @@ public enum ActivityIcon {
UNKNOWN("UNKNOWN", R.drawable.ic_logo_24dp),
WALK("WALK", R.drawable.ic_activity_walk_24dp),
ESCOOTER("ESCOOTER", R.drawable.ic_activity_escooter_24dp),
+ KICKSCOOTER("KICKSCOOTER", R.drawable.ic_activity_scooter_24dp),
INLINE_SKATING("INLINES_SKATING", R.drawable.ic_activity_inline_skating_24dp),
SKATE_BOARDING("SKATE_BOARDING", R.drawable.ic_activity_skateboarding_24dp),
CLIMBING("CLIMBING", R.drawable.ic_activity_climbing_24dp),
diff --git a/src/main/java/de/dennisguse/opentracks/data/models/ActivityType.java b/src/main/java/de/dennisguse/opentracks/data/models/ActivityType.java
index 9e607c5c3..5adc23dec 100644
--- a/src/main/java/de/dennisguse/opentracks/data/models/ActivityType.java
+++ b/src/main/java/de/dennisguse/opentracks/data/models/ActivityType.java
@@ -58,6 +58,7 @@ public enum ActivityType {
ROWING("rowing", R.string.activity_type_rowing, ActivityIcon.UNKNOWN, true),
RUNNING("running", R.string.activity_type_running, ActivityIcon.RUN, false),
SAILING("sailing", R.string.activity_type_sailing, ActivityIcon.SAILING, true),
+ KICKSCOOTER("kickscooter", R.string.activity_type_kickscooter, ActivityIcon.KICKSCOOTER, true),
SEAPLANE("seaplane", R.string.activity_type_seaplane, ActivityIcon.AIRPLANE, true),
SKATE_BOARDING("skate boarding", R.string.activity_type_skate_boarding, ActivityIcon.SKATE_BOARDING, true),
SKATING("skating", R.string.activity_type_skating, ActivityIcon.UNKNOWN, true),
diff --git a/src/main/java/de/dennisguse/opentracks/fragments/ChooseActivityTypeDialogFragment.java b/src/main/java/de/dennisguse/opentracks/fragments/ChooseActivityTypeDialogFragment.java
index 1aacf353f..8571c8ecd 100644
--- a/src/main/java/de/dennisguse/opentracks/fragments/ChooseActivityTypeDialogFragment.java
+++ b/src/main/java/de/dennisguse/opentracks/fragments/ChooseActivityTypeDialogFragment.java
@@ -47,6 +47,7 @@ public class ChooseActivityTypeDialogFragment extends DialogFragment implements
ActivityType.SNOW_BOARDING,
ActivityType.SKIING,
ActivityType.WALKING,
+ ActivityType.KICKSCOOTER,
ActivityType.ESCOOTER,
ActivityType.INLINE_SKATING,
ActivityType.SKATE_BOARDING,
diff --git a/src/main/res/drawable/ic_activity_scooter_24dp.xml b/src/main/res/drawable/ic_activity_scooter_24dp.xml
new file mode 100644
index 000000000..91262ae21
--- /dev/null
+++ b/src/main/res/drawable/ic_activity_scooter_24dp.xml
@@ -0,0 +1,239 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 4db8181a7..15c7eade2 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -117,6 +117,7 @@ limitations under the License.
driving bus
driving car
escooter
+ scooter
ferry
frisbee
gliding