diff --git a/MyTracks/AndroidManifest.xml b/MyTracks/AndroidManifest.xml
index f29513ec2..253ad2c65 100755
--- a/MyTracks/AndroidManifest.xml
+++ b/MyTracks/AndroidManifest.xml
@@ -252,7 +252,7 @@ limitations under the License.
     <service
       android:enabled="true"
       android:exported="true"
-      android:icon="@drawable/arrow_320"
+      android:icon="@drawable/ic_arrow_320"
       android:label="@string/my_tracks_recording_service"
       android:name="com.google.android.apps.mytracks.services.TrackRecordingService"
       android:permission="com.google.android.apps.mytracks.WRITE_TRACK_DATA" />
diff --git a/MyTracks/res/drawable-hdpi/arrow_180.png b/MyTracks/res/drawable-hdpi/ic_arrow_180.png
similarity index 100%
rename from MyTracks/res/drawable-hdpi/arrow_180.png
rename to MyTracks/res/drawable-hdpi/ic_arrow_180.png
diff --git a/MyTracks/res/drawable-hdpi/arrow_320.png b/MyTracks/res/drawable-hdpi/ic_arrow_320.png
similarity index 100%
rename from MyTracks/res/drawable-hdpi/arrow_320.png
rename to MyTracks/res/drawable-hdpi/ic_arrow_320.png
diff --git a/MyTracks/res/drawable-hdpi/btn_pause.png b/MyTracks/res/drawable-hdpi/ic_button_pause.png
similarity index 100%
rename from MyTracks/res/drawable-hdpi/btn_pause.png
rename to MyTracks/res/drawable-hdpi/ic_button_pause.png
diff --git a/MyTracks/res/drawable-hdpi/btn_pause_pressed.png b/MyTracks/res/drawable-hdpi/ic_button_pause_pressed.png
similarity index 100%
rename from MyTracks/res/drawable-hdpi/btn_pause_pressed.png
rename to MyTracks/res/drawable-hdpi/ic_button_pause_pressed.png
diff --git a/MyTracks/res/drawable-hdpi/btn_record.png b/MyTracks/res/drawable-hdpi/ic_button_record.png
similarity index 100%
rename from MyTracks/res/drawable-hdpi/btn_record.png
rename to MyTracks/res/drawable-hdpi/ic_button_record.png
diff --git a/MyTracks/res/drawable-hdpi/btn_record_pressed.png b/MyTracks/res/drawable-hdpi/ic_button_record_pressed.png
similarity index 100%
rename from MyTracks/res/drawable-hdpi/btn_record_pressed.png
rename to MyTracks/res/drawable-hdpi/ic_button_record_pressed.png
diff --git a/MyTracks/res/drawable-hdpi/btn_stop_1.png b/MyTracks/res/drawable-hdpi/ic_button_stop.png
similarity index 100%
rename from MyTracks/res/drawable-hdpi/btn_stop_1.png
rename to MyTracks/res/drawable-hdpi/ic_button_stop.png
diff --git a/MyTracks/res/drawable-hdpi/btn_stop_0.png b/MyTracks/res/drawable-hdpi/ic_button_stop_disabled.png
similarity index 100%
rename from MyTracks/res/drawable-hdpi/btn_stop_0.png
rename to MyTracks/res/drawable-hdpi/ic_button_stop_disabled.png
diff --git a/MyTracks/res/drawable-hdpi/btn_stop_1_pressed.png b/MyTracks/res/drawable-hdpi/ic_button_stop_pressed.png
similarity index 100%
rename from MyTracks/res/drawable-hdpi/btn_stop_1_pressed.png
rename to MyTracks/res/drawable-hdpi/ic_button_stop_pressed.png
diff --git a/MyTracks/res/drawable-hdpi/blue_pushpin.png b/MyTracks/res/drawable-hdpi/ic_marker_blue_pushpin.png
similarity index 100%
rename from MyTracks/res/drawable-hdpi/blue_pushpin.png
rename to MyTracks/res/drawable-hdpi/ic_marker_blue_pushpin.png
diff --git a/MyTracks/res/drawable-hdpi/green_dot.png b/MyTracks/res/drawable-hdpi/ic_marker_green_paddle.png
similarity index 100%
rename from MyTracks/res/drawable-hdpi/green_dot.png
rename to MyTracks/res/drawable-hdpi/ic_marker_green_paddle.png
diff --git a/MyTracks/res/drawable-hdpi/red_dot.png b/MyTracks/res/drawable-hdpi/ic_marker_red_paddle.png
similarity index 100%
rename from MyTracks/res/drawable-hdpi/red_dot.png
rename to MyTracks/res/drawable-hdpi/ic_marker_red_paddle.png
diff --git a/MyTracks/res/drawable-hdpi/yellow_pushpin.png b/MyTracks/res/drawable-hdpi/ic_marker_yellow_pushpin.png
similarity index 100%
rename from MyTracks/res/drawable-hdpi/yellow_pushpin.png
rename to MyTracks/res/drawable-hdpi/ic_marker_yellow_pushpin.png
diff --git a/MyTracks/res/drawable-hdpi/my_location_normal.png b/MyTracks/res/drawable-hdpi/ic_my_location.png
similarity index 100%
rename from MyTracks/res/drawable-hdpi/my_location_normal.png
rename to MyTracks/res/drawable-hdpi/ic_my_location.png
diff --git a/MyTracks/res/drawable-hdpi/my_location_pressed.png b/MyTracks/res/drawable-hdpi/ic_my_location_pressed.png
similarity index 100%
rename from MyTracks/res/drawable-hdpi/my_location_pressed.png
rename to MyTracks/res/drawable-hdpi/ic_my_location_pressed.png
diff --git a/MyTracks/res/drawable-hdpi/warning.png b/MyTracks/res/drawable-hdpi/ic_warning.png
similarity index 100%
rename from MyTracks/res/drawable-hdpi/warning.png
rename to MyTracks/res/drawable-hdpi/ic_warning.png
diff --git a/MyTracks/res/drawable-mdpi/arrow_180.png b/MyTracks/res/drawable-mdpi/ic_arrow_180.png
similarity index 100%
rename from MyTracks/res/drawable-mdpi/arrow_180.png
rename to MyTracks/res/drawable-mdpi/ic_arrow_180.png
diff --git a/MyTracks/res/drawable-mdpi/arrow_320.png b/MyTracks/res/drawable-mdpi/ic_arrow_320.png
similarity index 100%
rename from MyTracks/res/drawable-mdpi/arrow_320.png
rename to MyTracks/res/drawable-mdpi/ic_arrow_320.png
diff --git a/MyTracks/res/drawable-mdpi/btn_pause.png b/MyTracks/res/drawable-mdpi/ic_button_pause.png
similarity index 100%
rename from MyTracks/res/drawable-mdpi/btn_pause.png
rename to MyTracks/res/drawable-mdpi/ic_button_pause.png
diff --git a/MyTracks/res/drawable-mdpi/btn_pause_pressed.png b/MyTracks/res/drawable-mdpi/ic_button_pause_pressed.png
similarity index 100%
rename from MyTracks/res/drawable-mdpi/btn_pause_pressed.png
rename to MyTracks/res/drawable-mdpi/ic_button_pause_pressed.png
diff --git a/MyTracks/res/drawable-mdpi/btn_record.png b/MyTracks/res/drawable-mdpi/ic_button_record.png
similarity index 100%
rename from MyTracks/res/drawable-mdpi/btn_record.png
rename to MyTracks/res/drawable-mdpi/ic_button_record.png
diff --git a/MyTracks/res/drawable-mdpi/btn_record_pressed.png b/MyTracks/res/drawable-mdpi/ic_button_record_pressed.png
similarity index 100%
rename from MyTracks/res/drawable-mdpi/btn_record_pressed.png
rename to MyTracks/res/drawable-mdpi/ic_button_record_pressed.png
diff --git a/MyTracks/res/drawable-mdpi/btn_stop_1.png b/MyTracks/res/drawable-mdpi/ic_button_stop.png
similarity index 100%
rename from MyTracks/res/drawable-mdpi/btn_stop_1.png
rename to MyTracks/res/drawable-mdpi/ic_button_stop.png
diff --git a/MyTracks/res/drawable-mdpi/btn_stop_0.png b/MyTracks/res/drawable-mdpi/ic_button_stop_disabled.png
similarity index 100%
rename from MyTracks/res/drawable-mdpi/btn_stop_0.png
rename to MyTracks/res/drawable-mdpi/ic_button_stop_disabled.png
diff --git a/MyTracks/res/drawable-mdpi/btn_stop_1_pressed.png b/MyTracks/res/drawable-mdpi/ic_button_stop_pressed.png
similarity index 100%
rename from MyTracks/res/drawable-mdpi/btn_stop_1_pressed.png
rename to MyTracks/res/drawable-mdpi/ic_button_stop_pressed.png
diff --git a/MyTracks/res/drawable-mdpi/blue_pushpin.png b/MyTracks/res/drawable-mdpi/ic_marker_blue_pushpin.png
similarity index 100%
rename from MyTracks/res/drawable-mdpi/blue_pushpin.png
rename to MyTracks/res/drawable-mdpi/ic_marker_blue_pushpin.png
diff --git a/MyTracks/res/drawable-mdpi/green_dot.png b/MyTracks/res/drawable-mdpi/ic_marker_green_paddle.png
similarity index 100%
rename from MyTracks/res/drawable-mdpi/green_dot.png
rename to MyTracks/res/drawable-mdpi/ic_marker_green_paddle.png
diff --git a/MyTracks/res/drawable-mdpi/red_dot.png b/MyTracks/res/drawable-mdpi/ic_marker_red_paddle.png
similarity index 100%
rename from MyTracks/res/drawable-mdpi/red_dot.png
rename to MyTracks/res/drawable-mdpi/ic_marker_red_paddle.png
diff --git a/MyTracks/res/drawable-mdpi/yellow_pushpin.png b/MyTracks/res/drawable-mdpi/ic_marker_yellow_pushpin.png
similarity index 100%
rename from MyTracks/res/drawable-mdpi/yellow_pushpin.png
rename to MyTracks/res/drawable-mdpi/ic_marker_yellow_pushpin.png
diff --git a/MyTracks/res/drawable-mdpi/my_location_normal.png b/MyTracks/res/drawable-mdpi/ic_my_location.png
similarity index 100%
rename from MyTracks/res/drawable-mdpi/my_location_normal.png
rename to MyTracks/res/drawable-mdpi/ic_my_location.png
diff --git a/MyTracks/res/drawable-mdpi/my_location_pressed.png b/MyTracks/res/drawable-mdpi/ic_my_location_pressed.png
similarity index 100%
rename from MyTracks/res/drawable-mdpi/my_location_pressed.png
rename to MyTracks/res/drawable-mdpi/ic_my_location_pressed.png
diff --git a/MyTracks/res/drawable-mdpi/warning.png b/MyTracks/res/drawable-mdpi/ic_warning.png
similarity index 100%
rename from MyTracks/res/drawable-mdpi/warning.png
rename to MyTracks/res/drawable-mdpi/ic_warning.png
diff --git a/MyTracks/res/drawable-xhdpi/arrow_180.png b/MyTracks/res/drawable-xhdpi/ic_arrow_180.png
similarity index 100%
rename from MyTracks/res/drawable-xhdpi/arrow_180.png
rename to MyTracks/res/drawable-xhdpi/ic_arrow_180.png
diff --git a/MyTracks/res/drawable-xhdpi/arrow_320.png b/MyTracks/res/drawable-xhdpi/ic_arrow_320.png
similarity index 100%
rename from MyTracks/res/drawable-xhdpi/arrow_320.png
rename to MyTracks/res/drawable-xhdpi/ic_arrow_320.png
diff --git a/MyTracks/res/drawable-xhdpi/btn_pause.png b/MyTracks/res/drawable-xhdpi/ic_button_pause.png
similarity index 100%
rename from MyTracks/res/drawable-xhdpi/btn_pause.png
rename to MyTracks/res/drawable-xhdpi/ic_button_pause.png
diff --git a/MyTracks/res/drawable-xhdpi/btn_pause_pressed.png b/MyTracks/res/drawable-xhdpi/ic_button_pause_pressed.png
similarity index 100%
rename from MyTracks/res/drawable-xhdpi/btn_pause_pressed.png
rename to MyTracks/res/drawable-xhdpi/ic_button_pause_pressed.png
diff --git a/MyTracks/res/drawable-xhdpi/btn_record.png b/MyTracks/res/drawable-xhdpi/ic_button_record.png
similarity index 100%
rename from MyTracks/res/drawable-xhdpi/btn_record.png
rename to MyTracks/res/drawable-xhdpi/ic_button_record.png
diff --git a/MyTracks/res/drawable-xhdpi/btn_record_pressed.png b/MyTracks/res/drawable-xhdpi/ic_button_record_pressed.png
similarity index 100%
rename from MyTracks/res/drawable-xhdpi/btn_record_pressed.png
rename to MyTracks/res/drawable-xhdpi/ic_button_record_pressed.png
diff --git a/MyTracks/res/drawable-xhdpi/btn_stop_1.png b/MyTracks/res/drawable-xhdpi/ic_button_stop.png
similarity index 100%
rename from MyTracks/res/drawable-xhdpi/btn_stop_1.png
rename to MyTracks/res/drawable-xhdpi/ic_button_stop.png
diff --git a/MyTracks/res/drawable-xhdpi/btn_stop_0.png b/MyTracks/res/drawable-xhdpi/ic_button_stop_disabled.png
similarity index 100%
rename from MyTracks/res/drawable-xhdpi/btn_stop_0.png
rename to MyTracks/res/drawable-xhdpi/ic_button_stop_disabled.png
diff --git a/MyTracks/res/drawable-xhdpi/btn_stop_1_pressed.png b/MyTracks/res/drawable-xhdpi/ic_button_stop_pressed.png
similarity index 100%
rename from MyTracks/res/drawable-xhdpi/btn_stop_1_pressed.png
rename to MyTracks/res/drawable-xhdpi/ic_button_stop_pressed.png
diff --git a/MyTracks/res/drawable-xhdpi/blue_pushpin.png b/MyTracks/res/drawable-xhdpi/ic_marker_blue_pushpin.png
similarity index 100%
rename from MyTracks/res/drawable-xhdpi/blue_pushpin.png
rename to MyTracks/res/drawable-xhdpi/ic_marker_blue_pushpin.png
diff --git a/MyTracks/res/drawable-xhdpi/green_dot.png b/MyTracks/res/drawable-xhdpi/ic_marker_green_paddle.png
similarity index 100%
rename from MyTracks/res/drawable-xhdpi/green_dot.png
rename to MyTracks/res/drawable-xhdpi/ic_marker_green_paddle.png
diff --git a/MyTracks/res/drawable-xhdpi/red_dot.png b/MyTracks/res/drawable-xhdpi/ic_marker_red_paddle.png
similarity index 100%
rename from MyTracks/res/drawable-xhdpi/red_dot.png
rename to MyTracks/res/drawable-xhdpi/ic_marker_red_paddle.png
diff --git a/MyTracks/res/drawable-xhdpi/yellow_pushpin.png b/MyTracks/res/drawable-xhdpi/ic_marker_yellow_pushpin.png
similarity index 100%
rename from MyTracks/res/drawable-xhdpi/yellow_pushpin.png
rename to MyTracks/res/drawable-xhdpi/ic_marker_yellow_pushpin.png
diff --git a/MyTracks/res/drawable-xhdpi/my_location_normal.png b/MyTracks/res/drawable-xhdpi/ic_my_location.png
similarity index 100%
rename from MyTracks/res/drawable-xhdpi/my_location_normal.png
rename to MyTracks/res/drawable-xhdpi/ic_my_location.png
diff --git a/MyTracks/res/drawable-xhdpi/my_location_pressed.png b/MyTracks/res/drawable-xhdpi/ic_my_location_pressed.png
similarity index 100%
rename from MyTracks/res/drawable-xhdpi/my_location_pressed.png
rename to MyTracks/res/drawable-xhdpi/ic_my_location_pressed.png
diff --git a/MyTracks/res/drawable-xhdpi/warning.png b/MyTracks/res/drawable-xhdpi/ic_warning.png
similarity index 100%
rename from MyTracks/res/drawable-xhdpi/warning.png
rename to MyTracks/res/drawable-xhdpi/ic_warning.png
diff --git a/MyTracks/res/drawable/record_button.xml b/MyTracks/res/drawable/button_pause.xml
similarity index 82%
rename from MyTracks/res/drawable/record_button.xml
rename to MyTracks/res/drawable/button_pause.xml
index 02bc8a83c..d81ef26ab 100644
--- a/MyTracks/res/drawable/record_button.xml
+++ b/MyTracks/res/drawable/button_pause.xml
@@ -15,6 +15,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:drawable="@drawable/btn_record_pressed" android:state_pressed="true"/>
-  <item android:drawable="@drawable/btn_record"/>
+  <item android:drawable="@drawable/ic_button_pause_pressed" android:state_pressed="true"/>
+  <item android:drawable="@drawable/ic_button_pause"/>
 </selector>
\ No newline at end of file
diff --git a/MyTracks/res/drawable/stop_1_button.xml b/MyTracks/res/drawable/button_record.xml
similarity index 82%
rename from MyTracks/res/drawable/stop_1_button.xml
rename to MyTracks/res/drawable/button_record.xml
index acbd5107d..0d4dc4ef1 100644
--- a/MyTracks/res/drawable/stop_1_button.xml
+++ b/MyTracks/res/drawable/button_record.xml
@@ -15,6 +15,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:drawable="@drawable/btn_stop_1_pressed" android:state_pressed="true"/>
-  <item android:drawable="@drawable/btn_stop_1"/>
+  <item android:drawable="@drawable/ic_button_record_pressed" android:state_pressed="true"/>
+  <item android:drawable="@drawable/ic_button_record"/>
 </selector>
\ No newline at end of file
diff --git a/MyTracks/res/drawable/pause_button.xml b/MyTracks/res/drawable/button_stop.xml
similarity index 82%
rename from MyTracks/res/drawable/pause_button.xml
rename to MyTracks/res/drawable/button_stop.xml
index ac9db77de..a1e833eff 100644
--- a/MyTracks/res/drawable/pause_button.xml
+++ b/MyTracks/res/drawable/button_stop.xml
@@ -15,6 +15,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:drawable="@drawable/btn_pause_pressed" android:state_pressed="true"/>
-  <item android:drawable="@drawable/btn_pause"/>
+  <item android:drawable="@drawable/ic_button_stop_pressed" android:state_pressed="true"/>
+  <item android:drawable="@drawable/ic_button_stop"/>
 </selector>
\ No newline at end of file
diff --git a/MyTracks/res/drawable/my_location.xml b/MyTracks/res/drawable/my_location.xml
index 49e73adf3..3f1c15732 100644
--- a/MyTracks/res/drawable/my_location.xml
+++ b/MyTracks/res/drawable/my_location.xml
@@ -15,6 +15,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:drawable="@drawable/my_location_pressed" android:state_pressed="true"/>
-  <item android:drawable="@drawable/my_location_normal"/>
+  <item android:drawable="@drawable/ic_my_location_pressed" android:state_pressed="true"/>
+  <item android:drawable="@drawable/ic_my_location"/>
 </selector>
\ No newline at end of file
diff --git a/MyTracks/res/layout-land/track_controller.xml b/MyTracks/res/layout-land/track_controller.xml
index 8891c9801..bc567c224 100644
--- a/MyTracks/res/layout-land/track_controller.xml
+++ b/MyTracks/res/layout-land/track_controller.xml
@@ -61,7 +61,7 @@ limitations under the License.
       android:layout_height="0dp"
       android:layout_weight="10"
       android:layout_width="match_parent"
-      android:src="@drawable/btn_stop_0" />
+      android:src="@drawable/ic_button_stop_disabled" />
     <View
       android:layout_height="0dp"
       android:layout_weight="1"
diff --git a/MyTracks/res/layout/map.xml b/MyTracks/res/layout/map.xml
index 4c03b2e8f..134c6f055 100644
--- a/MyTracks/res/layout/map.xml
+++ b/MyTracks/res/layout/map.xml
@@ -20,7 +20,7 @@ limitations under the License.
   android:layout_width="match_parent" >
   <TextView
     android:background="@color/warning_background"
-    android:drawableLeft="@drawable/warning"
+    android:drawableLeft="@drawable/ic_warning"
     android:gravity="left|center_vertical"
     android:id="@+id/map_message"
     android:layout_alignParentTop="true"
diff --git a/MyTracks/res/layout/marker_edit.xml b/MyTracks/res/layout/marker_edit.xml
index 750d38ca1..97e526cd2 100644
--- a/MyTracks/res/layout/marker_edit.xml
+++ b/MyTracks/res/layout/marker_edit.xml
@@ -33,7 +33,7 @@ limitations under the License.
         android:layout_width="match_parent"
         android:orientation="vertical" >
         <EditText
-          android:drawableLeft="@drawable/yellow_pushpin"
+          android:drawableLeft="@drawable/ic_marker_yellow_pushpin"
           android:hint="@string/generic_name"
           android:id="@+id/marker_edit_statistics_name"
           android:imeOptions="actionDone"
@@ -45,7 +45,7 @@ limitations under the License.
         android:layout_width="match_parent"
         android:orientation="vertical" >
         <EditText
-          android:drawableLeft="@drawable/blue_pushpin"
+          android:drawableLeft="@drawable/ic_marker_blue_pushpin"
           android:hint="@string/generic_name"
           android:id="@+id/marker_edit_waypoint_name"
           android:imeOptions="actionNext"
diff --git a/MyTracks/res/layout/track_controller.xml b/MyTracks/res/layout/track_controller.xml
index 72a01b586..4eac77b44 100644
--- a/MyTracks/res/layout/track_controller.xml
+++ b/MyTracks/res/layout/track_controller.xml
@@ -62,7 +62,7 @@ limitations under the License.
       android:layout_height="wrap_content"
       android:layout_weight="10"
       android:layout_width="0dp"
-      android:src="@drawable/btn_stop_0" />
+      android:src="@drawable/ic_button_stop_disabled" />
     <View
       android:layout_height="match_parent"
       android:layout_weight="1"
diff --git a/MyTracks/res/layout/track_widget_4x1.xml b/MyTracks/res/layout/track_widget_4x1.xml
index 844861aff..2192cfbd6 100644
--- a/MyTracks/res/layout/track_widget_4x1.xml
+++ b/MyTracks/res/layout/track_widget_4x1.xml
@@ -27,7 +27,7 @@ limitations under the License.
     <ImageButton
       android:contentDescription="@string/icon_record_track"
       android:id="@+id/track_widget_record_button"
-      android:src="@drawable/record_button"      
+      android:src="@drawable/button_record"      
       style="@style/TrackWidgetButton" />
     <LinearLayout
       android:id="@+id/track_widget_stats_container"
@@ -92,7 +92,7 @@ limitations under the License.
     <ImageButton
       android:contentDescription="@string/icon_stop_recording"
       android:id="@+id/track_widget_stop_button"
-      android:src="@drawable/btn_stop_0"
+      android:src="@drawable/ic_button_stop_disabled"
       style="@style/TrackWidgetButton" />
     <LinearLayout
       android:layout_weight="1"
diff --git a/MyTracks/res/layout/track_widget_4x2.xml b/MyTracks/res/layout/track_widget_4x2.xml
index 465ba3eb5..0f818b3b9 100644
--- a/MyTracks/res/layout/track_widget_4x2.xml
+++ b/MyTracks/res/layout/track_widget_4x2.xml
@@ -140,7 +140,7 @@ limitations under the License.
       <ImageButton
         android:contentDescription="@string/icon_record_track"
         android:id="@+id/track_widget_record_button"
-        android:src="@drawable/record_button"      
+        android:src="@drawable/button_record"      
         style="@style/TrackWidgetButton" />
       <TextView
         android:id="@+id/track_widget_record_status"
@@ -148,7 +148,7 @@ limitations under the License.
       <ImageButton
         android:contentDescription="@string/icon_stop_recording"
         android:id="@+id/track_widget_stop_button"
-        android:src="@drawable/btn_stop_0"
+        android:src="@drawable/ic_button_stop_disabled"
         style="@style/TrackWidgetButton" />
       <LinearLayout
         android:layout_weight="1"
diff --git a/MyTracks/res/layout/track_widget_4x3.xml b/MyTracks/res/layout/track_widget_4x3.xml
index 69f3b0a77..b9ff0f56f 100644
--- a/MyTracks/res/layout/track_widget_4x3.xml
+++ b/MyTracks/res/layout/track_widget_4x3.xml
@@ -140,7 +140,7 @@ limitations under the License.
       <ImageButton
         android:contentDescription="@string/icon_record_track"
         android:id="@+id/track_widget_record_button"
-        android:src="@drawable/record_button"      
+        android:src="@drawable/button_record"      
         style="@style/TrackWidgetButton" />
       <TextView
         android:id="@+id/track_widget_record_status"
@@ -148,7 +148,7 @@ limitations under the License.
       <ImageButton
         android:contentDescription="@string/icon_stop_recording"
         android:id="@+id/track_widget_stop_button"
-        android:src="@drawable/btn_stop_0"
+        android:src="@drawable/ic_button_stop_disabled"
         style="@style/TrackWidgetButton" />
       <LinearLayout
         android:layout_weight="1"
diff --git a/MyTracks/res/layout/track_widget_4x4.xml b/MyTracks/res/layout/track_widget_4x4.xml
index cd67d52f6..7fd00ac0e 100644
--- a/MyTracks/res/layout/track_widget_4x4.xml
+++ b/MyTracks/res/layout/track_widget_4x4.xml
@@ -144,7 +144,7 @@ limitations under the License.
       <ImageButton
         android:contentDescription="@string/icon_record_track"
         android:id="@+id/track_widget_record_button"
-        android:src="@drawable/record_button"      
+        android:src="@drawable/button_record"      
         style="@style/TrackWidgetButton" />
       <TextView
         android:id="@+id/track_widget_record_status"
@@ -152,7 +152,7 @@ limitations under the License.
       <ImageButton
         android:contentDescription="@string/icon_stop_recording"
         android:id="@+id/track_widget_stop_button"
-        android:src="@drawable/btn_stop_0"
+        android:src="@drawable/ic_button_stop_disabled"
         style="@style/TrackWidgetButton" />
       <LinearLayout
         android:layout_weight="1"
diff --git a/MyTracks/src/com/google/android/apps/mytracks/ChartView.java b/MyTracks/src/com/google/android/apps/mytracks/ChartView.java
index a3db6dae2..f3851946b 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/ChartView.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/ChartView.java
@@ -200,15 +200,15 @@ public class ChartView extends View {
     markerPaint.setColor(context.getResources().getColor(android.R.color.darker_gray));
     markerPaint.setAntiAlias(false);
 
-    pointer = context.getResources().getDrawable(R.drawable.arrow_180);
+    pointer = context.getResources().getDrawable(R.drawable.ic_arrow_180);
     pointer.setBounds(0, 0, pointer.getIntrinsicWidth(), pointer.getIntrinsicHeight());
 
-    statisticsMarker = getResources().getDrawable(R.drawable.yellow_pushpin);
+    statisticsMarker = getResources().getDrawable(R.drawable.ic_marker_yellow_pushpin);
     markerWidth = statisticsMarker.getIntrinsicWidth();
     markerHeight = statisticsMarker.getIntrinsicHeight();
     statisticsMarker.setBounds(0, 0, markerWidth, markerHeight);
 
-    waypointMarker = getResources().getDrawable(R.drawable.blue_pushpin);
+    waypointMarker = getResources().getDrawable(R.drawable.ic_marker_blue_pushpin);
     waypointMarker.setBounds(0, 0, markerWidth, markerHeight);
 
     scroller = new Scroller(context);
diff --git a/MyTracks/src/com/google/android/apps/mytracks/MapOverlay.java b/MyTracks/src/com/google/android/apps/mytracks/MapOverlay.java
index 81c134c86..3f3acb07d 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/MapOverlay.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/MapOverlay.java
@@ -252,7 +252,7 @@ public class MapOverlay {
         if (cachedLocation.valid) {
           MarkerOptions markerOptions = new MarkerOptions().position(cachedLocation.getLatLng())
               .anchor(MARKER_X_ANCHOR, MARKER_Y_ANCHOR).draggable(false).visible(true)
-              .icon(BitmapDescriptorFactory.fromResource(R.drawable.red_dot));
+              .icon(BitmapDescriptorFactory.fromResource(R.drawable.ic_marker_red_paddle));
           googleMap.addMarker(markerOptions);
           break;
         }
@@ -266,7 +266,7 @@ public class MapOverlay {
       if (cachedLocation.valid) {
         MarkerOptions markerOptions = new MarkerOptions().position(cachedLocation.getLatLng())
             .anchor(MARKER_X_ANCHOR, MARKER_Y_ANCHOR).draggable(false).visible(true)
-            .icon(BitmapDescriptorFactory.fromResource(R.drawable.green_dot));
+            .icon(BitmapDescriptorFactory.fromResource(R.drawable.ic_marker_green_paddle));
         googleMap.addMarker(markerOptions);
         hasStartMarker = true;
         break;
@@ -285,8 +285,8 @@ public class MapOverlay {
       for (Waypoint waypoint : waypoints) {
         Location location = waypoint.getLocation();
         LatLng latLng = new LatLng(location.getLatitude(), location.getLongitude());
-        int drawableId = waypoint.getType() == WaypointType.STATISTICS ? R.drawable.yellow_pushpin
-            : R.drawable.blue_pushpin;
+        int drawableId = waypoint.getType() == WaypointType.STATISTICS 
+            ? R.drawable.ic_marker_yellow_pushpin : R.drawable.ic_marker_blue_pushpin;
         MarkerOptions markerOptions = new MarkerOptions().position(latLng)
             .anchor(WAYPOINT_X_ANCHOR, WAYPOINT_Y_ANCHOR).draggable(false).visible(true)
             .icon(BitmapDescriptorFactory.fromResource(drawableId))
diff --git a/MyTracks/src/com/google/android/apps/mytracks/MarkerListActivity.java b/MyTracks/src/com/google/android/apps/mytracks/MarkerListActivity.java
index ecfc71d9d..72d9ae603 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/MarkerListActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/MarkerListActivity.java
@@ -179,7 +179,8 @@ public class MarkerListActivity extends AbstractMyTracksActivity implements Dele
 
         boolean statistics = WaypointType.values()[cursor.getInt(typeIndex)]
             == WaypointType.STATISTICS;
-        int iconId = statistics ? R.drawable.yellow_pushpin : R.drawable.blue_pushpin;
+        int iconId = statistics ? R.drawable.ic_marker_yellow_pushpin
+            : R.drawable.ic_marker_blue_pushpin;
         String category = statistics ? null : cursor.getString(categoryIndex);
         String description = statistics ? null : cursor.getString(descriptionIndex);
         ListItemUtils.setListItem(MarkerListActivity.this, view, false, true, iconId,
diff --git a/MyTracks/src/com/google/android/apps/mytracks/SearchListActivity.java b/MyTracks/src/com/google/android/apps/mytracks/SearchListActivity.java
index 9492026fc..bf42d0a26 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/SearchListActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/SearchListActivity.java
@@ -483,7 +483,8 @@ public class SearchListActivity extends AbstractSendToGoogleActivity implements
 
     resultMap.put(IS_RECORDING_FIELD, false);
     resultMap.put(IS_PAUSED_FIELD, true);
-    resultMap.put(ICON_ID_FIELD, statistics ? R.drawable.yellow_pushpin : R.drawable.blue_pushpin);
+    resultMap.put(ICON_ID_FIELD,
+        statistics ? R.drawable.ic_marker_yellow_pushpin : R.drawable.ic_marker_blue_pushpin);
     resultMap.put(ICON_CONTENT_DESCRIPTION_ID_FIELD, R.string.icon_marker);
     resultMap.put(NAME_FIELD, waypoint.getName());
     resultMap.put(CATEGORY_FIELD, statistics ? null : waypoint.getCategory());
diff --git a/MyTracks/src/com/google/android/apps/mytracks/TrackController.java b/MyTracks/src/com/google/android/apps/mytracks/TrackController.java
index 58c51cd74..e4b6116f8 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/TrackController.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/TrackController.java
@@ -101,11 +101,12 @@ public class TrackController {
     }
 
     recordImageButton.setImageResource(
-        isRecording && !isPaused ? R.drawable.pause_button : R.drawable.record_button);
+        isRecording && !isPaused ? R.drawable.button_pause : R.drawable.button_record);
     recordImageButton.setContentDescription(activity.getString(
         isRecording && !isPaused ? R.string.icon_pause_recording : R.string.icon_record_track));
 
-    stopImageButton.setImageResource(isRecording ? R.drawable.stop_1_button : R.drawable.btn_stop_0);
+    stopImageButton.setImageResource(
+        isRecording ? R.drawable.button_stop : R.drawable.ic_button_stop_disabled);
     stopImageButton.setEnabled(isRecording);
 
     statusTextView.setVisibility(isRecording ? View.VISIBLE : View.INVISIBLE);
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 f925aa9e4..9bd8ce793 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/widgets/TrackWidgetProvider.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/widgets/TrackWidgetProvider.java
@@ -433,7 +433,7 @@ public class TrackWidgetProvider extends AppWidgetProvider {
   private static void updateRecordButton(
       Context context, RemoteViews remoteViews, boolean isRecording, boolean recordingTrackPaused) {
     remoteViews.setImageViewResource(R.id.track_widget_record_button,
-        isRecording && !recordingTrackPaused ? R.drawable.pause_button : R.drawable.record_button);
+        isRecording && !recordingTrackPaused ? R.drawable.button_pause : R.drawable.button_record);
     int recordActionId;
     if (isRecording) {
       recordActionId = recordingTrackPaused ? R.string.track_action_resume
@@ -457,8 +457,8 @@ public class TrackWidgetProvider extends AppWidgetProvider {
    */
   private static void updateStopButton(
       Context context, RemoteViews remoteViews, boolean isRecording) {
-    remoteViews.setImageViewResource(
-        R.id.track_widget_stop_button, isRecording ? R.drawable.stop_1_button : R.drawable.btn_stop_0);
+    remoteViews.setImageViewResource(R.id.track_widget_stop_button,
+        isRecording ? R.drawable.button_stop : R.drawable.ic_button_stop_disabled);
     remoteViews.setBoolean(R.id.track_widget_stop_button, "setEnabled", isRecording);
     if (isRecording) {
       Intent intent = new Intent(context, ControlRecordingService.class).setAction(