diff --git a/metadata/en-US/changelogs/next_release.txt b/metadata/en-US/changelogs/next_release.txt
index 479cdfc5c..bfbeebfe6 100644
--- a/metadata/en-US/changelogs/next_release.txt
+++ b/metadata/en-US/changelogs/next_release.txt
@@ -3,6 +3,7 @@
 Changes:
 - Removed Widget
 - Introduced material design icons
+- Removed snowboarding and skiing (need new icons)
 
 Bugfix:
 - Fixed search functionality
diff --git a/src/main/java/de/dennisguse/opentracks/util/TrackIconUtils.java b/src/main/java/de/dennisguse/opentracks/util/TrackIconUtils.java
index 7cbdd275c..b079c9f27 100644
--- a/src/main/java/de/dennisguse/opentracks/util/TrackIconUtils.java
+++ b/src/main/java/de/dennisguse/opentracks/util/TrackIconUtils.java
@@ -48,6 +48,8 @@ public class TrackIconUtils {
     private static final String UNKNOWN = "UNKNOWN";
     private static final String WALK = "WALK";
 
+    private static final int ACTIVITY_UNKNOWN_LOGO = R.drawable.ic_logo_24dp;
+
     private static final int[] AIRPLANE_LIST = new int[]{R.string.activity_type_airplane, R.string.activity_type_commercial_airplane, R.string.activity_type_rc_airplane};
     private static final int[] BIKE_LIST = new int[]{R.string.activity_type_biking, R.string.activity_type_cycling, R.string.activity_type_dirt_bike, R.string.activity_type_motor_bike, R.string.activity_type_mountain_biking, R.string.activity_type_road_biking, R.string.activity_type_track_cycling};
     private static final int[] BOAT_LIST = new int[]{R.string.activity_type_boat, R.string.activity_type_ferry, R.string.activity_type_motor_boating, R.string.activity_type_rc_boat};
@@ -61,12 +63,14 @@ public class TrackIconUtils {
 
     static {
         //Reflects order in ChooseActivityTypeDialogFragment
+        MAP.put(UNKNOWN, new Pair<>(R.string.activity_type_unknown, ACTIVITY_UNKNOWN_LOGO));
         MAP.put(RUN, new Pair<>(R.string.activity_type_running, R.drawable.ic_activity_run_24dp));
         MAP.put(WALK, new Pair<>(R.string.activity_type_walking, R.drawable.ic_activity_walk_24dp));
         MAP.put(BIKE, new Pair<>(R.string.activity_type_biking, R.drawable.ic_activity_bike_24dp));
         MAP.put(DRIVE, new Pair<>(R.string.activity_type_driving, R.drawable.ic_activity_drive_24dp));
-        MAP.put(SKI, new Pair<>(R.string.activity_type_skiing, R.drawable.ic_track_ski));
-        MAP.put(SNOW_BOARDING, new Pair<>(R.string.activity_type_snow_boarding, R.drawable.ic_track_snow_boarding));
+        // TODO Need new icons
+//        MAP.put(SKI, new Pair<>(R.string.activity_type_skiing, R.drawable.ic_track_ski));
+//        MAP.put(SNOW_BOARDING, new Pair<>(R.string.activity_type_snow_boarding, R.drawable.ic_track_snow_boarding));
         MAP.put(AIRPLANE, new Pair<>(R.string.activity_type_airplane, R.drawable.ic_activity_flight_24dp));
         MAP.put(BOAT, new Pair<>(R.string.activity_type_boat, R.drawable.ic_activity_boat_24dp));
     }
@@ -81,10 +85,10 @@ public class TrackIconUtils {
      */
     public static int getIconDrawable(String iconValue) {
         if (iconValue == null || iconValue.equals("")) {
-            return R.drawable.ic_logo_24dp;
+            return ACTIVITY_UNKNOWN_LOGO;
         }
         Pair<Integer, Integer> pair = MAP.get(iconValue);
-        return pair == null ? R.drawable.ic_logo_24dp : pair.second;
+        return pair == null ? ACTIVITY_UNKNOWN_LOGO : pair.second;
     }
 
     /**
@@ -132,12 +136,12 @@ public class TrackIconUtils {
         if (inList(context, activityType, RUN_LIST)) {
             return RUN;
         }
-        if (inList(context, activityType, SKI_LIST)) {
-            return SKI;
-        }
-        if (inList(context, activityType, SNOW_BOARDING_LIST)) {
-            return SNOW_BOARDING;
-        }
+//        if (inList(context, activityType, SKI_LIST)) {
+//            return SKI;
+//        }
+//        if (inList(context, activityType, SNOW_BOARDING_LIST)) {
+//            return SNOW_BOARDING;
+//        }
         if (inList(context, activityType, WALK_LIST)) {
             return WALK;
         }
diff --git a/src/main/res/drawable-hdpi/ic_track_ski.png b/src/main/res/drawable-hdpi/ic_track_ski.png
deleted file mode 100644
index 2500af810..000000000
Binary files a/src/main/res/drawable-hdpi/ic_track_ski.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_track_snow_boarding.png b/src/main/res/drawable-hdpi/ic_track_snow_boarding.png
deleted file mode 100644
index 2cef25181..000000000
Binary files a/src/main/res/drawable-hdpi/ic_track_snow_boarding.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/ic_track_ski.png b/src/main/res/drawable-mdpi/ic_track_ski.png
deleted file mode 100644
index 856d45a6d..000000000
Binary files a/src/main/res/drawable-mdpi/ic_track_ski.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/ic_track_snow_boarding.png b/src/main/res/drawable-mdpi/ic_track_snow_boarding.png
deleted file mode 100644
index b5e161a1c..000000000
Binary files a/src/main/res/drawable-mdpi/ic_track_snow_boarding.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_track_ski.png b/src/main/res/drawable-xhdpi/ic_track_ski.png
deleted file mode 100644
index 51b971c1a..000000000
Binary files a/src/main/res/drawable-xhdpi/ic_track_ski.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_track_snow_boarding.png b/src/main/res/drawable-xhdpi/ic_track_snow_boarding.png
deleted file mode 100644
index 657e6f242..000000000
Binary files a/src/main/res/drawable-xhdpi/ic_track_snow_boarding.png and /dev/null differ