diff --git a/src/main/res/layout-land/track_list.xml b/src/main/res/layout-land/track_list.xml
index fa4ff1aa3..afc93e64c 100644
--- a/src/main/res/layout-land/track_list.xml
+++ b/src/main/res/layout-land/track_list.xml
@@ -89,8 +89,7 @@ limitations under the License.
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight=".7"
-                        android:text="@string/track_list_empty_message"
-                        android:textColor="@color/list_empty_text" />
+                        android:text="@string/track_list_empty_message" />
 
                     <View
                         android:layout_width="0dp"
diff --git a/src/main/res/layout/aggregated_stats.xml b/src/main/res/layout/aggregated_stats.xml
index aea3ea8ca..0c6949b46 100644
--- a/src/main/res/layout/aggregated_stats.xml
+++ b/src/main/res/layout/aggregated_stats.xml
@@ -29,8 +29,7 @@
                 android:layout_height="match_parent"
                 android:layout_weight="4"
                 android:gravity="center_horizontal|center_vertical"
-                android:text="@string/aggregated_stats_empty_message"
-                android:textColor="@color/list_empty_text" />
+                android:text="@string/aggregated_stats_empty_message" />
 
             <View
                 android:layout_width="0dp"
diff --git a/src/main/res/layout/aggregated_stats_list_item.xml b/src/main/res/layout/aggregated_stats_list_item.xml
index 32d7e7e5e..52eb7815e 100644
--- a/src/main/res/layout/aggregated_stats_list_item.xml
+++ b/src/main/res/layout/aggregated_stats_list_item.xml
@@ -74,7 +74,6 @@
     <TextView
         android:id="@+id/aggregated_stats_distance_unit"
         style="@style/StatsUnit"
-        android:textColor="@android:color/white"
         app:layout_constraintBottom_toBottomOf="@+id/aggregated_stats_distance"
         app:layout_constraintLeft_toRightOf="@+id/aggregated_stats_distance"
         tools:text="km" />
@@ -103,7 +102,6 @@
     <TextView
         android:id="@+id/aggregated_stats_avg_rate_unit"
         style="@style/StatsUnit"
-        android:textColor="@android:color/white"
         app:layout_constraintBottom_toBottomOf="@+id/aggregated_stats_avg_rate"
         app:layout_constraintLeft_toRightOf="@+id/aggregated_stats_avg_rate"
         app:layout_constraintRight_toRightOf="@id/guideline2"
@@ -132,7 +130,6 @@
     <TextView
         android:id="@+id/aggregated_stats_max_rate_unit"
         style="@style/StatsUnit"
-        android:textColor="@android:color/white"
         app:layout_constraintBottom_toBottomOf="@+id/aggregated_stats_max_rate"
         app:layout_constraintLeft_toRightOf="@+id/aggregated_stats_max_rate"
         app:layout_constraintRight_toLeftOf="@id/guideline3"
diff --git a/src/main/res/layout/list_item.xml b/src/main/res/layout/list_item.xml
index 5d7f71587..fd64044ce 100644
--- a/src/main/res/layout/list_item.xml
+++ b/src/main/res/layout/list_item.xml
@@ -135,7 +135,7 @@ limitations under the License.
     </FrameLayout>
 
     <View
-        style="@style/ListItem"
+        android:background="?android:attr/activatedBackgroundIndicator"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 </FrameLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/track_list.xml b/src/main/res/layout/track_list.xml
index 67f927d3e..18aba1c5f 100644
--- a/src/main/res/layout/track_list.xml
+++ b/src/main/res/layout/track_list.xml
@@ -74,8 +74,7 @@ limitations under the License.
                 android:layout_height="wrap_content"
                 android:layout_weight="22"
                 android:gravity="left"
-                android:text="@string/track_list_empty_message"
-                android:textColor="@color/list_empty_text" />
+                android:text="@string/track_list_empty_message" />
 
             <View
                 android:layout_width="0dp"
diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml
index 27e45e9bb..c32fafbcc 100644
--- a/src/main/res/values/colors.xml
+++ b/src/main/res/values/colors.xml
@@ -27,7 +27,7 @@ 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="list_empty_text">#FFCCCCCC</color>
+
     <color name="recording_text">#FFBE161B</color> <!-- red -->
     <color name="stats_large_label">#FFFAAD2C</color> <!-- orange -->
     <color name="stats_separator">#99999999</color> <!-- light gray -->
diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml
index 873100231..70442cbfe 100644
--- a/src/main/res/values/styles.xml
+++ b/src/main/res/values/styles.xml
@@ -16,7 +16,6 @@ limitations under the License.
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
     <style name="BottomButton" parent="Widget.AppCompat.Button.Borderless">
-        <!-- Same as BottomButton in values/styles.xml except inheriting from Widget.Holo.Button.Borderles. -->
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_weight">1</item>
         <item name="android:layout_width">0dp</item>
@@ -24,10 +23,6 @@ limitations under the License.
     </style>
 
     <style name="BottomButtonBar" parent="Widget.AppCompat.ButtonBar">
-        <!--
-        Same as BottomButtonBar in values/styles.xml except inheriting from Holo.ButtonBar and
-        adding measureWithLargestChild.
-        -->
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_width">match_parent</item>
         <item name="android:measureWithLargestChild">true</item>
@@ -40,7 +35,7 @@ limitations under the License.
         <item name="android:layout_marginRight">4dp</item>
         <item name="android:layout_width">match_parent</item>
     </style>
-    <!-- edit category -->
+
     <style name="EditCategory" parent="@style/TextMedium">
         <item name="android:completionThreshold">1</item>
         <item name="android:gravity">bottom</item>
@@ -49,7 +44,7 @@ limitations under the License.
         <item name="android:selectAllOnFocus">true</item>
         <item name="android:singleLine">true</item>
     </style>
-    <!-- edit description -->
+
     <style name="EditDescription" parent="@style/TextMedium">
         <item name="android:inputType">textAutoCorrect|textCapSentences|textMultiLine</item>
         <item name="android:layout_width">match_parent</item>
@@ -57,42 +52,33 @@ limitations under the License.
         <item name="android:selectAllOnFocus">true</item>
         <item name="android:singleLine">false</item>
     </style>
-    <!-- edit label -->
+
     <style name="EditLabel" parent="@style/TextMedium">
         <item name="android:layout_width">match_parent</item>
     </style>
-    <!-- edit label with icon -->
-    <!-- edit label with padding top -->
+
     <style name="EditLabel.WithPaddingTop">
         <item name="android:paddingTop">16dp</item>
     </style>
-    <!-- edit name marker -->
+
     <style name="EditNameMarker" parent="@style/TextMedium.WithIcon">
         <item name="android:inputType">textAutoCorrect|textCapWords</item>
         <item name="android:layout_width">match_parent</item>
         <item name="android:selectAllOnFocus">true</item>
         <item name="android:singleLine">true</item>
     </style>
-    <!-- edit name track -->
+
     <style name="EditNameTrack" parent="@style/TextMedium">
         <item name="android:inputType">textAutoCorrect|textCapWords</item>
         <item name="android:layout_width">match_parent</item>
         <item name="android:selectAllOnFocus">true</item>
         <item name="android:singleLine">true</item>
     </style>
-    <!-- export radio group -->
-    <!-- help answer -->
-    <!-- help question -->
-    <!-- list empty text view -->
+
     <style name="ListEmptyTextView" parent="@style/TextLarge">
         <item name="android:gravity">center</item>
         <item name="android:layout_gravity">center</item>
         <item name="android:padding">8dp</item>
-        <item name="android:textColor">@color/list_empty_text</item>
-    </style>
-
-    <style name="ListItem">
-        <item name="android:background">?android:attr/activatedBackgroundIndicator</item>
     </style>
 
     <style name="ListItemDate" parent="@style/TextSmall">
@@ -132,7 +118,6 @@ limitations under the License.
     </style>
 
     <style name="StatsLargeLabel" parent="@style/TextSmall">
-        <!-- same as StatsLargeLabel in values/styles.xml except adding textAllCaps -->
         <item name="android:gravity">center</item>
         <item name="android:layout_gravity">center</item>
         <item name="android:singleLine">false</item>
@@ -144,12 +129,11 @@ limitations under the License.
         <item name="android:layout_marginTop">16dp</item>
     </style>
 
-    <style name="StatsLargeValue">
+    <style name="StatsLargeValue" parent="@style/TextLarge">
         <item name="android:layout_gravity">center</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_width">wrap_content</item>
         <item name="android:singleLine">true</item>
-        <item name="android:textColor">@android:color/white</item>
         <item name="android:textSize">32sp</item>
         <item name="android:textStyle">bold</item>
     </style>
@@ -175,7 +159,6 @@ limitations under the License.
     </style>
 
     <style name="StatsSmallLabel" parent="@style/TextSmall">
-        <!-- same as StatsSmallLabel in values/styles.xml except adding textAllCaps -->
         <item name="android:gravity">center</item>
         <item name="android:layout_gravity">center</item>
         <item name="android:singleLine">false</item>
@@ -183,66 +166,56 @@ limitations under the License.
         <item name="android:textStyle">bold</item>
         <item name="android:layout_marginTop">16dp</item>
     </style>
-    <!-- stats small value -->
+
     <style name="StatsSmallValue" parent="@style/TextLarge">
         <item name="android:layout_gravity">center</item>
         <item name="android:singleLine">true</item>
-        <item name="android:textColor">@android:color/white</item>
     </style>
-    <!-- stats small value -->
+
     <style name="StatsTinyValue" parent="@style/TextSmall">
         <item name="android:layout_gravity">center</item>
         <item name="android:singleLine">true</item>
-        <item name="android:textColor">@android:color/white</item>
     </style>
-    <!-- stats small label -->
+
     <style name="StatsTinyLabel" parent="@style/TextSmall">
         <item name="android:gravity">center</item>
         <item name="android:layout_gravity">center</item>
         <item name="android:singleLine">false</item>
-        <item name="android:textColor">@android:color/secondary_text_light_nodisable</item>
     </style>
-    <!-- stats small value container -->
+
     <style name="StatsSmallValueContainer" parent="@style/StatsLargeValueContainer">
         <item name="android:layout_marginTop">-2dp</item>
     </style>
-    <!-- stats unit -->
+
     <style name="StatsUnit" parent="@style/TextSmall">
         <item name="android:layout_gravity">bottom</item>
         <item name="android:paddingLeft">4dp</item>
         <item name="android:singleLine">true</item>
     </style>
 
-    <style name="Text">
+    <style name="TextMicro" parent="@style/TextSmall">
+        <item name="android:textSize">12sp</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_width">wrap_content</item>
-        <item name="android:textColor">@android:color/white</item>
     </style>
 
     <style name="TextLarge" parent="TextAppearance.AppCompat.Large">
-        <!-- same as TextLarge in values/styles.xml except inheriting from a parent instead of specifying textSize -->
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_width">wrap_content</item>
     </style>
 
     <style name="TextMedium" parent="TextAppearance.AppCompat.Medium">
-        <!-- same as TextMedium in values/styles.xml except inheriting from a parent instead of specifying textSize -->
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_width">wrap_content</item>
     </style>
-    <!-- text medium with icon -->
-    <style name="TextMedium.WithIcon">
+
+    <style name="TextMedium.WithIcon" style="@style/TextMedium">
         <item name="android:drawablePadding">8dp</item>
         <item name="android:gravity">center_vertical</item>
     </style>
-    <!-- text micro -->
-    <style name="TextMicro" parent="@style/Text">
-        <item name="android:textSize">12sp</item>
-    </style>
 
     <style name="TextSmall" parent="TextAppearance.AppCompat.Small">
-        <!-- same as TextSmall in values/styles.xml except inheriting from a parent instead of specifying textSize -->
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_width">wrap_content</item>
     </style>
-</resources>
\ No newline at end of file
+</resources>