diff --git a/MyTracks/AndroidManifest.xml b/MyTracks/AndroidManifest.xml
index 3e983284b..f29513ec2 100755
--- a/MyTracks/AndroidManifest.xml
+++ b/MyTracks/AndroidManifest.xml
@@ -138,7 +138,7 @@ limitations under the License.
     android:allowBackup="true"
     android:backupAgent="com.google.android.apps.mytracks.io.backup.MyTracksBackupAgent"
     android:hardwareAccelerated="true"
-    android:icon="@drawable/my_tracks_icon"
+    android:icon="@drawable/ic_launcher_my_tracks"
     android:label="@string/my_tracks_app_name"
     android:theme="@style/MyTracks" >
     <!-- For data backup -->
diff --git a/MyTracks/res/drawable-hdpi-v11/my_tracks_notification_icon.png b/MyTracks/res/drawable-hdpi-v11/ic_stat_notify_recording.png
similarity index 100%
rename from MyTracks/res/drawable-hdpi-v11/my_tracks_notification_icon.png
rename to MyTracks/res/drawable-hdpi-v11/ic_stat_notify_recording.png
diff --git a/MyTracks/res/drawable-hdpi/my_tracks_notification_icon.png b/MyTracks/res/drawable-hdpi/ic_stat_notify_recording.png
similarity index 100%
rename from MyTracks/res/drawable-hdpi/my_tracks_notification_icon.png
rename to MyTracks/res/drawable-hdpi/ic_stat_notify_recording.png
diff --git a/MyTracks/res/drawable-hdpi/tab_chart.png b/MyTracks/res/drawable-hdpi/ic_tab_chart.png
similarity index 100%
rename from MyTracks/res/drawable-hdpi/tab_chart.png
rename to MyTracks/res/drawable-hdpi/ic_tab_chart.png
diff --git a/MyTracks/res/drawable-hdpi/tab_map.png b/MyTracks/res/drawable-hdpi/ic_tab_map.png
similarity index 100%
rename from MyTracks/res/drawable-hdpi/tab_map.png
rename to MyTracks/res/drawable-hdpi/ic_tab_map.png
diff --git a/MyTracks/res/drawable-hdpi/tab_stats.png b/MyTracks/res/drawable-hdpi/ic_tab_stats.png
similarity index 100%
rename from MyTracks/res/drawable-hdpi/tab_stats.png
rename to MyTracks/res/drawable-hdpi/ic_tab_stats.png
diff --git a/MyTracks/res/drawable-mdpi-v11/my_tracks_notification_icon.png b/MyTracks/res/drawable-mdpi-v11/ic_stat_notify_recording.png
similarity index 100%
rename from MyTracks/res/drawable-mdpi-v11/my_tracks_notification_icon.png
rename to MyTracks/res/drawable-mdpi-v11/ic_stat_notify_recording.png
diff --git a/MyTracks/res/drawable-mdpi/my_tracks_notification_icon.png b/MyTracks/res/drawable-mdpi/ic_stat_notify_recording.png
similarity index 100%
rename from MyTracks/res/drawable-mdpi/my_tracks_notification_icon.png
rename to MyTracks/res/drawable-mdpi/ic_stat_notify_recording.png
diff --git a/MyTracks/res/drawable-mdpi/tab_chart.png b/MyTracks/res/drawable-mdpi/ic_tab_chart.png
similarity index 100%
rename from MyTracks/res/drawable-mdpi/tab_chart.png
rename to MyTracks/res/drawable-mdpi/ic_tab_chart.png
diff --git a/MyTracks/res/drawable-mdpi/tab_map.png b/MyTracks/res/drawable-mdpi/ic_tab_map.png
similarity index 100%
rename from MyTracks/res/drawable-mdpi/tab_map.png
rename to MyTracks/res/drawable-mdpi/ic_tab_map.png
diff --git a/MyTracks/res/drawable-mdpi/tab_stats.png b/MyTracks/res/drawable-mdpi/ic_tab_stats.png
similarity index 100%
rename from MyTracks/res/drawable-mdpi/tab_stats.png
rename to MyTracks/res/drawable-mdpi/ic_tab_stats.png
diff --git a/MyTracks/res/drawable-xhdpi-v11/my_tracks_notification_icon.png b/MyTracks/res/drawable-xhdpi-v11/ic_stat_notify_recording.png
similarity index 100%
rename from MyTracks/res/drawable-xhdpi-v11/my_tracks_notification_icon.png
rename to MyTracks/res/drawable-xhdpi-v11/ic_stat_notify_recording.png
diff --git a/MyTracks/res/layout/about.xml b/MyTracks/res/layout/about.xml
index 88a026d4a..f6c731395 100644
--- a/MyTracks/res/layout/about.xml
+++ b/MyTracks/res/layout/about.xml
@@ -22,7 +22,7 @@ limitations under the License.
     android:orientation="vertical"
     android:padding="8dp" >
     <TextView
-      android:drawableLeft="@drawable/my_tracks_icon"
+      android:drawableLeft="@drawable/ic_launcher_my_tracks"
       android:text="@string/about_copyright_notice"
       style="@style/TextMedium.WithIcon" />
     <TextView
diff --git a/MyTracks/res/values/styles.xml b/MyTracks/res/values/styles.xml
index a6a8b8969..458680f7b 100644
--- a/MyTracks/res/values/styles.xml
+++ b/MyTracks/res/values/styles.xml
@@ -343,7 +343,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/my_tracks_icon</item>
+    <item name="android:src">@drawable/ic_launcher_my_tracks</item>
   </style>
   <!-- track widget logo 4x4 -->
   <style name="TrackWidgetLogo4x4" parent="@style/TrackWidgetLogo">
diff --git a/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java b/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java
index 3bbf04363..16c67c0a2 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java
@@ -193,17 +193,18 @@ public class TrackDetailActivity extends AbstractSendToGoogleActivity implements
     tabsAdapter = new TabsAdapter(this, tabHost, viewPager);
 
     TabSpec mapTabSpec = tabHost.newTabSpec(MyTracksMapFragment.MAP_FRAGMENT_TAG).setIndicator(
-        getString(R.string.track_detail_map_tab), getResources().getDrawable(R.drawable.tab_map));
+        getString(R.string.track_detail_map_tab),
+        getResources().getDrawable(R.drawable.ic_tab_map));
     tabsAdapter.addTab(mapTabSpec, MyTracksMapFragment.class, null);
 
     TabSpec chartTabSpec = tabHost.newTabSpec(ChartFragment.CHART_FRAGMENT_TAG).setIndicator(
         getString(R.string.track_detail_chart_tab),
-        getResources().getDrawable(R.drawable.tab_chart));
+        getResources().getDrawable(R.drawable.ic_tab_chart));
     tabsAdapter.addTab(chartTabSpec, ChartFragment.class, null);
 
     TabSpec statsTabSpec = tabHost.newTabSpec(StatsFragment.STATS_FRAGMENT_TAG).setIndicator(
         getString(R.string.track_detail_stats_tab),
-        getResources().getDrawable(R.drawable.tab_stats));
+        getResources().getDrawable(R.drawable.ic_tab_stats));
     tabsAdapter.addTab(statsTabSpec, StatsFragment.class, null);
 
     if (savedInstanceState != null) {
diff --git a/MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingService.java b/MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingService.java
index 442278275..aad33f6fb 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingService.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingService.java
@@ -510,7 +510,7 @@ public class TrackRecordingService extends Service {
     NotificationCompat.Builder builder = new NotificationCompat.Builder(this).setContentIntent(
         pendingIntent).setContentText(getString(messageId))
         .setContentTitle(getString(R.string.my_tracks_app_name)).setOngoing(true)
-        .setSmallIcon(R.drawable.my_tracks_notification_icon).setWhen(System.currentTimeMillis());
+        .setSmallIcon(R.drawable.ic_stat_notify_recording).setWhen(System.currentTimeMillis());
     startForeground(1, builder.build());
   }
 
diff --git a/MyTracksLib/AndroidManifest.xml b/MyTracksLib/AndroidManifest.xml
index 271b2a052..bf69ed909 100644
--- a/MyTracksLib/AndroidManifest.xml
+++ b/MyTracksLib/AndroidManifest.xml
@@ -29,7 +29,7 @@ limitations under the License.
     android:targetSdkVersion="17" />
 
   <application
-    android:icon="@drawable/my_tracks_icon"
+    android:icon="@drawable/ic_launcher_my_tracks"
     android:label="@string/lib_name" >
   </application>
 
diff --git a/MyTracksLib/res/drawable-hdpi/my_tracks_icon.png b/MyTracksLib/res/drawable-hdpi/ic_launcher_my_tracks.png
similarity index 100%
rename from MyTracksLib/res/drawable-hdpi/my_tracks_icon.png
rename to MyTracksLib/res/drawable-hdpi/ic_launcher_my_tracks.png
diff --git a/MyTracksLib/res/drawable-mdpi/my_tracks_icon.png b/MyTracksLib/res/drawable-mdpi/ic_launcher_my_tracks.png
similarity index 100%
rename from MyTracksLib/res/drawable-mdpi/my_tracks_icon.png
rename to MyTracksLib/res/drawable-mdpi/ic_launcher_my_tracks.png
diff --git a/MyTracksLib/res/drawable-xhdpi/my_tracks_icon.png b/MyTracksLib/res/drawable-xhdpi/ic_launcher_my_tracks.png
similarity index 100%
rename from MyTracksLib/res/drawable-xhdpi/my_tracks_icon.png
rename to MyTracksLib/res/drawable-xhdpi/ic_launcher_my_tracks.png