diff --git a/myTracks/src/main/res/drawable-hdpi-v11/ic_stat_notify_recording.png b/myTracks/src/main/res/drawable-hdpi-v11/ic_stat_notify_recording.png
deleted file mode 100644
index f29209cd8..000000000
Binary files a/myTracks/src/main/res/drawable-hdpi-v11/ic_stat_notify_recording.png and /dev/null differ
diff --git a/myTracks/src/main/res/drawable-hdpi/ic_stat_notify_recording.png b/myTracks/src/main/res/drawable-hdpi/ic_stat_notify_recording.png
index 021aecf93..f29209cd8 100644
Binary files a/myTracks/src/main/res/drawable-hdpi/ic_stat_notify_recording.png and b/myTracks/src/main/res/drawable-hdpi/ic_stat_notify_recording.png differ
diff --git a/myTracks/src/main/res/drawable-mdpi-v11/ic_stat_notify_recording.png b/myTracks/src/main/res/drawable-mdpi-v11/ic_stat_notify_recording.png
deleted file mode 100644
index 7de85efcb..000000000
Binary files a/myTracks/src/main/res/drawable-mdpi-v11/ic_stat_notify_recording.png and /dev/null differ
diff --git a/myTracks/src/main/res/drawable-mdpi/ic_stat_notify_recording.png b/myTracks/src/main/res/drawable-mdpi/ic_stat_notify_recording.png
index f5c475203..7de85efcb 100644
Binary files a/myTracks/src/main/res/drawable-mdpi/ic_stat_notify_recording.png and b/myTracks/src/main/res/drawable-mdpi/ic_stat_notify_recording.png differ
diff --git a/myTracks/src/main/res/drawable-xhdpi-v11/ic_stat_notify_recording.png b/myTracks/src/main/res/drawable-xhdpi/ic_stat_notify_recording.png
similarity index 100%
rename from myTracks/src/main/res/drawable-xhdpi-v11/ic_stat_notify_recording.png
rename to myTracks/src/main/res/drawable-xhdpi/ic_stat_notify_recording.png
diff --git a/myTracks/src/main/res/layout-v14/marker_edit_buttons.xml b/myTracks/src/main/res/layout-v14/marker_edit_buttons.xml
deleted file mode 100644
index 238ec79cc..000000000
--- a/myTracks/src/main/res/layout-v14/marker_edit_buttons.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright 2012 Google Inc.
-
-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.
--->
-<merge xmlns:android="http://schemas.android.com/apk/res/android" >
-  <!-- In v14, postive button on the right. -->
-  <Button
-    android:id="@+id/marker_edit_cancel"
-    android:layout_gravity="left"
-    android:text="@string/generic_cancel"
-    style="@style/BottomButton" />
-  <Button
-    android:id="@+id/marker_edit_done"
-    android:layout_gravity="right"
-    style="@style/BottomButton" />
-</merge>
\ No newline at end of file
diff --git a/myTracks/src/main/res/layout-v14/track_edit_buttons.xml b/myTracks/src/main/res/layout-v14/track_edit_buttons.xml
deleted file mode 100644
index f1757114a..000000000
--- a/myTracks/src/main/res/layout-v14/track_edit_buttons.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright 2012 Google Inc.
-
-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.
--->
-<merge xmlns:android="http://schemas.android.com/apk/res/android" >
-  <!-- In v14, postive button on the right. -->
-  <Button
-    android:id="@+id/track_edit_cancel"
-    android:layout_gravity="left"
-    android:text="@string/generic_cancel"
-    style="@style/BottomButton" />
-  <Button
-    android:id="@+id/track_edit_save"
-    android:layout_gravity="right"
-    android:text="@string/generic_save"
-    style="@style/BottomButton" />
-</merge>
\ No newline at end of file
diff --git a/myTracks/src/main/res/layout-v14/track_widget_config_buttons.xml b/myTracks/src/main/res/layout-v14/track_widget_config_buttons.xml
deleted file mode 100644
index 3f37518f4..000000000
--- a/myTracks/src/main/res/layout-v14/track_widget_config_buttons.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright 2012 Google Inc.
-
-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.
--->
-<merge xmlns:android="http://schemas.android.com/apk/res/android" >
-  <!-- In v14, postive button on the right. -->
-  <Button
-    android:id="@+id/track_widget_config_cancel"
-    android:layout_gravity="left"
-    android:text="@string/generic_cancel"
-    style="@style/BottomButton" />
-  <Button
-    android:id="@+id/track_widget_config_add"
-    android:layout_gravity="right"
-    android:text="@string/generic_add"
-    style="@style/BottomButton" />
-</merge>
\ No newline at end of file
diff --git a/myTracks/src/main/res/layout/marker_edit_buttons.xml b/myTracks/src/main/res/layout/marker_edit_buttons.xml
index 122ee3552..238ec79cc 100644
--- a/myTracks/src/main/res/layout/marker_edit_buttons.xml
+++ b/myTracks/src/main/res/layout/marker_edit_buttons.xml
@@ -15,13 +15,14 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <merge xmlns:android="http://schemas.android.com/apk/res/android" >
-  <Button
-    android:id="@+id/marker_edit_done"
-    android:layout_gravity="left"
-    style="@style/BottomButton" />
+  <!-- In v14, postive button on the right. -->
   <Button
     android:id="@+id/marker_edit_cancel"
-    android:layout_gravity="right"
+    android:layout_gravity="left"
     android:text="@string/generic_cancel"
     style="@style/BottomButton" />
+  <Button
+    android:id="@+id/marker_edit_done"
+    android:layout_gravity="right"
+    style="@style/BottomButton" />
 </merge>
\ No newline at end of file
diff --git a/myTracks/src/main/res/layout/track_edit_buttons.xml b/myTracks/src/main/res/layout/track_edit_buttons.xml
index 2da07a662..f1757114a 100644
--- a/myTracks/src/main/res/layout/track_edit_buttons.xml
+++ b/myTracks/src/main/res/layout/track_edit_buttons.xml
@@ -15,14 +15,15 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <merge xmlns:android="http://schemas.android.com/apk/res/android" >
-  <Button
-    android:id="@+id/track_edit_save"
-    android:layout_gravity="left"
-    android:text="@string/generic_save"
-    style="@style/BottomButton" />
+  <!-- In v14, postive button on the right. -->
   <Button
     android:id="@+id/track_edit_cancel"
-    android:layout_gravity="right"
+    android:layout_gravity="left"
     android:text="@string/generic_cancel"
     style="@style/BottomButton" />
+  <Button
+    android:id="@+id/track_edit_save"
+    android:layout_gravity="right"
+    android:text="@string/generic_save"
+    style="@style/BottomButton" />
 </merge>
\ No newline at end of file
diff --git a/myTracks/src/main/res/layout/track_widget_config_buttons.xml b/myTracks/src/main/res/layout/track_widget_config_buttons.xml
index 60c7b25ac..3f37518f4 100644
--- a/myTracks/src/main/res/layout/track_widget_config_buttons.xml
+++ b/myTracks/src/main/res/layout/track_widget_config_buttons.xml
@@ -15,14 +15,15 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <merge xmlns:android="http://schemas.android.com/apk/res/android" >
-  <Button
-    android:id="@+id/track_widget_config_add"
-    android:layout_gravity="left"
-    android:text="@string/generic_add"
-    style="@style/BottomButton" />
+  <!-- In v14, postive button on the right. -->
   <Button
     android:id="@+id/track_widget_config_cancel"
-    android:layout_gravity="right"
+    android:layout_gravity="left"
     android:text="@string/generic_cancel"
     style="@style/BottomButton" />
+  <Button
+    android:id="@+id/track_widget_config_add"
+    android:layout_gravity="right"
+    android:text="@string/generic_add"
+    style="@style/BottomButton" />
 </merge>
\ No newline at end of file
diff --git a/myTracks/src/main/res/values-v11/styles.xml b/myTracks/src/main/res/values-v11/styles.xml
deleted file mode 100644
index fc595491d..000000000
--- a/myTracks/src/main/res/values-v11/styles.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright 2012 Google Inc.
-
-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.
--->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-  <style name="ActionBarStyleMyTracks" parent="@android:style/Widget.Holo.ActionBar">
-    <!-- Same image as the source except using a grey line instead of a blue line -->
-    <item name="android:background">@drawable/ab_transparent_dark_holo</item>
-  </style>
-  <style name="BottomButton" parent="@android:style/Widget.Holo.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>
-    <item name="android:maxLines">2</item>
-  </style>
-  <style name="BottomButtonBar" parent="@android:style/Holo.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>
-  </style>
-  <style name="BottomButtonDivider">
-    <item name="android:background">?android:attr/dividerVertical</item>
-    <item name="android:layout_height">1dp</item>
-    <item name="android:layout_marginLeft">4dp</item>
-    <item name="android:layout_marginRight">4dp</item>
-    <item name="android:layout_width">match_parent</item>
-  </style>    
-  <style name="ListItem">
-    <item name="android:background">?android:attr/activatedBackgroundIndicator</item>
-  </style>
-</resources>
\ No newline at end of file
diff --git a/myTracks/src/main/res/values-v11/styles_mytracks.xml b/myTracks/src/main/res/values-v11/styles_mytracks.xml
deleted file mode 100644
index 7026b9b9d..000000000
--- a/myTracks/src/main/res/values-v11/styles_mytracks.xml
+++ /dev/null
@@ -1,16 +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">
-  <style name="AutoCompleteTextViewMyTracks" parent="android:Widget.Holo.AutoCompleteTextView">
-    <item name="android:dropDownSelector">@drawable/list_selector_holo_dark</item>
-    <item name="android:background">@drawable/edit_text_holo_dark</item>
-  </style>
-  <style name="ProgressBarMyTracks" parent="android:Widget.Holo.ProgressBar.Horizontal">
-    <item name="android:progressDrawable">@drawable/progress_horizontal_holo_dark</item>
-    <item name="android:indeterminateDrawable">@drawable/progress_indeterminate_horizontal_holo_dark</item>
-  </style>
-  <style name="SpinnerMyTracks" parent="android:Widget.Holo.Spinner">
-    <item name="android:background">@drawable/spinner_background_holo_dark</item>
-    <item name="android:dropDownSelector">@drawable/list_selector_holo_dark</item>
-  </style>
-</resources>
\ No newline at end of file
diff --git a/myTracks/src/main/res/values-v11/themes_mytracks.xml b/myTracks/src/main/res/values-v11/themes_mytracks.xml
deleted file mode 100644
index cb53481ef..000000000
--- a/myTracks/src/main/res/values-v11/themes_mytracks.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright 2013 Google Inc.
-
-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.
--->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-  <style name="ThemeMyTracks" parent="android:Theme.Holo">
-    <!-- Auto generated -->
-    <item name="android:activatedBackgroundIndicator">@drawable/activated_background_holo_dark</item>
-    <item name="android:autoCompleteTextViewStyle">@style/AutoCompleteTextViewMyTracks</item>
-    <item name="android:dropDownSpinnerStyle">@style/SpinnerMyTracks</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="android:listChoiceIndicatorSingle">@drawable/btn_radio_holo_dark</item>
-    <item name="android:progressBarStyleHorizontal">@style/ProgressBarMyTracks</item>
-    <!-- Manually added -->
-    <item name="android:actionBarStyle">@style/ActionBarStyleMyTracks</item>
-    <item name="android:actionModeBackground">@drawable/action_mode_background_mytracks</item>
-    <item name="android:alertDialogTheme">@style/AlertDialogThemeMyTracks</item>
-  </style>
-  <style name="AlertDialogThemeMyTracks" parent="@android:style/Theme.Holo.Dialog">
-    <!-- From auto generated -->
-    <item name="android:activatedBackgroundIndicator">@drawable/activated_background_holo_dark</item>
-    <item name="android:autoCompleteTextViewStyle">@style/AutoCompleteTextViewMyTracks</item>
-    <item name="android:dropDownSpinnerStyle">@style/SpinnerMyTracks</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="android:listChoiceIndicatorSingle">@drawable/btn_radio_holo_dark</item>
-    <item name="android:progressBarStyleHorizontal">@style/ProgressBarMyTracks</item>
-    <!-- From Theme.Holo.Dialog.Alert -->
-    <item name="android:textColor">@color/holo_orange_dark</item>
-    <item name="android:windowBackground">@android:color/transparent</item>
-    <item name="android:windowContentOverlay">@null</item>
-    <item name="android:windowMinWidthMajor">@android:dimen/dialog_min_width_major</item>
-    <item name="android:windowMinWidthMinor">@android:dimen/dialog_min_width_minor</item>
-  </style>
-</resources>
\ No newline at end of file
diff --git a/myTracks/src/main/res/values-v13/styles.xml b/myTracks/src/main/res/values-v13/styles.xml
deleted file mode 100644
index 9165cd40e..000000000
--- a/myTracks/src/main/res/values-v13/styles.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright 2013 Google Inc.
-
-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.
--->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-  <!-- The style for large size text -->
-  <style name="TextLarge" parent="@android:style/TextAppearance.Holo.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>
-  <!-- The style for medium size text -->
-  <style name="TextMedium" parent="@android:style/TextAppearance.Holo.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>
-  <!-- The style for small size text -->
-  <style name="TextSmall" parent="@android:style/TextAppearance.Holo.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
diff --git a/myTracks/src/main/res/values-v14/dimens.xml b/myTracks/src/main/res/values-v14/dimens.xml
deleted file mode 100644
index 344b6ad05..000000000
--- a/myTracks/src/main/res/values-v14/dimens.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright 2012 Google Inc.
-
-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.
--->
-<resources>
-  <dimen name="widget_margin">0dp</dimen>
-</resources>
\ No newline at end of file
diff --git a/myTracks/src/main/res/values-v14/styles.xml b/myTracks/src/main/res/values-v14/styles.xml
deleted file mode 100644
index d5235d309..000000000
--- a/myTracks/src/main/res/values-v14/styles.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright 2012 Google Inc.
-
-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.
--->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-  <!-- The style for choose activity text -->
-  <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>
-    <item name="android:textAllCaps">true</item>
-    <item name="android:textStyle">bold</item>
-  </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>
-    <item name="android:textAllCaps">true</item>
-    <item name="android:textColor">@color/stats_large_label</item>
-    <item name="android:textStyle">bold</item>
-  </style>
-  <style name="TextChooseActivity">
-    <!-- Same as TextChooseActivity in values/styles.xml except removing textSize and using textAppearance -->
-    <item name="android:textAppearance">?android:attr/textAppearanceListItemSmall</item>
-  </style>
-  <style name="TrackWidgetLabel">
-    <!-- same as TrackWidgetLabel in values/styles.xml except adding textAllCaps -->
-    <item name="android:layout_gravity">center_horizontal</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">@color/stats_large_label</item>
-    <item name="android:textSize">10dp</item>
-    <item name="android:textStyle">bold</item>
-    <item name="android:textAllCaps">true</item>
-  </style>
-</resources>
\ No newline at end of file
diff --git a/myTracks/src/main/res/values/dimens.xml b/myTracks/src/main/res/values/dimens.xml
index 11c778950..344b6ad05 100644
--- a/myTracks/src/main/res/values/dimens.xml
+++ b/myTracks/src/main/res/values/dimens.xml
@@ -15,5 +15,5 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <resources>
-  <dimen name="widget_margin">8dp</dimen>
+  <dimen name="widget_margin">0dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/myTracks/src/main/res/values/styles.xml b/myTracks/src/main/res/values/styles.xml
index 32f062422..8ab8c11f1 100644
--- a/myTracks/src/main/res/values/styles.xml
+++ b/myTracks/src/main/res/values/styles.xml
@@ -15,27 +15,32 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
-  <!-- about value -->
-  <style name="AboutValue" parent="@style/TextMedium">
-    <item name="android:paddingLeft">48dp</item>
+  <style name="ActionBarStyleMyTracks" parent="@android:style/Widget.Holo.ActionBar">
+    <!-- Same image as the source except using a grey line instead of a blue line -->
+    <item name="android:background">@drawable/ab_transparent_dark_holo</item>
   </style>
-  <!-- bottom button -->
-  <style name="BottomButton">
+  <style name="BottomButton" parent="@android:style/Widget.Holo.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>
     <item name="android:maxLines">2</item>
   </style>
-  <!-- bottom button bar -->
-  <style name="BottomButtonBar">
+  <style name="BottomButtonBar" parent="@android:style/Holo.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>
   </style>
-  <!-- bottom button divider -->
   <style name="BottomButtonDivider">
-    <item name="android:layout_height">0dp</item>
-    <item name="android:layout_width">0dp</item>
-    <item name="android:visibility">gone</item>
+    <item name="android:background">?android:attr/dividerVertical</item>
+    <item name="android:layout_height">1dp</item>
+    <item name="android:layout_marginLeft">4dp</item>
+    <item name="android:layout_marginRight">4dp</item>
+    <item name="android:layout_width">match_parent</item>
   </style>
   <!-- edit category -->
   <style name="EditCategory" parent="@style/TextMedium">
@@ -104,9 +109,9 @@ limitations under the License.
     <item name="android:padding">8dp</item>
     <item name="android:textColor">@color/list_empty_text</item>
   </style>
-  <!-- list item -->
-  <style name="ListItem" />
-  <!-- list item date -->
+  <style name="ListItem">
+    <item name="android:background">?android:attr/activatedBackgroundIndicator</item>
+  </style>
   <style name="ListItemDate" parent="@style/TextSmall">
     <item name="android:gravity">right</item>
     <item name="android:layout_gravity">bottom</item>
@@ -150,15 +155,15 @@ limitations under the License.
     <item name="android:paddingBottom">6dp</item>
     <item name="android:paddingTop">6dp</item>
   </style>
-  <!-- stats large label -->
   <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>
+    <item name="android:textAllCaps">true</item>
     <item name="android:textColor">@color/stats_large_label</item>
     <item name="android:textStyle">bold</item>
   </style>
-  <!-- stats large value -->
   <style name="StatsLargeValue">
     <item name="android:layout_gravity">bottom</item>
     <item name="android:layout_height">wrap_content</item>
@@ -188,11 +193,12 @@ limitations under the License.
   <style name="StatsSmallItemContainer" parent="@style/StatsLargeItemContainer">
     <item name="android:paddingTop">12dp</item>
   </style>
-  <!-- stats small label -->
   <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>
+    <item name="android:textAllCaps">true</item>
     <item name="android:textStyle">bold</item>
   </style>
   <!-- stats small value -->
@@ -216,17 +222,19 @@ limitations under the License.
     <item name="android:layout_width">wrap_content</item>
     <item name="android:textColor">@android:color/white</item>
   </style>
-  <!-- text choose activity -->
   <style name="TextChooseActivity">
-    <item name="android:textSize">18sp</item>
+    <!-- Same as TextChooseActivity in values/styles.xml except removing textSize and using textAppearance -->
+    <item name="android:textAppearance">?android:attr/textAppearanceListItemSmall</item>
   </style>
-  <!-- text large -->
-  <style name="TextLarge" parent="@style/Text">
-    <item name="android:textSize">22sp</item>
+  <style name="TextLarge" parent="@android:style/TextAppearance.Holo.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>
-  <!-- text medium -->
-  <style name="TextMedium" parent="@style/Text">
-    <item name="android:textSize">18sp</item>
+  <style name="TextMedium" parent="@android:style/TextAppearance.Holo.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">
@@ -237,9 +245,10 @@ limitations under the License.
   <style name="TextMicro" parent="@style/Text">
     <item name="android:textSize">12sp</item>
   </style>
-  <!-- text small -->
-  <style name="TextSmall" parent="@style/Text">
-    <item name="android:textSize">14sp</item>
+  <style name="TextSmall" parent="@android:style/TextAppearance.Holo.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>
   <!-- track widget bounding box -->
   <style name="TrackWidgetBoundingBox">
@@ -320,8 +329,8 @@ limitations under the License.
     <item name="android:paddingBottom">12dp</item>
     <item name="android:paddingTop">12dp</item>
   </style>
-  <!-- track widget label -->
   <style name="TrackWidgetLabel">
+    <!-- same as TrackWidgetLabel in values/styles.xml except adding textAllCaps -->
     <item name="android:layout_gravity">center_horizontal</item>
     <item name="android:layout_height">wrap_content</item>
     <item name="android:layout_width">wrap_content</item>
@@ -329,8 +338,8 @@ limitations under the License.
     <item name="android:textColor">@color/stats_large_label</item>
     <item name="android:textSize">10dp</item>
     <item name="android:textStyle">bold</item>
+    <item name="android:textAllCaps">true</item>
   </style>
-  <!-- track widget label 4x4 -->
   <style name="TrackWidgetLabel4x4" parent="@style/TrackWidgetLabel">
     <item name="android:textSize">14dp</item>
   </style>
diff --git a/myTracks/src/main/res/values/styles_mytracks.xml b/myTracks/src/main/res/values/styles_mytracks.xml
index db1c01c0c..7026b9b9d 100644
--- a/myTracks/src/main/res/values/styles_mytracks.xml
+++ b/myTracks/src/main/res/values/styles_mytracks.xml
@@ -1,40 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generated with http://android-holo-colors.com -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
-  <style name="AutoCompleteTextViewMyTracks" parent="android:Widget.AutoCompleteTextView">
+  <style name="AutoCompleteTextViewMyTracks" parent="android:Widget.Holo.AutoCompleteTextView">
     <item name="android:dropDownSelector">@drawable/list_selector_holo_dark</item>
     <item name="android:background">@drawable/edit_text_holo_dark</item>
-    <item name="android:textColor">#ffffff</item>
   </style>
-  <style name="CheckBoxMyTracks" parent="android:Widget.CompoundButton.CheckBox">
-    <item name="android:button">@drawable/btn_check_holo_dark</item>
-  </style>
-  <style name="EditTextMyTracks" parent="android:Widget.EditText">
-    <item name="android:background">@drawable/edit_text_holo_dark</item>
-    <item name="android:textColor">#ffffff</item>
-  </style>
-  <style name="ListViewMyTracks" parent="android:Widget.ListView">
-    <item name="android:listSelector">@drawable/list_selector_holo_dark</item>
-  </style>
-  <style name="ListViewMyTracks.White" parent="android:Widget.ListView.White">
-    <item name="android:listSelector">@drawable/list_selector_holo_dark</item>
-  </style>
-  <style name="ProgressBarMyTracks" parent="android:Widget.ProgressBar.Horizontal">
+  <style name="ProgressBarMyTracks" parent="android:Widget.Holo.ProgressBar.Horizontal">
     <item name="android:progressDrawable">@drawable/progress_horizontal_holo_dark</item>
     <item name="android:indeterminateDrawable">@drawable/progress_indeterminate_horizontal_holo_dark</item>
-    <item name="android:minHeight">16dip</item>
-    <item name="android:maxHeight">16dip</item>
   </style>
-  <style name="RadioButtonMyTracks" parent="android:Widget.CompoundButton.RadioButton">
-    <item name="android:button">@drawable/btn_radio_holo_dark</item>
-  </style>
-  <style name="SpinnerDropDownItemMyTracks" parent="android:Widget.DropDownItem.Spinner">
-    <item name="android:checkMark">@drawable/btn_radio_holo_dark</item>
-  </style>
-  <style name="SpinnerItemMyTracks" parent="android:TextAppearance.Widget.TextView.SpinnerItem">
-    <item name="android:textColor">#ffffff</item>
-  </style>
-  <style name="SpinnerMyTracks" parent="android:Widget.Spinner">
+  <style name="SpinnerMyTracks" parent="android:Widget.Holo.Spinner">
     <item name="android:background">@drawable/spinner_background_holo_dark</item>
     <item name="android:dropDownSelector">@drawable/list_selector_holo_dark</item>
   </style>
diff --git a/myTracks/src/main/res/values/themes_mytracks.xml b/myTracks/src/main/res/values/themes_mytracks.xml
index 937d53694..cb53481ef 100644
--- a/myTracks/src/main/res/values/themes_mytracks.xml
+++ b/myTracks/src/main/res/values/themes_mytracks.xml
@@ -15,17 +15,36 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
-  <style name="ThemeMyTracks" parent="android:Theme.Black">
+  <style name="ThemeMyTracks" parent="android:Theme.Holo">
     <!-- Auto generated -->
+    <item name="android:activatedBackgroundIndicator">@drawable/activated_background_holo_dark</item>
     <item name="android:autoCompleteTextViewStyle">@style/AutoCompleteTextViewMyTracks</item>
-    <item name="android:editTextStyle">@style/EditTextMyTracks</item>
-    <item name="android:checkboxStyle">@style/CheckBoxMyTracks</item>
-    <item name="android:listViewStyle">@style/ListViewMyTracks</item>
-    <item name="android:listViewWhiteStyle">@style/ListViewMyTracks.White</item>
+    <item name="android:dropDownSpinnerStyle">@style/SpinnerMyTracks</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="android:listChoiceIndicatorSingle">@drawable/btn_radio_holo_dark</item>
     <item name="android:progressBarStyleHorizontal">@style/ProgressBarMyTracks</item>
-    <item name="android:radioButtonStyle">@style/RadioButtonMyTracks</item>
-    <item name="android:spinnerDropDownItemStyle">@style/SpinnerDropDownItemMyTracks</item>
-    <item name="android:spinnerItemStyle">@style/SpinnerItemMyTracks</item>
-    <item name="android:spinnerStyle">@style/SpinnerMyTracks</item>
+    <!-- Manually added -->
+    <item name="android:actionBarStyle">@style/ActionBarStyleMyTracks</item>
+    <item name="android:actionModeBackground">@drawable/action_mode_background_mytracks</item>
+    <item name="android:alertDialogTheme">@style/AlertDialogThemeMyTracks</item>
+  </style>
+  <style name="AlertDialogThemeMyTracks" parent="@android:style/Theme.Holo.Dialog">
+    <!-- From auto generated -->
+    <item name="android:activatedBackgroundIndicator">@drawable/activated_background_holo_dark</item>
+    <item name="android:autoCompleteTextViewStyle">@style/AutoCompleteTextViewMyTracks</item>
+    <item name="android:dropDownSpinnerStyle">@style/SpinnerMyTracks</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="android:listChoiceIndicatorSingle">@drawable/btn_radio_holo_dark</item>
+    <item name="android:progressBarStyleHorizontal">@style/ProgressBarMyTracks</item>
+    <!-- From Theme.Holo.Dialog.Alert -->
+    <item name="android:textColor">@color/holo_orange_dark</item>
+    <item name="android:windowBackground">@android:color/transparent</item>
+    <item name="android:windowContentOverlay">@null</item>
+    <item name="android:windowMinWidthMajor">@android:dimen/dialog_min_width_major</item>
+    <item name="android:windowMinWidthMinor">@android:dimen/dialog_min_width_minor</item>
   </style>
 </resources>
\ No newline at end of file