diff --git a/res/drawable-finger/appwidget_pause.xml b/res/drawable-finger/appwidget_button_center.xml
similarity index 70%
copy from res/drawable-finger/appwidget_pause.xml
copy to res/drawable-finger/appwidget_button_center.xml
index bdd1c2d..194b357 100644
--- a/res/drawable-finger/appwidget_pause.xml
+++ b/res/drawable-finger/appwidget_button_center.xml
@@ -15,12 +15,14 @@
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_window_focused="false"
-        android:drawable="@drawable/appwidget_pause_normal" />
+
     <item android:state_pressed="true"
-        android:drawable="@drawable/appwidget_pause_pressed" />
-    <item android:state_focused="true"
-        android:drawable="@drawable/appwidget_pause_focused" />
+        android:drawable="@drawable/appwidget_inner_press_c" />
+
+    <item android:state_focused="true" android:state_enabled="true"
+        android:state_window_focused="true"
+        android:drawable="@drawable/appwidget_inner_focus_c" />
+
     <item
-         android:drawable="@drawable/appwidget_pause_normal" />
+         android:drawable="@android:color/transparent" />
 </selector>
diff --git a/res/drawable-finger/appwidget_pause.xml b/res/drawable-finger/appwidget_button_left.xml
similarity index 70%
copy from res/drawable-finger/appwidget_pause.xml
copy to res/drawable-finger/appwidget_button_left.xml
index bdd1c2d..cbbce86 100644
--- a/res/drawable-finger/appwidget_pause.xml
+++ b/res/drawable-finger/appwidget_button_left.xml
@@ -15,12 +15,14 @@
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_window_focused="false"
-        android:drawable="@drawable/appwidget_pause_normal" />
+
     <item android:state_pressed="true"
-        android:drawable="@drawable/appwidget_pause_pressed" />
-    <item android:state_focused="true"
-        android:drawable="@drawable/appwidget_pause_focused" />
+        android:drawable="@drawable/appwidget_inner_press_l" />
+
+    <item android:state_focused="true" android:state_enabled="true"
+        android:state_window_focused="true"
+        android:drawable="@drawable/appwidget_inner_focus_l" />
+
     <item
-         android:drawable="@drawable/appwidget_pause_normal" />
+         android:drawable="@android:color/transparent" />
 </selector>
diff --git a/res/drawable-finger/appwidget_pause.xml b/res/drawable-finger/appwidget_button_right.xml
similarity index 70%
rename from res/drawable-finger/appwidget_pause.xml
rename to res/drawable-finger/appwidget_button_right.xml
index bdd1c2d..9623f54 100644
--- a/res/drawable-finger/appwidget_pause.xml
+++ b/res/drawable-finger/appwidget_button_right.xml
@@ -15,12 +15,14 @@
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_window_focused="false"
-        android:drawable="@drawable/appwidget_pause_normal" />
+
     <item android:state_pressed="true"
-        android:drawable="@drawable/appwidget_pause_pressed" />
-    <item android:state_focused="true"
-        android:drawable="@drawable/appwidget_pause_focused" />
+        android:drawable="@drawable/appwidget_inner_press_r" />
+
+    <item android:state_focused="true" android:state_enabled="true"
+        android:state_window_focused="true"
+        android:drawable="@drawable/appwidget_inner_focus_r" />
+
     <item
-         android:drawable="@drawable/appwidget_pause_normal" />
+         android:drawable="@android:color/transparent" />
 </selector>
diff --git a/res/drawable-finger/appwidget_inner_dither.xml b/res/drawable-finger/appwidget_inner_dither.xml
deleted file mode 100644
index bcbbba2..0000000
--- a/res/drawable-finger/appwidget_inner_dither.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     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.
--->
-
-<nine-patch xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/appwidget_inner"
-    android:dither="true"
-/>
diff --git a/res/drawable-finger/appwidget_next.xml b/res/drawable-finger/appwidget_next.xml
deleted file mode 100644
index ec2b8d6..0000000
--- a/res/drawable-finger/appwidget_next.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     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:state_window_focused="false"
-        android:drawable="@drawable/appwidget_next_normal" />
-    <item android:state_pressed="true"
-        android:drawable="@drawable/appwidget_next_pressed" />
-    <item android:state_focused="true"
-        android:drawable="@drawable/appwidget_next_focused" />
-    <item
-         android:drawable="@drawable/appwidget_next_normal" />
-</selector>
diff --git a/res/drawable-finger/appwidget_play.xml b/res/drawable-finger/appwidget_play.xml
deleted file mode 100644
index 0e09d34..0000000
--- a/res/drawable-finger/appwidget_play.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     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:state_window_focused="false"
-        android:drawable="@drawable/appwidget_play_normal" />
-    <item android:state_pressed="true"
-        android:drawable="@drawable/appwidget_play_pressed" />
-    <item android:state_focused="true"
-        android:drawable="@drawable/appwidget_play_focused" />
-    <item
-         android:drawable="@drawable/appwidget_play_normal" />
-</selector>
diff --git a/res/drawable-hdpi-finger/appwidget_bg.9.png b/res/drawable-hdpi-finger/appwidget_bg.9.png
index 6861664..3b29eae 100644
--- a/res/drawable-hdpi-finger/appwidget_bg.9.png
+++ b/res/drawable-hdpi-finger/appwidget_bg.9.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/appwidget_divider.9.png b/res/drawable-hdpi-finger/appwidget_divider.9.png
new file mode 100644
index 0000000..3445e84
--- /dev/null
+++ b/res/drawable-hdpi-finger/appwidget_divider.9.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/appwidget_inner.9.png b/res/drawable-hdpi-finger/appwidget_inner.9.png
deleted file mode 100644
index 625ee46..0000000
--- a/res/drawable-hdpi-finger/appwidget_inner.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi-finger/appwidget_inner_focus_c.9.png b/res/drawable-hdpi-finger/appwidget_inner_focus_c.9.png
new file mode 100644
index 0000000..a949bd2
--- /dev/null
+++ b/res/drawable-hdpi-finger/appwidget_inner_focus_c.9.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/appwidget_inner_focus_l.9.png b/res/drawable-hdpi-finger/appwidget_inner_focus_l.9.png
new file mode 100644
index 0000000..4aaca6c
--- /dev/null
+++ b/res/drawable-hdpi-finger/appwidget_inner_focus_l.9.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/appwidget_inner_focus_r.9.png b/res/drawable-hdpi-finger/appwidget_inner_focus_r.9.png
new file mode 100644
index 0000000..1fc0f90
--- /dev/null
+++ b/res/drawable-hdpi-finger/appwidget_inner_focus_r.9.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/appwidget_inner_press_c.9.png b/res/drawable-hdpi-finger/appwidget_inner_press_c.9.png
new file mode 100644
index 0000000..ca6f16c
--- /dev/null
+++ b/res/drawable-hdpi-finger/appwidget_inner_press_c.9.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/appwidget_inner_press_l.9.png b/res/drawable-hdpi-finger/appwidget_inner_press_l.9.png
new file mode 100644
index 0000000..642eb3d
--- /dev/null
+++ b/res/drawable-hdpi-finger/appwidget_inner_press_l.9.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/appwidget_inner_press_r.9.png b/res/drawable-hdpi-finger/appwidget_inner_press_r.9.png
new file mode 100644
index 0000000..5e1f70a
--- /dev/null
+++ b/res/drawable-hdpi-finger/appwidget_inner_press_r.9.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/appwidget_next_focused.png b/res/drawable-hdpi-finger/appwidget_next_focused.png
deleted file mode 100644
index cc9d9df..0000000
--- a/res/drawable-hdpi-finger/appwidget_next_focused.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi-finger/appwidget_next_normal.png b/res/drawable-hdpi-finger/appwidget_next_normal.png
deleted file mode 100644
index 658f4f2..0000000
--- a/res/drawable-hdpi-finger/appwidget_next_normal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi-finger/appwidget_next_pressed.png b/res/drawable-hdpi-finger/appwidget_next_pressed.png
deleted file mode 100644
index 4110ac3..0000000
--- a/res/drawable-hdpi-finger/appwidget_next_pressed.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi-finger/appwidget_pause_focused.png b/res/drawable-hdpi-finger/appwidget_pause_focused.png
deleted file mode 100644
index 4fb8cb6..0000000
--- a/res/drawable-hdpi-finger/appwidget_pause_focused.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi-finger/appwidget_pause_normal.png b/res/drawable-hdpi-finger/appwidget_pause_normal.png
deleted file mode 100644
index 610aa3b..0000000
--- a/res/drawable-hdpi-finger/appwidget_pause_normal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi-finger/appwidget_pause_pressed.png b/res/drawable-hdpi-finger/appwidget_pause_pressed.png
deleted file mode 100644
index 7e1d55a..0000000
--- a/res/drawable-hdpi-finger/appwidget_pause_pressed.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi-finger/appwidget_play_focused.png b/res/drawable-hdpi-finger/appwidget_play_focused.png
deleted file mode 100644
index 79c6b61..0000000
--- a/res/drawable-hdpi-finger/appwidget_play_focused.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi-finger/appwidget_play_normal.png b/res/drawable-hdpi-finger/appwidget_play_normal.png
deleted file mode 100644
index 75622b8..0000000
--- a/res/drawable-hdpi-finger/appwidget_play_normal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi-finger/appwidget_play_pressed.png b/res/drawable-hdpi-finger/appwidget_play_pressed.png
deleted file mode 100644
index 1a8d227..0000000
--- a/res/drawable-hdpi-finger/appwidget_play_pressed.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi-finger/ic_appwidget_music_next.png b/res/drawable-hdpi-finger/ic_appwidget_music_next.png
new file mode 100644
index 0000000..99d2876
--- /dev/null
+++ b/res/drawable-hdpi-finger/ic_appwidget_music_next.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/ic_appwidget_music_pause.png b/res/drawable-hdpi-finger/ic_appwidget_music_pause.png
new file mode 100644
index 0000000..a05a8c5
--- /dev/null
+++ b/res/drawable-hdpi-finger/ic_appwidget_music_pause.png
Binary files differ
diff --git a/res/drawable-hdpi-finger/ic_appwidget_music_play.png b/res/drawable-hdpi-finger/ic_appwidget_music_play.png
new file mode 100644
index 0000000..a754b92
--- /dev/null
+++ b/res/drawable-hdpi-finger/ic_appwidget_music_play.png
Binary files differ
diff --git a/res/drawable-mdpi-finger/appwidget_bg.9.png b/res/drawable-mdpi-finger/appwidget_bg.9.png
index 8e7e3d7..afe41b6 100644
--- a/res/drawable-mdpi-finger/appwidget_bg.9.png
+++ b/res/drawable-mdpi-finger/appwidget_bg.9.png
Binary files differ
diff --git a/res/drawable-mdpi-finger/appwidget_divider.9.png b/res/drawable-mdpi-finger/appwidget_divider.9.png
new file mode 100644
index 0000000..3445e84
--- /dev/null
+++ b/res/drawable-mdpi-finger/appwidget_divider.9.png
Binary files differ
diff --git a/res/drawable-mdpi-finger/appwidget_inner.9.png b/res/drawable-mdpi-finger/appwidget_inner.9.png
deleted file mode 100644
index de628a2..0000000
--- a/res/drawable-mdpi-finger/appwidget_inner.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi-finger/appwidget_inner_focus_c.9.png b/res/drawable-mdpi-finger/appwidget_inner_focus_c.9.png
new file mode 100644
index 0000000..1450e65
--- /dev/null
+++ b/res/drawable-mdpi-finger/appwidget_inner_focus_c.9.png
Binary files differ
diff --git a/res/drawable-mdpi-finger/appwidget_inner_focus_l.9.png b/res/drawable-mdpi-finger/appwidget_inner_focus_l.9.png
new file mode 100644
index 0000000..6e8f100
--- /dev/null
+++ b/res/drawable-mdpi-finger/appwidget_inner_focus_l.9.png
Binary files differ
diff --git a/res/drawable-mdpi-finger/appwidget_inner_focus_r.9.png b/res/drawable-mdpi-finger/appwidget_inner_focus_r.9.png
new file mode 100644
index 0000000..bc8757b
--- /dev/null
+++ b/res/drawable-mdpi-finger/appwidget_inner_focus_r.9.png
Binary files differ
diff --git a/res/drawable-mdpi-finger/appwidget_inner_press_c.9.png b/res/drawable-mdpi-finger/appwidget_inner_press_c.9.png
new file mode 100644
index 0000000..bd542ba
--- /dev/null
+++ b/res/drawable-mdpi-finger/appwidget_inner_press_c.9.png
Binary files differ
diff --git a/res/drawable-mdpi-finger/appwidget_inner_press_l.9.png b/res/drawable-mdpi-finger/appwidget_inner_press_l.9.png
new file mode 100644
index 0000000..575ecf4
--- /dev/null
+++ b/res/drawable-mdpi-finger/appwidget_inner_press_l.9.png
Binary files differ
diff --git a/res/drawable-mdpi-finger/appwidget_inner_press_r.9.png b/res/drawable-mdpi-finger/appwidget_inner_press_r.9.png
new file mode 100644
index 0000000..79eaea3
--- /dev/null
+++ b/res/drawable-mdpi-finger/appwidget_inner_press_r.9.png
Binary files differ
diff --git a/res/drawable-mdpi-finger/appwidget_next_focused.png b/res/drawable-mdpi-finger/appwidget_next_focused.png
deleted file mode 100644
index fc80cf2..0000000
--- a/res/drawable-mdpi-finger/appwidget_next_focused.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi-finger/appwidget_next_normal.png b/res/drawable-mdpi-finger/appwidget_next_normal.png
deleted file mode 100644
index 01e350b..0000000
--- a/res/drawable-mdpi-finger/appwidget_next_normal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi-finger/appwidget_next_pressed.png b/res/drawable-mdpi-finger/appwidget_next_pressed.png
deleted file mode 100644
index b4cfc37..0000000
--- a/res/drawable-mdpi-finger/appwidget_next_pressed.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi-finger/appwidget_pause_focused.png b/res/drawable-mdpi-finger/appwidget_pause_focused.png
deleted file mode 100644
index dc8cdf3..0000000
--- a/res/drawable-mdpi-finger/appwidget_pause_focused.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi-finger/appwidget_pause_normal.png b/res/drawable-mdpi-finger/appwidget_pause_normal.png
deleted file mode 100644
index 7ac0f75..0000000
--- a/res/drawable-mdpi-finger/appwidget_pause_normal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi-finger/appwidget_pause_pressed.png b/res/drawable-mdpi-finger/appwidget_pause_pressed.png
deleted file mode 100644
index 56df573..0000000
--- a/res/drawable-mdpi-finger/appwidget_pause_pressed.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi-finger/appwidget_play_focused.png b/res/drawable-mdpi-finger/appwidget_play_focused.png
deleted file mode 100644
index 9f85b29..0000000
--- a/res/drawable-mdpi-finger/appwidget_play_focused.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi-finger/appwidget_play_normal.png b/res/drawable-mdpi-finger/appwidget_play_normal.png
deleted file mode 100644
index 3a6ffb7..0000000
--- a/res/drawable-mdpi-finger/appwidget_play_normal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi-finger/appwidget_play_pressed.png b/res/drawable-mdpi-finger/appwidget_play_pressed.png
deleted file mode 100644
index f14055a..0000000
--- a/res/drawable-mdpi-finger/appwidget_play_pressed.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi-finger/ic_appwidget_music_next.png b/res/drawable-mdpi-finger/ic_appwidget_music_next.png
new file mode 100644
index 0000000..abc8e47
--- /dev/null
+++ b/res/drawable-mdpi-finger/ic_appwidget_music_next.png
Binary files differ
diff --git a/res/drawable-mdpi-finger/ic_appwidget_music_pause.png b/res/drawable-mdpi-finger/ic_appwidget_music_pause.png
new file mode 100644
index 0000000..25a2d38
--- /dev/null
+++ b/res/drawable-mdpi-finger/ic_appwidget_music_pause.png
Binary files differ
diff --git a/res/drawable-mdpi-finger/ic_appwidget_music_play.png b/res/drawable-mdpi-finger/ic_appwidget_music_play.png
new file mode 100644
index 0000000..52b8e45
--- /dev/null
+++ b/res/drawable-mdpi-finger/ic_appwidget_music_play.png
Binary files differ
diff --git a/res/layout-finger/album_appwidget.xml b/res/layout-finger/album_appwidget.xml
index f1d1eba..adbbeb4 100644
--- a/res/layout-finger/album_appwidget.xml
+++ b/res/layout-finger/album_appwidget.xml
@@ -14,54 +14,36 @@
      limitations under the License.
 -->
 
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="@dimen/appwidget_width"
-    android:layout_height="@dimen/appwidget_height"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="horizontal"
     android:background="@drawable/appwidget_bg">
 
-    <ImageButton
-        android:id="@+id/control_play"
-        android:layout_width="48dip"
-        android:layout_height="fill_parent"
-        android:layout_marginLeft="2dip"
-        android:src="@drawable/appwidget_play"
-        android:background="@android:color/transparent"
-        android:scaleType="center"
-        />
-
-    <ImageButton
-        android:id="@+id/control_next"
-        android:layout_width="35dip"
-        android:layout_height="fill_parent"
-        android:layout_alignParentRight="true"
-        android:src="@drawable/appwidget_next"
-        android:background="@android:color/transparent"
-        android:scaleType="center"
-        />
-
-    <LinearLayout
+   <LinearLayout
         android:id="@+id/album_appwidget"
-        android:layout_width="fill_parent"
+        android:layout_width="0dip"
+        android:layout_weight="3"
         android:layout_height="fill_parent"
-        android:layout_toRightOf="@id/control_play"
-        android:layout_toLeftOf="@id/control_next"
-        android:background="@drawable/appwidget_inner_dither"
         android:orientation="vertical"
         android:gravity="center_vertical"
+        android:clickable="true"
+        android:focusable="true"
+	    android:background="@drawable/appwidget_button_left"
+        android:paddingLeft="18dip"
+        android:paddingRight="8dip"
         >
 
         <TextView
             android:id="@+id/title"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="10dip"
-            android:layout_marginRight="20dip"
             android:textColor="@color/appwidget_text"
             android:textStyle="bold"
             android:textSize="18sp"
             android:singleLine="true"
             android:fadingEdge="horizontal"
-            android:fadingEdgeLength="20dip"
+            android:fadingEdgeLength="10dip"
             android:ellipsize="none"
             />
 
@@ -69,16 +51,46 @@
             android:id="@+id/artist"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="10dip"
-            android:layout_marginRight="20dip"
             android:textColor="@color/appwidget_text"
             android:textSize="14sp"
             android:singleLine="true"
             android:fadingEdge="horizontal"
-            android:fadingEdgeLength="20dip"
+            android:fadingEdgeLength="10dip"
             android:ellipsize="none"
             />
-
     </LinearLayout>
+    
+ 	<ImageView
+        android:layout_width="1dip"
+        android:layout_height="fill_parent"
+        android:background="@drawable/appwidget_divider"
+        />
+        
+    <ImageButton
+        android:id="@+id/control_play"
+        android:layout_width="0dip"
+        android:layout_weight="1"
+        android:layout_height="fill_parent"
+        android:layout_marginLeft="2dip"
+        android:src="@drawable/ic_appwidget_music_play"
+        android:background="@drawable/appwidget_button_center"
+        android:scaleType="center"
+        />
 
-</RelativeLayout>
+ 	<ImageView
+        android:layout_width="1dip"
+        android:layout_height="fill_parent"
+        android:background="@drawable/appwidget_divider"
+        />
+        
+    <ImageButton
+        android:id="@+id/control_next"
+        android:layout_width="0dip"
+        android:layout_weight="1"
+        android:layout_height="fill_parent"
+        android:src="@drawable/ic_appwidget_music_next"
+        android:background="@drawable/appwidget_button_right"
+        android:scaleType="center"
+        />
+
+</LinearLayout>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 07a5839..0a20c8b 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -15,6 +15,6 @@
 -->
 
 <resources>
-    <color name="appwidget_text">#ff000000</color>
+    <color name="appwidget_text">#ffffffff</color>
 </resources>
 
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index c1c15b3..a2d1f10 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -19,7 +19,4 @@
     <dimen name="normal_height">64dip</dimen>
     <!-- height of an expanded list item in edit playlist mode -->
     <dimen name="expanded_height">128dip</dimen>
-
-    <dimen name="appwidget_width">311dip</dimen>
-    <dimen name="appwidget_height">80dip</dimen>
 </resources>
diff --git a/src/com/android/music/MediaAppWidgetProvider.java b/src/com/android/music/MediaAppWidgetProvider.java
index 1c39466..8347164 100644
--- a/src/com/android/music/MediaAppWidgetProvider.java
+++ b/src/com/android/music/MediaAppWidgetProvider.java
@@ -147,9 +147,9 @@
         // Set correct drawable for pause state
         final boolean playing = service.isPlaying();
         if (playing) {
-            views.setImageViewResource(R.id.control_play, R.drawable.appwidget_pause);
+            views.setImageViewResource(R.id.control_play, R.drawable.ic_appwidget_music_pause);
         } else {
-            views.setImageViewResource(R.id.control_play, R.drawable.appwidget_play);
+            views.setImageViewResource(R.id.control_play, R.drawable.ic_appwidget_music_play);
         }
 
         // Link actions buttons to intents