diff --git a/MyTracks/res/drawable-hdpi/arrow_180.png b/MyTracks/res/drawable-hdpi/arrow_180.png
new file mode 100644
index 000000000..5e84e0edc
Binary files /dev/null and b/MyTracks/res/drawable-hdpi/arrow_180.png differ
diff --git a/MyTracks/res/drawable-hdpi/arrow_320.png b/MyTracks/res/drawable-hdpi/arrow_320.png
new file mode 100644
index 000000000..f0d4ab7a6
Binary files /dev/null and b/MyTracks/res/drawable-hdpi/arrow_320.png differ
diff --git a/MyTracks/res/drawable-hdpi/btn_pause.png b/MyTracks/res/drawable-hdpi/btn_pause.png
index 8365aa5c2..216d249c6 100644
Binary files a/MyTracks/res/drawable-hdpi/btn_pause.png and b/MyTracks/res/drawable-hdpi/btn_pause.png differ
diff --git a/MyTracks/res/drawable-hdpi/btn_pause_pressed.png b/MyTracks/res/drawable-hdpi/btn_pause_pressed.png
new file mode 100644
index 000000000..11d43e8cc
Binary files /dev/null and b/MyTracks/res/drawable-hdpi/btn_pause_pressed.png differ
diff --git a/MyTracks/res/drawable-hdpi/btn_record.png b/MyTracks/res/drawable-hdpi/btn_record.png
index 7be3ce522..e9bc0ff7f 100644
Binary files a/MyTracks/res/drawable-hdpi/btn_record.png and b/MyTracks/res/drawable-hdpi/btn_record.png differ
diff --git a/MyTracks/res/drawable-hdpi/btn_record_pressed.png b/MyTracks/res/drawable-hdpi/btn_record_pressed.png
new file mode 100644
index 000000000..4f609372e
Binary files /dev/null and b/MyTracks/res/drawable-hdpi/btn_record_pressed.png differ
diff --git a/MyTracks/res/drawable-hdpi/btn_stop_0.png b/MyTracks/res/drawable-hdpi/btn_stop_0.png
index 63f72104a..1ca14f2fa 100644
Binary files a/MyTracks/res/drawable-hdpi/btn_stop_0.png and b/MyTracks/res/drawable-hdpi/btn_stop_0.png differ
diff --git a/MyTracks/res/drawable-hdpi/btn_stop_1.png b/MyTracks/res/drawable-hdpi/btn_stop_1.png
index fc0c73cac..d12538505 100644
Binary files a/MyTracks/res/drawable-hdpi/btn_stop_1.png and b/MyTracks/res/drawable-hdpi/btn_stop_1.png differ
diff --git a/MyTracks/res/drawable-hdpi/btn_stop_1_pressed.png b/MyTracks/res/drawable-hdpi/btn_stop_1_pressed.png
new file mode 100644
index 000000000..da1ad5f4d
Binary files /dev/null and b/MyTracks/res/drawable-hdpi/btn_stop_1_pressed.png differ
diff --git a/MyTracks/res/drawable-hdpi/menu_map_layer.png b/MyTracks/res/drawable-hdpi/menu_map_layer.png
old mode 100755
new mode 100644
index 578b28301..5a6b26019
Binary files a/MyTracks/res/drawable-hdpi/menu_map_layer.png and b/MyTracks/res/drawable-hdpi/menu_map_layer.png differ
diff --git a/MyTracks/res/drawable-hdpi/menu_markers.png b/MyTracks/res/drawable-hdpi/menu_markers.png
index e45ea1fd9..dcc8a5cac 100644
Binary files a/MyTracks/res/drawable-hdpi/menu_markers.png and b/MyTracks/res/drawable-hdpi/menu_markers.png differ
diff --git a/MyTracks/res/drawable-mdpi/btn_pause.png b/MyTracks/res/drawable-mdpi/btn_pause.png
index d64ae8f73..07bfa05f2 100644
Binary files a/MyTracks/res/drawable-mdpi/btn_pause.png and b/MyTracks/res/drawable-mdpi/btn_pause.png differ
diff --git a/MyTracks/res/drawable-mdpi/btn_pause_pressed.png b/MyTracks/res/drawable-mdpi/btn_pause_pressed.png
new file mode 100644
index 000000000..7cc7101f4
Binary files /dev/null and b/MyTracks/res/drawable-mdpi/btn_pause_pressed.png differ
diff --git a/MyTracks/res/drawable-mdpi/btn_record.png b/MyTracks/res/drawable-mdpi/btn_record.png
index 93f04a80f..3fc61dd2f 100644
Binary files a/MyTracks/res/drawable-mdpi/btn_record.png and b/MyTracks/res/drawable-mdpi/btn_record.png differ
diff --git a/MyTracks/res/drawable-mdpi/btn_record_pressed.png b/MyTracks/res/drawable-mdpi/btn_record_pressed.png
new file mode 100644
index 000000000..e18d15e84
Binary files /dev/null and b/MyTracks/res/drawable-mdpi/btn_record_pressed.png differ
diff --git a/MyTracks/res/drawable-mdpi/btn_stop_1.png b/MyTracks/res/drawable-mdpi/btn_stop_1.png
index 6fa3be4de..d277a9f88 100644
Binary files a/MyTracks/res/drawable-mdpi/btn_stop_1.png and b/MyTracks/res/drawable-mdpi/btn_stop_1.png differ
diff --git a/MyTracks/res/drawable-mdpi/btn_stop_1_pressed.png b/MyTracks/res/drawable-mdpi/btn_stop_1_pressed.png
new file mode 100644
index 000000000..020c068e4
Binary files /dev/null and b/MyTracks/res/drawable-mdpi/btn_stop_1_pressed.png differ
diff --git a/MyTracks/res/drawable-mdpi/menu_map_layer.png b/MyTracks/res/drawable-mdpi/menu_map_layer.png
index 27acb1b80..611020d7e 100644
Binary files a/MyTracks/res/drawable-mdpi/menu_map_layer.png and b/MyTracks/res/drawable-mdpi/menu_map_layer.png differ
diff --git a/MyTracks/res/drawable-mdpi/menu_markers.png b/MyTracks/res/drawable-mdpi/menu_markers.png
index 9c748b0b5..fd9b70589 100644
Binary files a/MyTracks/res/drawable-mdpi/menu_markers.png and b/MyTracks/res/drawable-mdpi/menu_markers.png differ
diff --git a/MyTracks/res/drawable-xhdpi/arrow_180.png b/MyTracks/res/drawable-xhdpi/arrow_180.png
new file mode 100644
index 000000000..ff7fe7848
Binary files /dev/null and b/MyTracks/res/drawable-xhdpi/arrow_180.png differ
diff --git a/MyTracks/res/drawable-xhdpi/arrow_320.png b/MyTracks/res/drawable-xhdpi/arrow_320.png
new file mode 100644
index 000000000..31959ed0a
Binary files /dev/null and b/MyTracks/res/drawable-xhdpi/arrow_320.png differ
diff --git a/MyTracks/res/drawable-xhdpi/blue_pushpin.png b/MyTracks/res/drawable-xhdpi/blue_pushpin.png
new file mode 100644
index 000000000..fc77ea077
Binary files /dev/null and b/MyTracks/res/drawable-xhdpi/blue_pushpin.png differ
diff --git a/MyTracks/res/drawable-xhdpi/btn_pause.png b/MyTracks/res/drawable-xhdpi/btn_pause.png
index 6d4144917..5b98259df 100644
Binary files a/MyTracks/res/drawable-xhdpi/btn_pause.png and b/MyTracks/res/drawable-xhdpi/btn_pause.png differ
diff --git a/MyTracks/res/drawable-xhdpi/btn_pause_pressed.png b/MyTracks/res/drawable-xhdpi/btn_pause_pressed.png
new file mode 100644
index 000000000..aa77a3e9f
Binary files /dev/null and b/MyTracks/res/drawable-xhdpi/btn_pause_pressed.png differ
diff --git a/MyTracks/res/drawable-xhdpi/btn_record.png b/MyTracks/res/drawable-xhdpi/btn_record.png
index 703a48a48..d36e9bb1c 100644
Binary files a/MyTracks/res/drawable-xhdpi/btn_record.png and b/MyTracks/res/drawable-xhdpi/btn_record.png differ
diff --git a/MyTracks/res/drawable-xhdpi/btn_record_pressed.png b/MyTracks/res/drawable-xhdpi/btn_record_pressed.png
new file mode 100644
index 000000000..7adabdbf7
Binary files /dev/null and b/MyTracks/res/drawable-xhdpi/btn_record_pressed.png differ
diff --git a/MyTracks/res/drawable-xhdpi/btn_stop_0.png b/MyTracks/res/drawable-xhdpi/btn_stop_0.png
index ecb625b8f..0bad7818f 100644
Binary files a/MyTracks/res/drawable-xhdpi/btn_stop_0.png and b/MyTracks/res/drawable-xhdpi/btn_stop_0.png differ
diff --git a/MyTracks/res/drawable-xhdpi/btn_stop_1.png b/MyTracks/res/drawable-xhdpi/btn_stop_1.png
index 1f37569d2..5dcd4b0b2 100644
Binary files a/MyTracks/res/drawable-xhdpi/btn_stop_1.png and b/MyTracks/res/drawable-xhdpi/btn_stop_1.png differ
diff --git a/MyTracks/res/drawable-xhdpi/btn_stop_1_pressed.png b/MyTracks/res/drawable-xhdpi/btn_stop_1_pressed.png
new file mode 100644
index 000000000..89eaa0630
Binary files /dev/null and b/MyTracks/res/drawable-xhdpi/btn_stop_1_pressed.png differ
diff --git a/MyTracks/res/drawable-xhdpi/menu_map_layer.png b/MyTracks/res/drawable-xhdpi/menu_map_layer.png
index 338eed0a3..fd70d7406 100644
Binary files a/MyTracks/res/drawable-xhdpi/menu_map_layer.png and b/MyTracks/res/drawable-xhdpi/menu_map_layer.png differ
diff --git a/MyTracks/res/drawable-xhdpi/menu_markers.png b/MyTracks/res/drawable-xhdpi/menu_markers.png
index 95708234a..e31d524e8 100644
Binary files a/MyTracks/res/drawable-xhdpi/menu_markers.png and b/MyTracks/res/drawable-xhdpi/menu_markers.png differ
diff --git a/MyTracks/res/drawable-xhdpi/track_paused.png b/MyTracks/res/drawable-xhdpi/track_paused.png
new file mode 100644
index 000000000..64a2a8442
Binary files /dev/null and b/MyTracks/res/drawable-xhdpi/track_paused.png differ
diff --git a/MyTracks/res/drawable-xhdpi/track_recording.png b/MyTracks/res/drawable-xhdpi/track_recording.png
new file mode 100644
index 000000000..3a0f0dbc2
Binary files /dev/null and b/MyTracks/res/drawable-xhdpi/track_recording.png differ
diff --git a/MyTracks/res/drawable-xhdpi/warning.png b/MyTracks/res/drawable-xhdpi/warning.png
new file mode 100644
index 000000000..dca7c00dd
Binary files /dev/null and b/MyTracks/res/drawable-xhdpi/warning.png differ
diff --git a/MyTracks/res/drawable-xhdpi/yellow_pushpin.png b/MyTracks/res/drawable-xhdpi/yellow_pushpin.png
new file mode 100644
index 000000000..539b90bda
Binary files /dev/null and b/MyTracks/res/drawable-xhdpi/yellow_pushpin.png differ
diff --git a/MyTracks/res/drawable/pause_button.xml b/MyTracks/res/drawable/pause_button.xml
new file mode 100644
index 000000000..214a16bc9
--- /dev/null
+++ b/MyTracks/res/drawable/pause_button.xml
@@ -0,0 +1,20 @@
+<?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.
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:drawable="@drawable/btn_pause" android:state_pressed="true"/>
+  <item android:drawable="@drawable/btn_pause_pressed"/>
+</selector>
\ No newline at end of file
diff --git a/MyTracks/res/drawable/record_button.xml b/MyTracks/res/drawable/record_button.xml
new file mode 100644
index 000000000..02bc8a83c
--- /dev/null
+++ b/MyTracks/res/drawable/record_button.xml
@@ -0,0 +1,20 @@
+<?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.
+-->
+<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"/>
+</selector>
\ No newline at end of file
diff --git a/MyTracks/res/drawable/stop_1_button.xml b/MyTracks/res/drawable/stop_1_button.xml
new file mode 100644
index 000000000..acbd5107d
--- /dev/null
+++ b/MyTracks/res/drawable/stop_1_button.xml
@@ -0,0 +1,20 @@
+<?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.
+-->
+<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"/>
+</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 7b82a8bcd..13b94ed21 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_1" />
+      android:src="@drawable/stop_1_button" />
     <View
       android:layout_height="0dp"
       android:layout_weight="1"
diff --git a/MyTracks/res/layout/track_controller.xml b/MyTracks/res/layout/track_controller.xml
index 5a50f4da8..3197c6a12 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_1" />
+      android:src="@drawable/stop_1_button" />
     <View
       android:layout_height="match_parent"
       android:layout_weight="1"
diff --git a/MyTracks/res/values/styles.xml b/MyTracks/res/values/styles.xml
index b7db3fec6..da22d1d7f 100644
--- a/MyTracks/res/values/styles.xml
+++ b/MyTracks/res/values/styles.xml
@@ -270,7 +270,7 @@ limitations under the License.
   <style name="TrackWidgetButtonRecord" parent="@style/TrackWidgetButton">
     <item name="android:layout_height">63dp</item>
     <item name="android:layout_width">75dp</item>
-    <item name="android:src">@drawable/btn_record</item>
+    <item name="android:src">@drawable/record_button</item>
   </style>
   <!-- track widget button stop -->
   <style name="TrackWidgetButtonStop" parent="@style/TrackWidgetButton">
diff --git a/MyTracks/src/com/google/android/apps/mytracks/TrackController.java b/MyTracks/src/com/google/android/apps/mytracks/TrackController.java
index 492c3ee03..58c51cd74 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/TrackController.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/TrackController.java
@@ -101,11 +101,11 @@ public class TrackController {
     }
 
     recordImageButton.setImageResource(
-        isRecording && !isPaused ? R.drawable.btn_pause : R.drawable.btn_record);
+        isRecording && !isPaused ? R.drawable.pause_button : R.drawable.record_button);
     recordImageButton.setContentDescription(activity.getString(
         isRecording && !isPaused ? R.string.icon_pause_recording : R.string.icon_record_track));
 
-    stopImageButton.setImageResource(isRecording ? R.drawable.btn_stop_1 : R.drawable.btn_stop_0);
+    stopImageButton.setImageResource(isRecording ? R.drawable.stop_1_button : R.drawable.btn_stop_0);
     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 6180aaa90..f925aa9e4 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.btn_pause : R.drawable.btn_record);
+        isRecording && !recordingTrackPaused ? R.drawable.pause_button : R.drawable.record_button);
     int recordActionId;
     if (isRecording) {
       recordActionId = recordingTrackPaused ? R.string.track_action_resume
@@ -458,7 +458,7 @@ 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.btn_stop_1 : R.drawable.btn_stop_0);
+        R.id.track_widget_stop_button, isRecording ? R.drawable.stop_1_button : R.drawable.btn_stop_0);
     remoteViews.setBoolean(R.id.track_widget_stop_button, "setEnabled", isRecording);
     if (isRecording) {
       Intent intent = new Intent(context, ControlRecordingService.class).setAction(