diff --git a/src/main/java/de/dennisguse/opentracks/fragments/ChooseActivityTypeImageAdapter.java b/src/main/java/de/dennisguse/opentracks/fragments/ChooseActivityTypeImageAdapter.java
index 6470fce0e..13ec1b180 100644
--- a/src/main/java/de/dennisguse/opentracks/fragments/ChooseActivityTypeImageAdapter.java
+++ b/src/main/java/de/dennisguse/opentracks/fragments/ChooseActivityTypeImageAdapter.java
@@ -22,6 +22,8 @@ import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.ImageView;
 
+import androidx.core.content.ContextCompat;
+
 import java.util.List;
 
 import de.dennisguse.opentracks.R;
@@ -76,7 +78,8 @@ class ChooseActivityTypeImageAdapter extends BaseAdapter {
         }
 
         if (position == selected) {
-            imageView.setBackgroundResource(R.drawable.list_selector_background_transition_holo_dark);
+            //TODO Should use theme!
+            imageView.setBackgroundColor(ContextCompat.getColor(parent.getContext(), R.color.holo_orange_dark));
         } else {
             imageView.setBackgroundColor(Color.TRANSPARENT);
         }
diff --git a/src/main/res/drawable-hdpi/btn_check_off_disabled_focused_holo_dark.png b/src/main/res/drawable-hdpi/btn_check_off_disabled_focused_holo_dark.png
deleted file mode 100644
index 7e22d1127..000000000
Binary files a/src/main/res/drawable-hdpi/btn_check_off_disabled_focused_holo_dark.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/btn_check_off_disabled_holo_dark.png b/src/main/res/drawable-hdpi/btn_check_off_disabled_holo_dark.png
deleted file mode 100644
index 4bcc51d51..000000000
Binary files a/src/main/res/drawable-hdpi/btn_check_off_disabled_holo_dark.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/btn_check_off_focused_holo_dark.png b/src/main/res/drawable-hdpi/btn_check_off_focused_holo_dark.png
deleted file mode 100644
index 08382ea8a..000000000
Binary files a/src/main/res/drawable-hdpi/btn_check_off_focused_holo_dark.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/btn_check_off_holo_dark.png b/src/main/res/drawable-hdpi/btn_check_off_holo_dark.png
deleted file mode 100644
index 8a463164c..000000000
Binary files a/src/main/res/drawable-hdpi/btn_check_off_holo_dark.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/btn_check_off_pressed_holo_dark.png b/src/main/res/drawable-hdpi/btn_check_off_pressed_holo_dark.png
deleted file mode 100644
index 533b5f075..000000000
Binary files a/src/main/res/drawable-hdpi/btn_check_off_pressed_holo_dark.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/btn_check_on_disabled_focused_holo_dark.png b/src/main/res/drawable-hdpi/btn_check_on_disabled_focused_holo_dark.png
deleted file mode 100644
index dfeacb968..000000000
Binary files a/src/main/res/drawable-hdpi/btn_check_on_disabled_focused_holo_dark.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/btn_check_on_disabled_holo_dark.png b/src/main/res/drawable-hdpi/btn_check_on_disabled_holo_dark.png
deleted file mode 100644
index cccd61ef9..000000000
Binary files a/src/main/res/drawable-hdpi/btn_check_on_disabled_holo_dark.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/btn_check_on_focused_holo_dark.png b/src/main/res/drawable-hdpi/btn_check_on_focused_holo_dark.png
deleted file mode 100644
index 41222ee8e..000000000
Binary files a/src/main/res/drawable-hdpi/btn_check_on_focused_holo_dark.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/btn_check_on_holo_dark.png b/src/main/res/drawable-hdpi/btn_check_on_holo_dark.png
deleted file mode 100644
index ebc45c163..000000000
Binary files a/src/main/res/drawable-hdpi/btn_check_on_holo_dark.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/btn_check_on_pressed_holo_dark.png b/src/main/res/drawable-hdpi/btn_check_on_pressed_holo_dark.png
deleted file mode 100644
index 658ab1ae8..000000000
Binary files a/src/main/res/drawable-hdpi/btn_check_on_pressed_holo_dark.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/list_activated_holo.9.png b/src/main/res/drawable-hdpi/list_activated_holo.9.png
deleted file mode 100644
index 5e48d55ec..000000000
Binary files a/src/main/res/drawable-hdpi/list_activated_holo.9.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/list_focused_holo.9.png b/src/main/res/drawable-hdpi/list_focused_holo.9.png
deleted file mode 100644
index 6cdc96f58..000000000
Binary files a/src/main/res/drawable-hdpi/list_focused_holo.9.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/list_longpressed_holo.9.png b/src/main/res/drawable-hdpi/list_longpressed_holo.9.png
deleted file mode 100644
index ad44e63a2..000000000
Binary files a/src/main/res/drawable-hdpi/list_longpressed_holo.9.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/list_pressed_holo_dark.9.png b/src/main/res/drawable-hdpi/list_pressed_holo_dark.9.png
deleted file mode 100644
index 75069476a..000000000
Binary files a/src/main/res/drawable-hdpi/list_pressed_holo_dark.9.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/list_selector_disabled_holo_dark.9.png b/src/main/res/drawable-hdpi/list_selector_disabled_holo_dark.9.png
deleted file mode 100644
index f6fd30dcd..000000000
Binary files a/src/main/res/drawable-hdpi/list_selector_disabled_holo_dark.9.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/spinner_default_holo_dark.9.png b/src/main/res/drawable-hdpi/spinner_default_holo_dark.9.png
deleted file mode 100644
index 03da08cc8..000000000
Binary files a/src/main/res/drawable-hdpi/spinner_default_holo_dark.9.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/spinner_disabled_holo_dark.9.png b/src/main/res/drawable-hdpi/spinner_disabled_holo_dark.9.png
deleted file mode 100644
index 210832cd3..000000000
Binary files a/src/main/res/drawable-hdpi/spinner_disabled_holo_dark.9.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/spinner_focused_holo_dark.9.png b/src/main/res/drawable-hdpi/spinner_focused_holo_dark.9.png
deleted file mode 100644
index 36113f1cf..000000000
Binary files a/src/main/res/drawable-hdpi/spinner_focused_holo_dark.9.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/spinner_pressed_holo_dark.9.png b/src/main/res/drawable-hdpi/spinner_pressed_holo_dark.9.png
deleted file mode 100644
index 5ed17d37a..000000000
Binary files a/src/main/res/drawable-hdpi/spinner_pressed_holo_dark.9.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/textfield_activated_holo_dark.9.png b/src/main/res/drawable-hdpi/textfield_activated_holo_dark.9.png
deleted file mode 100644
index a33da333d..000000000
Binary files a/src/main/res/drawable-hdpi/textfield_activated_holo_dark.9.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/textfield_default_holo_dark.9.png b/src/main/res/drawable-hdpi/textfield_default_holo_dark.9.png
deleted file mode 100644
index 23d3a5961..000000000
Binary files a/src/main/res/drawable-hdpi/textfield_default_holo_dark.9.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/textfield_disabled_focused_holo_dark.9.png b/src/main/res/drawable-hdpi/textfield_disabled_focused_holo_dark.9.png
deleted file mode 100644
index fe753154c..000000000
Binary files a/src/main/res/drawable-hdpi/textfield_disabled_focused_holo_dark.9.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/textfield_disabled_holo_dark.9.png b/src/main/res/drawable-hdpi/textfield_disabled_holo_dark.9.png
deleted file mode 100644
index 769bc0a1b..000000000
Binary files a/src/main/res/drawable-hdpi/textfield_disabled_holo_dark.9.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/textfield_focused_holo_dark.9.png b/src/main/res/drawable-hdpi/textfield_focused_holo_dark.9.png
deleted file mode 100644
index 90557d6eb..000000000
Binary files a/src/main/res/drawable-hdpi/textfield_focused_holo_dark.9.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/btn_check_off_disabled_focused_holo_dark.png b/src/main/res/drawable-mdpi/btn_check_off_disabled_focused_holo_dark.png
deleted file mode 100644
index c63e4d546..000000000
Binary files a/src/main/res/drawable-mdpi/btn_check_off_disabled_focused_holo_dark.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/btn_check_off_disabled_holo_dark.png b/src/main/res/drawable-mdpi/btn_check_off_disabled_holo_dark.png
deleted file mode 100644
index 654d449bf..000000000
Binary files a/src/main/res/drawable-mdpi/btn_check_off_disabled_holo_dark.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/btn_check_off_focused_holo_dark.png b/src/main/res/drawable-mdpi/btn_check_off_focused_holo_dark.png
deleted file mode 100644
index 782141779..000000000
Binary files a/src/main/res/drawable-mdpi/btn_check_off_focused_holo_dark.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/btn_check_off_holo_dark.png b/src/main/res/drawable-mdpi/btn_check_off_holo_dark.png
deleted file mode 100644
index 2b6c13130..000000000
Binary files a/src/main/res/drawable-mdpi/btn_check_off_holo_dark.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/btn_check_off_pressed_holo_dark.png b/src/main/res/drawable-mdpi/btn_check_off_pressed_holo_dark.png
deleted file mode 100644
index 448706f7b..000000000
Binary files a/src/main/res/drawable-mdpi/btn_check_off_pressed_holo_dark.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/btn_check_on_disabled_focused_holo_dark.png b/src/main/res/drawable-mdpi/btn_check_on_disabled_focused_holo_dark.png
deleted file mode 100644
index 855cd8831..000000000
Binary files a/src/main/res/drawable-mdpi/btn_check_on_disabled_focused_holo_dark.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/btn_check_on_disabled_holo_dark.png b/src/main/res/drawable-mdpi/btn_check_on_disabled_holo_dark.png
deleted file mode 100644
index e180ea76b..000000000
Binary files a/src/main/res/drawable-mdpi/btn_check_on_disabled_holo_dark.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/btn_check_on_focused_holo_dark.png b/src/main/res/drawable-mdpi/btn_check_on_focused_holo_dark.png
deleted file mode 100644
index 8f2c6389f..000000000
Binary files a/src/main/res/drawable-mdpi/btn_check_on_focused_holo_dark.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/btn_check_on_holo_dark.png b/src/main/res/drawable-mdpi/btn_check_on_holo_dark.png
deleted file mode 100644
index 49d2fd85c..000000000
Binary files a/src/main/res/drawable-mdpi/btn_check_on_holo_dark.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/btn_check_on_pressed_holo_dark.png b/src/main/res/drawable-mdpi/btn_check_on_pressed_holo_dark.png
deleted file mode 100644
index af974faf3..000000000
Binary files a/src/main/res/drawable-mdpi/btn_check_on_pressed_holo_dark.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/list_activated_holo.9.png b/src/main/res/drawable-mdpi/list_activated_holo.9.png
deleted file mode 100644
index 03a3e8b22..000000000
Binary files a/src/main/res/drawable-mdpi/list_activated_holo.9.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/list_focused_holo.9.png b/src/main/res/drawable-mdpi/list_focused_holo.9.png
deleted file mode 100644
index 8f73437f2..000000000
Binary files a/src/main/res/drawable-mdpi/list_focused_holo.9.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/list_longpressed_holo.9.png b/src/main/res/drawable-mdpi/list_longpressed_holo.9.png
deleted file mode 100644
index 03b06ba5c..000000000
Binary files a/src/main/res/drawable-mdpi/list_longpressed_holo.9.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/list_pressed_holo_dark.9.png b/src/main/res/drawable-mdpi/list_pressed_holo_dark.9.png
deleted file mode 100644
index 3bf71ab0a..000000000
Binary files a/src/main/res/drawable-mdpi/list_pressed_holo_dark.9.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/list_selector_disabled_holo_dark.9.png b/src/main/res/drawable-mdpi/list_selector_disabled_holo_dark.9.png
deleted file mode 100644
index 92da2f0dd..000000000
Binary files a/src/main/res/drawable-mdpi/list_selector_disabled_holo_dark.9.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/spinner_default_holo_dark.9.png b/src/main/res/drawable-mdpi/spinner_default_holo_dark.9.png
deleted file mode 100644
index 878f4b507..000000000
Binary files a/src/main/res/drawable-mdpi/spinner_default_holo_dark.9.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/spinner_disabled_holo_dark.9.png b/src/main/res/drawable-mdpi/spinner_disabled_holo_dark.9.png
deleted file mode 100644
index 2734f20bf..000000000
Binary files a/src/main/res/drawable-mdpi/spinner_disabled_holo_dark.9.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/spinner_focused_holo_dark.9.png b/src/main/res/drawable-mdpi/spinner_focused_holo_dark.9.png
deleted file mode 100644
index e83969f68..000000000
Binary files a/src/main/res/drawable-mdpi/spinner_focused_holo_dark.9.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/spinner_pressed_holo_dark.9.png b/src/main/res/drawable-mdpi/spinner_pressed_holo_dark.9.png
deleted file mode 100644
index c19a1b2c6..000000000
Binary files a/src/main/res/drawable-mdpi/spinner_pressed_holo_dark.9.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/textfield_activated_holo_dark.9.png b/src/main/res/drawable-mdpi/textfield_activated_holo_dark.9.png
deleted file mode 100644
index e5e6fe644..000000000
Binary files a/src/main/res/drawable-mdpi/textfield_activated_holo_dark.9.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/textfield_default_holo_dark.9.png b/src/main/res/drawable-mdpi/textfield_default_holo_dark.9.png
deleted file mode 100644
index 23a462f0e..000000000
Binary files a/src/main/res/drawable-mdpi/textfield_default_holo_dark.9.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/textfield_disabled_focused_holo_dark.9.png b/src/main/res/drawable-mdpi/textfield_disabled_focused_holo_dark.9.png
deleted file mode 100644
index e922f714d..000000000
Binary files a/src/main/res/drawable-mdpi/textfield_disabled_focused_holo_dark.9.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/textfield_disabled_holo_dark.9.png b/src/main/res/drawable-mdpi/textfield_disabled_holo_dark.9.png
deleted file mode 100644
index 7e44919a7..000000000
Binary files a/src/main/res/drawable-mdpi/textfield_disabled_holo_dark.9.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/textfield_focused_holo_dark.9.png b/src/main/res/drawable-mdpi/textfield_focused_holo_dark.9.png
deleted file mode 100644
index dad9484bc..000000000
Binary files a/src/main/res/drawable-mdpi/textfield_focused_holo_dark.9.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/btn_check_off_disabled_focused_holo_dark.png b/src/main/res/drawable-xhdpi/btn_check_off_disabled_focused_holo_dark.png
deleted file mode 100644
index 39db116c3..000000000
Binary files a/src/main/res/drawable-xhdpi/btn_check_off_disabled_focused_holo_dark.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/btn_check_off_disabled_holo_dark.png b/src/main/res/drawable-xhdpi/btn_check_off_disabled_holo_dark.png
deleted file mode 100644
index 85ab47854..000000000
Binary files a/src/main/res/drawable-xhdpi/btn_check_off_disabled_holo_dark.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/btn_check_off_focused_holo_dark.png b/src/main/res/drawable-xhdpi/btn_check_off_focused_holo_dark.png
deleted file mode 100644
index 4f727d1cc..000000000
Binary files a/src/main/res/drawable-xhdpi/btn_check_off_focused_holo_dark.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/btn_check_off_holo_dark.png b/src/main/res/drawable-xhdpi/btn_check_off_holo_dark.png
deleted file mode 100644
index e06ab5d81..000000000
Binary files a/src/main/res/drawable-xhdpi/btn_check_off_holo_dark.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/btn_check_off_pressed_holo_dark.png b/src/main/res/drawable-xhdpi/btn_check_off_pressed_holo_dark.png
deleted file mode 100644
index c1c239dd6..000000000
Binary files a/src/main/res/drawable-xhdpi/btn_check_off_pressed_holo_dark.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/btn_check_on_disabled_focused_holo_dark.png b/src/main/res/drawable-xhdpi/btn_check_on_disabled_focused_holo_dark.png
deleted file mode 100644
index 486c8efba..000000000
Binary files a/src/main/res/drawable-xhdpi/btn_check_on_disabled_focused_holo_dark.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/btn_check_on_disabled_holo_dark.png b/src/main/res/drawable-xhdpi/btn_check_on_disabled_holo_dark.png
deleted file mode 100644
index 499147ea0..000000000
Binary files a/src/main/res/drawable-xhdpi/btn_check_on_disabled_holo_dark.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/btn_check_on_focused_holo_dark.png b/src/main/res/drawable-xhdpi/btn_check_on_focused_holo_dark.png
deleted file mode 100644
index e21c57472..000000000
Binary files a/src/main/res/drawable-xhdpi/btn_check_on_focused_holo_dark.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/btn_check_on_holo_dark.png b/src/main/res/drawable-xhdpi/btn_check_on_holo_dark.png
deleted file mode 100644
index 2854e5faf..000000000
Binary files a/src/main/res/drawable-xhdpi/btn_check_on_holo_dark.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/btn_check_on_pressed_holo_dark.png b/src/main/res/drawable-xhdpi/btn_check_on_pressed_holo_dark.png
deleted file mode 100644
index b4ad66a9d..000000000
Binary files a/src/main/res/drawable-xhdpi/btn_check_on_pressed_holo_dark.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/list_focused_holo.9.png b/src/main/res/drawable-xhdpi/list_focused_holo.9.png
deleted file mode 100644
index 282989417..000000000
Binary files a/src/main/res/drawable-xhdpi/list_focused_holo.9.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/list_longpressed_holo.9.png b/src/main/res/drawable-xhdpi/list_longpressed_holo.9.png
deleted file mode 100644
index 7aa657254..000000000
Binary files a/src/main/res/drawable-xhdpi/list_longpressed_holo.9.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/list_pressed_holo_dark.9.png b/src/main/res/drawable-xhdpi/list_pressed_holo_dark.9.png
deleted file mode 100644
index 61ff99cb6..000000000
Binary files a/src/main/res/drawable-xhdpi/list_pressed_holo_dark.9.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/list_selector_disabled_holo_dark.9.png b/src/main/res/drawable-xhdpi/list_selector_disabled_holo_dark.9.png
deleted file mode 100644
index 88726b691..000000000
Binary files a/src/main/res/drawable-xhdpi/list_selector_disabled_holo_dark.9.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/spinner_default_holo_dark.9.png b/src/main/res/drawable-xhdpi/spinner_default_holo_dark.9.png
deleted file mode 100644
index 2f9c56946..000000000
Binary files a/src/main/res/drawable-xhdpi/spinner_default_holo_dark.9.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/spinner_disabled_holo_dark.9.png b/src/main/res/drawable-xhdpi/spinner_disabled_holo_dark.9.png
deleted file mode 100644
index 7c3c49baf..000000000
Binary files a/src/main/res/drawable-xhdpi/spinner_disabled_holo_dark.9.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/spinner_focused_holo_dark.9.png b/src/main/res/drawable-xhdpi/spinner_focused_holo_dark.9.png
deleted file mode 100644
index 7fa52549b..000000000
Binary files a/src/main/res/drawable-xhdpi/spinner_focused_holo_dark.9.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/spinner_pressed_holo_dark.9.png b/src/main/res/drawable-xhdpi/spinner_pressed_holo_dark.9.png
deleted file mode 100644
index befac71e7..000000000
Binary files a/src/main/res/drawable-xhdpi/spinner_pressed_holo_dark.9.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/textfield_activated_holo_dark.9.png b/src/main/res/drawable-xhdpi/textfield_activated_holo_dark.9.png
deleted file mode 100644
index ff6a14a73..000000000
Binary files a/src/main/res/drawable-xhdpi/textfield_activated_holo_dark.9.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/textfield_default_holo_dark.9.png b/src/main/res/drawable-xhdpi/textfield_default_holo_dark.9.png
deleted file mode 100644
index bc6a1771c..000000000
Binary files a/src/main/res/drawable-xhdpi/textfield_default_holo_dark.9.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/textfield_disabled_focused_holo_dark.9.png b/src/main/res/drawable-xhdpi/textfield_disabled_focused_holo_dark.9.png
deleted file mode 100644
index 16be83999..000000000
Binary files a/src/main/res/drawable-xhdpi/textfield_disabled_focused_holo_dark.9.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/textfield_disabled_holo_dark.9.png b/src/main/res/drawable-xhdpi/textfield_disabled_holo_dark.9.png
deleted file mode 100644
index 3d143b9d1..000000000
Binary files a/src/main/res/drawable-xhdpi/textfield_disabled_holo_dark.9.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/textfield_focused_holo_dark.9.png b/src/main/res/drawable-xhdpi/textfield_focused_holo_dark.9.png
deleted file mode 100644
index 57ac08b58..000000000
Binary files a/src/main/res/drawable-xhdpi/textfield_focused_holo_dark.9.png and /dev/null differ
diff --git a/src/main/res/drawable/activated_background_holo_dark.xml b/src/main/res/drawable/activated_background_holo_dark.xml
deleted file mode 100644
index e805b83ed..000000000
--- a/src/main/res/drawable/activated_background_holo_dark.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/list_activated_holo" android:state_activated="true" />
-    <item android:drawable="@android:color/transparent" />
-</selector>
diff --git a/src/main/res/drawable/btn_check_holo_dark.xml b/src/main/res/drawable/btn_check_holo_dark.xml
deleted file mode 100644
index 0c2f5e7d5..000000000
--- a/src/main/res/drawable/btn_check_holo_dark.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <!-- Enabled states -->
-
-    <item android:drawable="@drawable/btn_check_on_holo_dark" android:state_checked="true" android:state_enabled="true" android:state_window_focused="false" />
-    <item android:drawable="@drawable/btn_check_off_holo_dark" android:state_checked="false" android:state_enabled="true" android:state_window_focused="false" />
-
-    <item android:drawable="@drawable/btn_check_on_pressed_holo_dark" android:state_checked="true" android:state_enabled="true" android:state_pressed="true" />
-    <item android:drawable="@drawable/btn_check_off_pressed_holo_dark" android:state_checked="false" android:state_enabled="true" android:state_pressed="true" />
-
-    <item android:drawable="@drawable/btn_check_on_focused_holo_dark" android:state_checked="true" android:state_enabled="true" android:state_focused="true" />
-    <item android:drawable="@drawable/btn_check_off_focused_holo_dark" android:state_checked="false" android:state_enabled="true" android:state_focused="true" />
-
-    <item android:drawable="@drawable/btn_check_off_holo_dark" android:state_checked="false" android:state_enabled="true" />
-    <item android:drawable="@drawable/btn_check_on_holo_dark" android:state_checked="true" android:state_enabled="true" />
-
-    <!-- Disabled states -->
-
-    <item android:drawable="@drawable/btn_check_on_disabled_holo_dark" android:state_checked="true" android:state_window_focused="false" />
-    <item android:drawable="@drawable/btn_check_off_disabled_holo_dark" android:state_checked="false" android:state_window_focused="false" />
-
-    <item android:drawable="@drawable/btn_check_on_disabled_focused_holo_dark" android:state_checked="true" android:state_focused="true" />
-    <item android:drawable="@drawable/btn_check_off_disabled_focused_holo_dark" android:state_checked="false" android:state_focused="true" />
-
-    <item android:drawable="@drawable/btn_check_off_disabled_holo_dark" android:state_checked="false" />
-    <item android:drawable="@drawable/btn_check_on_disabled_holo_dark" android:state_checked="true" />
-
-</selector>
diff --git a/src/main/res/drawable/edit_text_holo_dark.xml b/src/main/res/drawable/edit_text_holo_dark.xml
deleted file mode 100644
index 02859f70f..000000000
--- a/src/main/res/drawable/edit_text_holo_dark.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2010 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/textfield_default_holo_dark" android:state_enabled="true" android:state_window_focused="false" />
-    <item android:drawable="@drawable/textfield_disabled_holo_dark" android:state_enabled="false" android:state_window_focused="false" />
-    <item android:drawable="@drawable/textfield_activated_holo_dark" android:state_enabled="true" android:state_focused="true" />
-    <item android:drawable="@drawable/textfield_focused_holo_dark" android:state_activated="true" android:state_enabled="true" />
-    <item android:drawable="@drawable/textfield_default_holo_dark" android:state_enabled="true" />
-    <item android:drawable="@drawable/textfield_disabled_focused_holo_dark" android:state_focused="true" />
-    <item android:drawable="@drawable/textfield_disabled_holo_dark" />
-</selector>
\ No newline at end of file
diff --git a/src/main/res/drawable/list_selector_background_transition_holo_dark.xml b/src/main/res/drawable/list_selector_background_transition_holo_dark.xml
deleted file mode 100644
index f84708e4b..000000000
--- a/src/main/res/drawable/list_selector_background_transition_holo_dark.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2010 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<transition xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/list_pressed_holo_dark" />
-    <item android:drawable="@drawable/list_longpressed_holo" />
-</transition>
diff --git a/src/main/res/drawable/list_selector_holo_dark.xml b/src/main/res/drawable/list_selector_holo_dark.xml
deleted file mode 100644
index cdc00775f..000000000
--- a/src/main/res/drawable/list_selector_holo_dark.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2010 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:drawable="@android:color/transparent" android:state_window_focused="false" />
-
-    <!-- Even though these two point to the same resource, have two states so the drawable will invalidate itself when coming out of pressed state. -->
-    <item android:drawable="@drawable/list_selector_disabled_holo_dark" android:state_enabled="false" android:state_focused="true" android:state_pressed="true" />
-    <item android:drawable="@drawable/list_selector_disabled_holo_dark" android:state_enabled="false" android:state_focused="true" />
-    <item android:drawable="@drawable/list_selector_background_transition_holo_dark" android:state_focused="true" android:state_pressed="true" />
-    <item android:drawable="@drawable/list_selector_background_transition_holo_dark" android:state_focused="false" android:state_pressed="true" />
-    <item android:drawable="@drawable/list_focused_holo" android:state_focused="true" />
-</selector>
diff --git a/src/main/res/drawable/spinner_background_holo_dark.xml b/src/main/res/drawable/spinner_background_holo_dark.xml
deleted file mode 100644
index 070c95a89..000000000
--- a/src/main/res/drawable/spinner_background_holo_dark.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2010 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/spinner_disabled_holo_dark" android:state_enabled="false" />
-    <item android:drawable="@drawable/spinner_pressed_holo_dark" android:state_pressed="true" />
-    <item android:drawable="@drawable/spinner_focused_holo_dark" android:state_focused="true" android:state_pressed="false" />
-    <item android:drawable="@drawable/spinner_default_holo_dark" />
-</selector>
diff --git a/src/main/res/layout/interval_list_view.xml b/src/main/res/layout/interval_list_view.xml
index c17dabed1..4a801b632 100644
--- a/src/main/res/layout/interval_list_view.xml
+++ b/src/main/res/layout/interval_list_view.xml
@@ -20,7 +20,6 @@
             android:id="@+id/spinner_intervals"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            style="@style/SpinnerCustomText"
             android:gravity="center" />
 
     </LinearLayout>
@@ -85,7 +84,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center_horizontal|center_vertical"
-        android:text="@string/interval_list_empty_message"
-        android:textColor="@color/list_empty_text" />
+        android:text="@string/interval_list_empty_message" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/track_edit.xml b/src/main/res/layout/track_edit.xml
index 75574767b..836a0d55f 100644
--- a/src/main/res/layout/track_edit.xml
+++ b/src/main/res/layout/track_edit.xml
@@ -51,7 +51,6 @@ limitations under the License.
                     android:id="@+id/track_edit_activity_type"
                     style="@style/EditCategory"
                     android:layout_width="0dp"
-                    android:layout_height="match_parent"
                     android:layout_weight="1"
                     android:hint="@string/track_edit_activity_type_hint"
                     android:imeOptions="actionNext" />
diff --git a/src/main/res/values/styles_custom.xml b/src/main/res/values/styles_custom.xml
deleted file mode 100644
index 6e56b9109..000000000
--- a/src/main/res/values/styles_custom.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!-- Generated with http://android-holo-colors.com -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- TODO REMOVE ALL: override only things that are really important. -->
-    <style name="AutoCompleteTextViewCustom" parent="Widget.AppCompat.AutoCompleteTextView">
-        <item name="android:dropDownSelector">@drawable/list_selector_holo_dark</item>
-        <item name="android:background">@drawable/edit_text_holo_dark</item>
-    </style>
-
-    <style name="SpinnerCustom" parent="Widget.AppCompat.Spinner">
-        <item name="android:background">@drawable/spinner_background_holo_dark</item>
-        <item name="android:dropDownSelector">@drawable/list_selector_holo_dark</item>
-    </style>
-
-    <style name="SpinnerCustomText" parent="Widget.AppCompat.Spinner">
-        <item name="android:background">@drawable/spinner_background_holo_dark</item>
-        <item name="android:dropDownSelector">@drawable/list_selector_holo_dark</item>
-        <item name="android:padding">0dp</item>
-    </style>
-</resources>
diff --git a/src/main/res/values/themes_custom.xml b/src/main/res/values/themes_custom.xml
index bfda2742d..90c3ffc62 100644
--- a/src/main/res/values/themes_custom.xml
+++ b/src/main/res/values/themes_custom.xml
@@ -16,16 +16,6 @@ limitations under the License.
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
     <style name="ThemeCustom" parent="Theme.AppCompat.DayNight.NoActionBar">
-        <!-- TODO Cleanup necessary due to change to appcompat -->
-        <!-- Auto generated -->
-        <item name="android:activatedBackgroundIndicator">@drawable/activated_background_holo_dark
-        </item>
-        <item name="android:autoCompleteTextViewStyle">@style/AutoCompleteTextViewCustom</item>
-        <item name="android:dropDownSpinnerStyle">@style/SpinnerCustom</item>
-        <item name="android:editTextBackground">@drawable/edit_text_holo_dark</item>
-        <item name="android:listChoiceBackgroundIndicator">@drawable/list_selector_holo_dark</item>
-        <item name="android:listChoiceIndicatorMultiple">@drawable/btn_check_holo_dark</item>
-
         <!--        <item name="colorPrimary">TODO</item>-->
         <!--        <item name="colorPrimaryDark">TODO</item>-->