diff --git a/src/main/java/de/dennisguse/opentracks/fragments/ChooseActivityTypeImageAdapter.java b/src/main/java/de/dennisguse/opentracks/fragments/ChooseActivityTypeImageAdapter.java
index 13ec1b180..c56dbcd46 100644
--- a/src/main/java/de/dennisguse/opentracks/fragments/ChooseActivityTypeImageAdapter.java
+++ b/src/main/java/de/dennisguse/opentracks/fragments/ChooseActivityTypeImageAdapter.java
@@ -78,8 +78,7 @@ class ChooseActivityTypeImageAdapter extends BaseAdapter {
         }
 
         if (position == selected) {
-            //TODO Should use theme!
-            imageView.setBackgroundColor(ContextCompat.getColor(parent.getContext(), R.color.holo_orange_dark));
+            imageView.setBackgroundColor(ContextCompat.getColor(parent.getContext(), R.color.colorAccent));
         } else {
             imageView.setBackgroundColor(Color.TRANSPARENT);
         }
diff --git a/src/main/res/drawable/activated_background.xml b/src/main/res/drawable/activated_background.xml
index be9bfe781..e0fe1f23e 100644
--- a/src/main/res/drawable/activated_background.xml
+++ b/src/main/res/drawable/activated_background.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@color/holo_orange_dark_activated" android:state_activated="true" />
+    <item android:drawable="@color/colorAccentTransparent" android:state_activated="true" />
     <item android:drawable="@android:color/transparent" />
 </selector>
\ No newline at end of file
diff --git a/src/main/res/values-night/colors.xml b/src/main/res/values-night/colors.xml
index 0d2c4cc40..ae956e20e 100644
--- a/src/main/res/values-night/colors.xml
+++ b/src/main/res/values-night/colors.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
+    <color name="colorAccent">@android:color/holo_orange_dark</color>
+    <color name="colorAccentTransparent">#55ff8800</color>
 </resources>
\ No newline at end of file
diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml
index 5b178876b..5855fa12e 100644
--- a/src/main/res/values/colors.xml
+++ b/src/main/res/values/colors.xml
@@ -27,8 +27,8 @@ limitations under the License.
     <color name="chart_speed_border">#FF0066FF</color> <!-- blue -->
     <color name="chart_speed_fill">#40C8E0FF</color> <!-- transparent blue -->
 
-    <color name="holo_orange_dark">#FFFF8800</color>
-    <color name="holo_orange_dark_activated">#55FF8800</color>
+    <color name="colorAccent">@android:color/holo_orange_dark</color>
+    <color name="colorAccentTransparent">#55FF8800</color>
 
     <color name="recording_text">#FFBE161B</color> <!-- red -->
     <color name="stats_separator">#99999999</color> <!-- light gray -->
diff --git a/src/main/res/values/themes_custom.xml b/src/main/res/values/themes_custom.xml
index f9927ef44..65a0ce49e 100644
--- a/src/main/res/values/themes_custom.xml
+++ b/src/main/res/values/themes_custom.xml
@@ -19,7 +19,7 @@ limitations under the License.
         <!--        <item name="colorPrimary">TODO</item>-->
         <!--        <item name="colorPrimaryDark">TODO</item>-->
 
-        <item name="colorAccent">@color/holo_orange_dark</item>
+        <item name="colorAccent">@color/colorAccent</item>
         <item name="android:activatedBackgroundIndicator">@drawable/activated_background</item>
 
         <item name="windowActionModeOverlay">true</item>