diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 3a4fc1fa4..545fa5965 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -104,9 +104,9 @@ limitations under the License.
   <application
     android:allowBackup="true"
     android:hardwareAccelerated="true"
-    android:icon="@drawable/ic_launcher_my_tracks"
+    android:icon="@drawable/ic_launcher"
     android:label="@string/my_tracks_app_name"
-    android:theme="@style/ThemeMyTracks"
+    android:theme="@style/ThemeCustom"
     tools:replace="android:label" >
     <!-- Activities -->
     <activity
diff --git a/src/main/res/drawable-hdpi/ic_launcher_my_tracks.png b/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from src/main/res/drawable-hdpi/ic_launcher_my_tracks.png
rename to src/main/res/drawable-hdpi/ic_launcher.png
diff --git a/src/main/res/drawable-mdpi/ic_launcher_my_tracks.png b/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from src/main/res/drawable-mdpi/ic_launcher_my_tracks.png
rename to src/main/res/drawable-mdpi/ic_launcher.png
diff --git a/src/main/res/drawable-xhdpi/ic_launcher_my_tracks.png b/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from src/main/res/drawable-xhdpi/ic_launcher_my_tracks.png
rename to src/main/res/drawable-xhdpi/ic_launcher.png
diff --git a/src/main/res/drawable-xxhdpi/ic_launcher_my_tracks.png b/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from src/main/res/drawable-xxhdpi/ic_launcher_my_tracks.png
rename to src/main/res/drawable-xxhdpi/ic_launcher.png
diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml
index 9dd97aba0..7840494eb 100644
--- a/src/main/res/values/styles.xml
+++ b/src/main/res/values/styles.xml
@@ -15,7 +15,7 @@ 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">
+  <style name="ActionBarStyleCustom" 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>
@@ -357,7 +357,7 @@ limitations under the License.
     <item name="android:layout_width">24dp</item>
     <item name="android:padding">4dp</item>
     <item name="android:scaleType">fitXY</item>
-    <item name="android:src">@drawable/ic_launcher_my_tracks</item>
+    <item name="android:src">@drawable/ic_launcher</item>
   </style>
   <!-- track widget logo 4x4 -->
   <style name="TrackWidgetLogo4x4" parent="@style/TrackWidgetLogo">
diff --git a/src/main/res/values/styles_mytracks.xml b/src/main/res/values/styles_custom.xml
similarity index 74%
rename from src/main/res/values/styles_mytracks.xml
rename to src/main/res/values/styles_custom.xml
index 7026b9b9d..b9c07536b 100644
--- a/src/main/res/values/styles_mytracks.xml
+++ b/src/main/res/values/styles_custom.xml
@@ -1,15 +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.Holo.AutoCompleteTextView">
+  <style name="AutoCompleteTextViewCustom" 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">
+  <style name="ProgressBarCustom" 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">
+  <style name="SpinnerCustom" 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/src/main/res/values/themes_mytracks.xml b/src/main/res/values/themes_custom.xml
similarity index 87%
rename from src/main/res/values/themes_mytracks.xml
rename to src/main/res/values/themes_custom.xml
index cb53481ef..f7014adfc 100644
--- a/src/main/res/values/themes_mytracks.xml
+++ b/src/main/res/values/themes_custom.xml
@@ -15,31 +15,31 @@ 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">
+  <style name="ThemeCustom" 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: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="android:listChoiceIndicatorSingle">@drawable/btn_radio_holo_dark</item>
-    <item name="android:progressBarStyleHorizontal">@style/ProgressBarMyTracks</item>
+    <item name="android:progressBarStyleHorizontal">@style/ProgressBarCustom</item>
     <!-- Manually added -->
-    <item name="android:actionBarStyle">@style/ActionBarStyleMyTracks</item>
+    <item name="android:actionBarStyle">@style/ActionBarStyleCustom</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: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="android:listChoiceIndicatorSingle">@drawable/btn_radio_holo_dark</item>
-    <item name="android:progressBarStyleHorizontal">@style/ProgressBarMyTracks</item>
+    <item name="android:progressBarStyleHorizontal">@style/ProgressBarCustom</item>
     <!-- From Theme.Holo.Dialog.Alert -->
     <item name="android:textColor">@color/holo_orange_dark</item>
     <item name="android:windowBackground">@android:color/transparent</item>