diff --git a/res/btn_check.xml b/res/btn_check.xml
index c38e9325..172c177c 100644
--- a/res/btn_check.xml
+++ b/res/btn_check.xml
@@ -17,6 +17,13 @@
           android:state_enabled="true"
           android:drawable="@drawable/btn_check_off_focused" />
 
+    <item android:state_checked="true" android:state_hovered="true"
+          android:state_enabled="true"
+          android:drawable="@drawable/btn_check_on_focused" />
+    <item android:state_checked="false" android:state_hovered="true"
+          android:state_enabled="true"
+          android:drawable="@drawable/btn_check_off_focused" />
+
     <item android:state_checked="false"
           android:state_enabled="true"
           android:drawable="@drawable/btn_check_off" />
diff --git a/res/btn_radio.xml b/res/btn_radio.xml
index e2f1f84c..4b0b6e01 100644
--- a/res/btn_radio.xml
+++ b/res/btn_radio.xml
@@ -1,59 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 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_checked="true" android:state_window_focused="false"
-          android:state_enabled="true"
-          android:drawable="@drawable/btn_radio_on_holo_light" />
-    <item android:state_checked="false" android:state_window_focused="false"
-          android:state_enabled="true"
-          android:drawable="@drawable/btn_radio_off_holo_light" />
-          
     <item android:state_checked="true" android:state_pressed="true"
           android:state_enabled="true"
-          android:drawable="@drawable/btn_radio_on_pressed_holo_light" />
+          android:drawable="@drawable/btn_radio_on_pressed" />
     <item android:state_checked="false" android:state_pressed="true"
           android:state_enabled="true"
-          android:drawable="@drawable/btn_radio_off_pressed_holo_light" />
+          android:drawable="@drawable/btn_radio_off_pressed" />
 
     <item android:state_checked="true" android:state_focused="true"
           android:state_enabled="true"
-          android:drawable="@drawable/btn_radio_on_focused_holo_light" />
+          android:drawable="@drawable/btn_radio_on_focused" />
     <item android:state_checked="false" android:state_focused="true"
           android:state_enabled="true"
-          android:drawable="@drawable/btn_radio_off_focused_holo_light" />
+          android:drawable="@drawable/btn_radio_off_focused" />
+
+    <item android:state_checked="true" android:state_hovered="true"
+          android:state_enabled="true"
+          android:drawable="@drawable/btn_radio_on_focused" />
+    <item android:state_checked="false" android:state_hovered="true"
+          android:state_enabled="true"
+          android:drawable="@drawable/btn_radio_off_focused" />
 
     <item android:state_checked="false" android:state_enabled="true"
-          android:drawable="@drawable/btn_radio_off_holo_light" />
+          android:drawable="@drawable/btn_radio_off" />
     <item android:state_checked="true" android:state_enabled="true"
-          android:drawable="@drawable/btn_radio_on_holo_light" />
+          android:drawable="@drawable/btn_radio_on" />
 
     <!-- Disabled states -->
 
-    <item android:state_checked="true" android:state_window_focused="false"
-          android:drawable="@drawable/btn_radio_on_disabled_holo_light" />
-    <item android:state_checked="false" android:state_window_focused="false"
-          android:drawable="@drawable/btn_radio_off_disabled_holo_light" />
-
-    <item android:state_checked="true" android:state_focused="true"
-          android:drawable="@drawable/btn_radio_on_disabled_focused_holo_light" />
-    <item android:state_checked="false" android:state_focused="true"
-          android:drawable="@drawable/btn_radio_off_disabled_focused_holo_light" />
-
-    <item android:state_checked="false" android:drawable="@drawable/btn_radio_off_disabled_holo_light" />
-    <item android:state_checked="true" android:drawable="@drawable/btn_radio_on_disabled_holo_light" />
+    <item android:state_checked="false" android:drawable="@drawable/btn_radio_off_disabled" />
+    <item android:state_checked="true" android:drawable="@drawable/btn_radio_on_disabled" />
 
 </selector>
diff --git a/res/btn_radio_holo_light.xml b/res/btn_radio_holo_light.xml
new file mode 100644
index 00000000..e2f1f84c
--- /dev/null
+++ b/res/btn_radio_holo_light.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 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_checked="true" android:state_window_focused="false"
+          android:state_enabled="true"
+          android:drawable="@drawable/btn_radio_on_holo_light" />
+    <item android:state_checked="false" android:state_window_focused="false"
+          android:state_enabled="true"
+          android:drawable="@drawable/btn_radio_off_holo_light" />
+          
+    <item android:state_checked="true" android:state_pressed="true"
+          android:state_enabled="true"
+          android:drawable="@drawable/btn_radio_on_pressed_holo_light" />
+    <item android:state_checked="false" android:state_pressed="true"
+          android:state_enabled="true"
+          android:drawable="@drawable/btn_radio_off_pressed_holo_light" />
+
+    <item android:state_checked="true" android:state_focused="true"
+          android:state_enabled="true"
+          android:drawable="@drawable/btn_radio_on_focused_holo_light" />
+    <item android:state_checked="false" android:state_focused="true"
+          android:state_enabled="true"
+          android:drawable="@drawable/btn_radio_off_focused_holo_light" />
+
+    <item android:state_checked="false" android:state_enabled="true"
+          android:drawable="@drawable/btn_radio_off_holo_light" />
+    <item android:state_checked="true" android:state_enabled="true"
+          android:drawable="@drawable/btn_radio_on_holo_light" />
+
+    <!-- Disabled states -->
+
+    <item android:state_checked="true" android:state_window_focused="false"
+          android:drawable="@drawable/btn_radio_on_disabled_holo_light" />
+    <item android:state_checked="false" android:state_window_focused="false"
+          android:drawable="@drawable/btn_radio_off_disabled_holo_light" />
+
+    <item android:state_checked="true" android:state_focused="true"
+          android:drawable="@drawable/btn_radio_on_disabled_focused_holo_light" />
+    <item android:state_checked="false" android:state_focused="true"
+          android:drawable="@drawable/btn_radio_off_disabled_focused_holo_light" />
+
+    <item android:state_checked="false" android:drawable="@drawable/btn_radio_off_disabled_holo_light" />
+    <item android:state_checked="true" android:drawable="@drawable/btn_radio_on_disabled_holo_light" />
+
+</selector>
diff --git a/res/mdpi/btn_check_off_pressed.png b/res/mdpi/btn_check_off_pressed.png
index 1dc226ad..2e64acc2 100644
Binary files a/res/mdpi/btn_check_off_pressed.png and b/res/mdpi/btn_check_off_pressed.png differ
diff --git a/res/mdpi/btn_radio_off.png b/res/mdpi/btn_radio_off.png
new file mode 100644
index 00000000..1137dbfd
Binary files /dev/null and b/res/mdpi/btn_radio_off.png differ
diff --git a/res/mdpi/btn_radio_off_disabled.png b/res/mdpi/btn_radio_off_disabled.png
new file mode 100644
index 00000000..5d51d6fb
Binary files /dev/null and b/res/mdpi/btn_radio_off_disabled.png differ
diff --git a/res/mdpi/btn_radio_off_focused.png b/res/mdpi/btn_radio_off_focused.png
new file mode 100644
index 00000000..8bb12f47
Binary files /dev/null and b/res/mdpi/btn_radio_off_focused.png differ
diff --git a/res/mdpi/btn_radio_off_pressed.png b/res/mdpi/btn_radio_off_pressed.png
new file mode 100644
index 00000000..1137dbfd
Binary files /dev/null and b/res/mdpi/btn_radio_off_pressed.png differ
diff --git a/res/mdpi/btn_radio_on.png b/res/mdpi/btn_radio_on.png
new file mode 100644
index 00000000..7920f239
Binary files /dev/null and b/res/mdpi/btn_radio_on.png differ
diff --git a/res/mdpi/btn_radio_on_disabled.png b/res/mdpi/btn_radio_on_disabled.png
new file mode 100644
index 00000000..5f0dcff4
Binary files /dev/null and b/res/mdpi/btn_radio_on_disabled.png differ
diff --git a/res/mdpi/btn_radio_on_focused.png b/res/mdpi/btn_radio_on_focused.png
new file mode 100644
index 00000000..228b8a38
Binary files /dev/null and b/res/mdpi/btn_radio_on_focused.png differ
diff --git a/res/mdpi/btn_radio_on_pressed.png b/res/mdpi/btn_radio_on_pressed.png
new file mode 100644
index 00000000..06fec87e
Binary files /dev/null and b/res/mdpi/btn_radio_on_pressed.png differ