diff --git a/MyTracks/AndroidManifest.xml b/MyTracks/AndroidManifest.xml
index 155608118..a9165cb83 100755
--- a/MyTracks/AndroidManifest.xml
+++ b/MyTracks/AndroidManifest.xml
@@ -125,7 +125,7 @@ limitations under the License.
 
   <application
     android:backupAgent="com.google.android.apps.mytracks.io.backup.MyTracksBackupAgent"
-    android:icon="@drawable/arrow_icon"
+    android:icon="@drawable/my_tracks_icon"
     android:label="@string/my_tracks_app_name"
     android:name="com.google.android.apps.mytracks.MyTracksApplication"
     android:theme="@style/ThemeSelector" >
diff --git a/MyTracks/res/drawable-mdpi/appwidget_background.9.png b/MyTracks/res/drawable-mdpi/app_widget_background.9.png
similarity index 100%
rename from MyTracks/res/drawable-mdpi/appwidget_background.9.png
rename to MyTracks/res/drawable-mdpi/app_widget_background.9.png
diff --git a/MyTracks/res/drawable-mdpi/appwidget_button_disabled.png b/MyTracks/res/drawable-mdpi/app_widget_button_disabled.png
similarity index 100%
rename from MyTracks/res/drawable-mdpi/appwidget_button_disabled.png
rename to MyTracks/res/drawable-mdpi/app_widget_button_disabled.png
diff --git a/MyTracks/res/drawable-mdpi/appwidget_button_enabled.png b/MyTracks/res/drawable-mdpi/app_widget_button_enabled.png
similarity index 100%
rename from MyTracks/res/drawable-mdpi/appwidget_button_enabled.png
rename to MyTracks/res/drawable-mdpi/app_widget_button_enabled.png
diff --git a/MyTracks/res/drawable-mdpi/googledocs_icon.png b/MyTracks/res/drawable-mdpi/google_docs_icon.png
similarity index 100%
rename from MyTracks/res/drawable-mdpi/googledocs_icon.png
rename to MyTracks/res/drawable-mdpi/google_docs_icon.png
diff --git a/MyTracks/res/drawable-mdpi/google_fusion_tables_icon.png b/MyTracks/res/drawable-mdpi/google_fusion_tables_icon.png
new file mode 100644
index 000000000..8b0e2d38f
Binary files /dev/null and b/MyTracks/res/drawable-mdpi/google_fusion_tables_icon.png differ
diff --git a/MyTracks/res/drawable-mdpi/maps_icon.png b/MyTracks/res/drawable-mdpi/google_maps_icon.png
similarity index 100%
rename from MyTracks/res/drawable-mdpi/maps_icon.png
rename to MyTracks/res/drawable-mdpi/google_maps_icon.png
diff --git a/MyTracks/res/drawable-mdpi/my_tracks_notification_icon.png b/MyTracks/res/drawable-mdpi/my_tracks_notification_icon.png
new file mode 100644
index 000000000..4980583b7
Binary files /dev/null and b/MyTracks/res/drawable-mdpi/my_tracks_notification_icon.png differ
diff --git a/MyTracks/res/drawable-mdpi/ylw_pushpin.png b/MyTracks/res/drawable-mdpi/yellow_pushpin.png
similarity index 100%
rename from MyTracks/res/drawable-mdpi/ylw_pushpin.png
rename to MyTracks/res/drawable-mdpi/yellow_pushpin.png
diff --git a/MyTracks/res/layout/about.xml b/MyTracks/res/layout/about.xml
index b087fe596..e98c5982f 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/arrow_icon"
+      android:drawableLeft="@drawable/my_tracks_icon"
       android:text="@string/about_copyright_notice"
       style="@style/TextMedium.WithIcon" />
     <TextView
diff --git a/MyTracks/res/layout/help.xml b/MyTracks/res/layout/help.xml
index c5a2986d5..d34e5020d 100644
--- a/MyTracks/res/layout/help.xml
+++ b/MyTracks/res/layout/help.xml
@@ -29,7 +29,7 @@ limitations under the License.
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
         android:scaleType="fitStart"
-        android:src="@drawable/arrow_icon" />
+        android:src="@drawable/my_tracks_icon" />
       <TextView
         android:text="@string/help_my_tracks_question"
         style="@style/HelpQuestion" />
diff --git a/MyTracks/res/layout/track_widget.xml b/MyTracks/res/layout/track_widget.xml
index 55ca5bed2..c43096b4c 100644
--- a/MyTracks/res/layout/track_widget.xml
+++ b/MyTracks/res/layout/track_widget.xml
@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  android:background="@drawable/appwidget_background"
+  android:background="@drawable/app_widget_background"
   android:layout_height="fill_parent"
   android:layout_width="fill_parent"
   android:paddingBottom="5dp"
@@ -30,7 +30,7 @@ limitations under the License.
     android:layout_width="wrap_content"
     android:paddingLeft="10dp"
     android:paddingRight="10dp"
-    android:src="@drawable/appwidget_button_disabled" />
+    android:src="@drawable/app_widget_button_disabled" />
   <LinearLayout
     android:clickable="true"
     android:id="@+id/appwidget_track_statistics"
diff --git a/MyTracks/res/layout/upload_service_chooser.xml b/MyTracks/res/layout/upload_service_chooser.xml
index caabaf7bf..189ed9921 100644
--- a/MyTracks/res/layout/upload_service_chooser.xml
+++ b/MyTracks/res/layout/upload_service_chooser.xml
@@ -24,7 +24,7 @@ limitations under the License.
     <TableRow android:id="@+id/send_google_maps_row" >
       <ImageView
         android:contentDescription="@string/send_google_maps"
-        android:src="@drawable/maps_icon"
+        android:src="@drawable/google_maps_icon"
         style="@style/UploadServiceChooserImageView" />
       <CheckBox
         android:id="@+id/send_google_maps"
@@ -50,7 +50,7 @@ limitations under the License.
     <TableRow android:id="@+id/send_google_fusion_tables_row" >
       <ImageView
         android:contentDescription="@string/send_google_fusion_tables"
-        android:src="@drawable/googledocs_icon"
+        android:src="@drawable/google_fusion_tables_icon"
         style="@style/UploadServiceChooserImageView" />
       <CheckBox
         android:id="@+id/send_google_fusion_tables"
@@ -60,7 +60,7 @@ limitations under the License.
     <TableRow android:id="@+id/send_google_docs_row" >
       <ImageView
         android:contentDescription="@string/send_google_docs"
-        android:src="@drawable/googledocs_icon"
+        android:src="@drawable/google_docs_icon"
         style="@style/UploadServiceChooserImageView" />
       <CheckBox
         android:id="@+id/send_google_docs"
diff --git a/MyTracks/src/com/google/android/apps/mytracks/ChartView.java b/MyTracks/src/com/google/android/apps/mytracks/ChartView.java
index da5389411..a5169d830 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/ChartView.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/ChartView.java
@@ -191,7 +191,7 @@ public class ChartView extends View {
     pointer.setBounds(0, 0,
         pointer.getIntrinsicWidth(), pointer.getIntrinsicHeight());
 
-    statsMarker = getResources().getDrawable(R.drawable.ylw_pushpin);
+    statsMarker = getResources().getDrawable(R.drawable.yellow_pushpin);
     markerWidth = statsMarker.getIntrinsicWidth();
     markerHeight = statsMarker.getIntrinsicHeight();
     statsMarker.setBounds(0, 0, markerWidth, markerHeight);
diff --git a/MyTracks/src/com/google/android/apps/mytracks/MapOverlay.java b/MyTracks/src/com/google/android/apps/mytracks/MapOverlay.java
index 6c21e298b..57076921c 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/MapOverlay.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/MapOverlay.java
@@ -146,7 +146,7 @@ public class MapOverlay extends Overlay implements OnSharedPreferenceChangeListe
       arrow.setBounds(0, 0, arrowWidth, arrowHeight);
     }
 
-    statsMarker = resources.getDrawable(R.drawable.ylw_pushpin);
+    statsMarker = resources.getDrawable(R.drawable.yellow_pushpin);
     markerWidth = statsMarker.getIntrinsicWidth();
     markerHeight = statsMarker.getIntrinsicHeight();
     statsMarker.setBounds(0, 0, markerWidth, markerHeight);
diff --git a/MyTracks/src/com/google/android/apps/mytracks/MarkerEditActivity.java b/MyTracks/src/com/google/android/apps/mytracks/MarkerEditActivity.java
index bae7c6966..0728c69f4 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/MarkerEditActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/MarkerEditActivity.java
@@ -151,7 +151,7 @@ public class MarkerEditActivity extends AbstractMyTracksActivity {
    */
   private void updateUiByMarkerType(boolean statistics) {
     name.setCompoundDrawablesWithIntrinsicBounds(
-        statistics ? R.drawable.ylw_pushpin : R.drawable.blue_pushpin, 0, 0, 0);
+        statistics ? R.drawable.yellow_pushpin : R.drawable.blue_pushpin, 0, 0, 0);
     name.setImeOptions(statistics ? EditorInfo.IME_ACTION_DONE : EditorInfo.IME_ACTION_NEXT);
     waypointSection.setVisibility(statistics ? View.GONE : View.VISIBLE);
   }
diff --git a/MyTracks/src/com/google/android/apps/mytracks/MarkerListActivity.java b/MyTracks/src/com/google/android/apps/mytracks/MarkerListActivity.java
index e590ed8ca..da5d028ae 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/MarkerListActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/MarkerListActivity.java
@@ -137,7 +137,7 @@ public class MarkerListActivity extends AbstractMyTracksActivity {
 
         boolean statistics = cursor.getInt(typeIndex) == Waypoint.TYPE_STATISTICS;
         String name = cursor.getString(nameIndex);
-        int iconId = statistics ? R.drawable.ylw_pushpin : R.drawable.blue_pushpin;
+        int iconId = statistics ? R.drawable.yellow_pushpin : R.drawable.blue_pushpin;
         String category = statistics ? null : cursor.getString(categoryIndex);
         long time = cursor.getLong(timeIndex);
         String startTime = time == 0 
diff --git a/MyTracks/src/com/google/android/apps/mytracks/SearchListActivity.java b/MyTracks/src/com/google/android/apps/mytracks/SearchListActivity.java
index 001ae0008..ca6e970af 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/SearchListActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/SearchListActivity.java
@@ -378,7 +378,7 @@ public class SearchListActivity extends AbstractMyTracksActivity {
 
     boolean statistics = waypoint.getType() == Waypoint.TYPE_STATISTICS;
     resultMap.put(NAME_FIELD, waypoint.getName());
-    resultMap.put(ICON_FIELD, statistics ? R.drawable.ylw_pushpin : R.drawable.blue_pushpin);
+    resultMap.put(ICON_FIELD, statistics ? R.drawable.yellow_pushpin : R.drawable.blue_pushpin);
     resultMap.put(CATEGORY_FIELD, statistics ? null : waypoint.getCategory());
 
     long time = waypoint.getLocation().getTime();
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 ab4471f29..b737cf302 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingService.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingService.java
@@ -486,7 +486,7 @@ public class TrackRecordingService extends Service {
   private void showNotification() {
     if (isRecording) {
       Notification notification = new Notification(
-          R.drawable.arrow_320, null /* tickerText */,
+          R.drawable.my_tracks_notification_icon, null /* tickerText */,
           System.currentTimeMillis());
       Intent intent = IntentUtils.newIntent(this, TrackDetailActivity.class)
           .putExtra(TrackDetailActivity.EXTRA_TRACK_ID, recordingTrackId);
diff --git a/MyTracks/src/com/google/android/apps/mytracks/widgets/TrackWidgetProvider.java b/MyTracks/src/com/google/android/apps/mytracks/widgets/TrackWidgetProvider.java
index 22ef61df0..620149579 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/widgets/TrackWidgetProvider.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/widgets/TrackWidgetProvider.java
@@ -178,11 +178,11 @@ public class TrackWidgetProvider
     if (TRACK_STARTED_ACTION.equals(action)) {
       // If a new track is started by this appwidget or elsewhere,
       // toggle the button to active and have it disable the track if pressed.
-      setButtonIntent(views, R.string.track_action_end, R.drawable.appwidget_button_enabled);
+      setButtonIntent(views, R.string.track_action_end, R.drawable.app_widget_button_enabled);
     } else {
       // If a track is stopped by this appwidget or elsewhere,
       // toggle the button to inactive and have it start a new track if pressed.
-      setButtonIntent(views, R.string.track_action_start, R.drawable.appwidget_button_disabled);
+      setButtonIntent(views, R.string.track_action_start, R.drawable.app_widget_button_disabled);
     }
   }
 
diff --git a/MyTracksLib/AndroidManifest.xml b/MyTracksLib/AndroidManifest.xml
index 8545d5d4e..11c365b31 100644
--- a/MyTracksLib/AndroidManifest.xml
+++ b/MyTracksLib/AndroidManifest.xml
@@ -29,7 +29,7 @@ limitations under the License.
     android:targetSdkVersion="15" />
 
   <application
-    android:icon="@drawable/arrow_icon"
+    android:icon="@drawable/my_tracks_icon"
     android:label="@string/lib_name" >
   </application>
 
diff --git a/MyTracksLib/res/drawable-mdpi/arrow_icon.png b/MyTracksLib/res/drawable-mdpi/my_tracks_icon.png
similarity index 100%
rename from MyTracksLib/res/drawable-mdpi/arrow_icon.png
rename to MyTracksLib/res/drawable-mdpi/my_tracks_icon.png