diff --git a/MyTracks/res/drawable/pause_button.xml b/MyTracks/res/drawable/pause_button.xml
index 214a16bc9..ac9db77de 100644
--- a/MyTracks/res/drawable/pause_button.xml
+++ b/MyTracks/res/drawable/pause_button.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" android:state_pressed="true"/>
-  <item android:drawable="@drawable/btn_pause_pressed"/>
+  <item android:drawable="@drawable/btn_pause_pressed" android:state_pressed="true"/>
+  <item android:drawable="@drawable/btn_pause"/>
 </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 13b94ed21..8891c9801 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/stop_1_button" />
+      android:src="@drawable/btn_stop_0" />
     <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 3197c6a12..72a01b586 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/stop_1_button" />
+      android:src="@drawable/btn_stop_0" />
     <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 046e633fb..844861aff 100644
--- a/MyTracks/res/layout/track_widget_4x1.xml
+++ b/MyTracks/res/layout/track_widget_4x1.xml
@@ -27,7 +27,8 @@ limitations under the License.
     <ImageButton
       android:contentDescription="@string/icon_record_track"
       android:id="@+id/track_widget_record_button"
-      style="@style/TrackWidgetButtonRecord" />
+      android:src="@drawable/record_button"      
+      style="@style/TrackWidgetButton" />
     <LinearLayout
       android:id="@+id/track_widget_stats_container"
       android:layout_height="match_parent"
@@ -91,7 +92,8 @@ limitations under the License.
     <ImageButton
       android:contentDescription="@string/icon_stop_recording"
       android:id="@+id/track_widget_stop_button"
-      style="@style/TrackWidgetButtonStop" />
+      android:src="@drawable/btn_stop_0"
+      style="@style/TrackWidgetButton" />
     <LinearLayout
       android:layout_weight="1"
       style="@style/TrackWidgetVerticalSpacer" />
diff --git a/MyTracks/res/layout/track_widget_4x2.xml b/MyTracks/res/layout/track_widget_4x2.xml
index a01f492cb..24cc8657a 100644
--- a/MyTracks/res/layout/track_widget_4x2.xml
+++ b/MyTracks/res/layout/track_widget_4x2.xml
@@ -140,7 +140,8 @@ limitations under the License.
       <ImageButton
         android:contentDescription="@string/icon_record_track"
         android:id="@+id/track_widget_record_button"
-        style="@style/TrackWidgetButtonRecord" />
+        android:src="@drawable/record_button"      
+        style="@style/TrackWidgetButton" />
       <TextView
         android:id="@+id/track_widget_record_status"
         android:layout_gravity="center_vertical"
@@ -152,7 +153,8 @@ limitations under the License.
       <ImageButton
         android:contentDescription="@string/icon_stop_recording"
         android:id="@+id/track_widget_stop_button"
-        style="@style/TrackWidgetButtonStop" />
+        android:src="@drawable/btn_stop_0"
+        style="@style/TrackWidgetButton" />
       <LinearLayout
         android:layout_weight="1"
         style="@style/TrackWidgetVerticalSpacer" />
diff --git a/MyTracks/res/layout/track_widget_4x3.xml b/MyTracks/res/layout/track_widget_4x3.xml
index 61e650047..7f846bb99 100644
--- a/MyTracks/res/layout/track_widget_4x3.xml
+++ b/MyTracks/res/layout/track_widget_4x3.xml
@@ -140,7 +140,8 @@ limitations under the License.
       <ImageButton
         android:contentDescription="@string/icon_record_track"
         android:id="@+id/track_widget_record_button"
-        style="@style/TrackWidgetButtonRecord" />
+        android:src="@drawable/record_button"      
+        style="@style/TrackWidgetButton" />
       <TextView
         android:id="@+id/track_widget_record_status"
         android:layout_gravity="center_vertical"
@@ -152,7 +153,8 @@ limitations under the License.
       <ImageButton
         android:contentDescription="@string/icon_stop_recording"
         android:id="@+id/track_widget_stop_button"
-        style="@style/TrackWidgetButtonStop" />
+        android:src="@drawable/btn_stop_0"
+        style="@style/TrackWidgetButton" />
       <LinearLayout
         android:layout_weight="1"
         style="@style/TrackWidgetVerticalSpacer" />
diff --git a/MyTracks/res/layout/track_widget_4x4.xml b/MyTracks/res/layout/track_widget_4x4.xml
index 8e1840428..78c147aaf 100644
--- a/MyTracks/res/layout/track_widget_4x4.xml
+++ b/MyTracks/res/layout/track_widget_4x4.xml
@@ -144,7 +144,8 @@ limitations under the License.
       <ImageButton
         android:contentDescription="@string/icon_record_track"
         android:id="@+id/track_widget_record_button"
-        style="@style/TrackWidgetButtonRecord" />
+        android:src="@drawable/record_button"      
+        style="@style/TrackWidgetButton" />
       <TextView
         android:id="@+id/track_widget_record_status"
         android:layout_gravity="center_vertical"
@@ -156,7 +157,8 @@ limitations under the License.
       <ImageButton
         android:contentDescription="@string/icon_stop_recording"
         android:id="@+id/track_widget_stop_button"
-        style="@style/TrackWidgetButtonStop" />
+        android:src="@drawable/btn_stop_0"
+        style="@style/TrackWidgetButton" />
       <LinearLayout
         android:layout_weight="1"
         style="@style/TrackWidgetVerticalSpacer" />
diff --git a/MyTracks/res/values/styles.xml b/MyTracks/res/values/styles.xml
index da22d1d7f..cd51a008f 100644
--- a/MyTracks/res/values/styles.xml
+++ b/MyTracks/res/values/styles.xml
@@ -254,6 +254,8 @@ limitations under the License.
   <style name="TrackWidgetButton">
     <item name="android:background">@android:color/transparent</item>
     <item name="android:layout_gravity">center_vertical</item>
+    <item name="android:layout_height">63dp</item>
+    <item name="android:layout_width">63dp</item>
     <item name="android:scaleType">fitXY</item>
   </style>
   <!-- track widget button container -->
@@ -266,18 +268,6 @@ limitations under the License.
     <item name="android:paddingBottom">4dp</item>
     <item name="android:paddingTop">4dp</item>
   </style>
-  <!-- track widget button record -->
-  <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/record_button</item>
-  </style>
-  <!-- track widget button stop -->
-  <style name="TrackWidgetButtonStop" parent="@style/TrackWidgetButton">
-    <item name="android:layout_height">63dp</item>
-    <item name="android:layout_width">63dp</item>
-    <item name="android:src">@drawable/btn_stop_0</item>
-  </style>
   <!-- track widget config spiner -->
   <style name="TrackWidgetConfigSpinner">
     <item name="android:layout_gravity">center_horizontal</item>