diff --git a/java/res/drawable/btn_close.xml b/java/res/drawable/btn_close.xml
new file mode 100644
index 0000000..ee58138
--- /dev/null
+++ b/java/res/drawable/btn_close.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 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_pressed="false" android:state_focused="false"
+        android:drawable="@drawable/btn_close_normal" />
+
+    <item android:state_pressed="true"
+        android:drawable="@drawable/btn_close_pressed" />
+
+    <item android:state_focused="true"
+        android:drawable="@drawable/btn_close_selected" />
+</selector>
diff --git a/java/res/drawable/btn_keyboard_key2.xml b/java/res/drawable/btn_keyboard_key2.xml
new file mode 100644
index 0000000..bd745b7
--- /dev/null
+++ b/java/res/drawable/btn_keyboard_key2.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 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">
+
+    <!-- Toggle keys. Use checkable/checked state. -->
+
+    <item android:state_checkable="true" android:state_checked="true"
+          android:state_pressed="true"
+          android:drawable="@drawable/btn_keyboard_key_pressed_on" />
+    <item android:state_checkable="true" android:state_pressed="true"
+          android:drawable="@drawable/btn_keyboard_key_fulltrans_pressed" />
+    <item android:state_checkable="true" android:state_checked="true"
+          android:drawable="@drawable/btn_keyboard_key_normal_on" />
+    <item android:state_checkable="true"
+          android:drawable="@drawable/btn_keyboard_key_fulltrans_normal" />
+
+    <!-- Normal keys -->
+
+    <item android:state_pressed="true"
+          android:drawable="@drawable/btn_keyboard_key_fulltrans_pressed" />
+    <item android:drawable="@drawable/btn_keyboard_key_fulltrans_normal" />
+</selector>
diff --git a/java/res/drawable/btn_keyboard_key3.xml b/java/res/drawable/btn_keyboard_key3.xml
new file mode 100644
index 0000000..dbe82d5
--- /dev/null
+++ b/java/res/drawable/btn_keyboard_key3.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 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">
+
+    <!-- Toggle keys. Use checkable/checked state. -->
+
+    <item android:state_checkable="true" android:state_checked="true"
+          android:state_pressed="true"
+          android:drawable="@drawable/btn_keyboard_key_pressed_on" />
+    <item android:state_checkable="true" android:state_pressed="true"
+          android:drawable="@drawable/btn_keyboard_key_fulltrans_normal" />
+    <item android:state_checkable="true" android:state_checked="true"
+          android:drawable="@drawable/btn_keyboard_key_normal_on" />
+    <item android:state_checkable="true"
+          android:drawable="@drawable/btn_keyboard_key_fulltrans_pressed" />
+
+    <!-- Normal keys -->
+
+    <item android:state_pressed="true"
+          android:drawable="@drawable/btn_keyboard_key_fulltrans_normal" />
+    <item android:drawable="@drawable/btn_keyboard_key_fulltrans_pressed" />
+</selector>
diff --git a/java/res/drawable/btn_keyboard_key_stone.xml b/java/res/drawable/btn_keyboard_key_stone.xml
new file mode 100644
index 0000000..a6040a0
--- /dev/null
+++ b/java/res/drawable/btn_keyboard_key_stone.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 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">
+
+    <!-- Toggle keys. Use checkable/checked state. -->
+
+    <item android:state_checkable="true" android:state_checked="true"
+          android:state_pressed="true"
+          android:drawable="@drawable/btn_keyboard_key_normal_on_stone" />
+    <item android:state_checkable="true" android:state_pressed="true"
+          android:drawable="@drawable/btn_keyboard_key_normal_off_stone" />
+    <item android:state_checkable="true" android:state_checked="true"
+          android:drawable="@drawable/btn_keyboard_key_normal_on_stone" />
+    <item android:state_checkable="true"
+          android:drawable="@drawable/btn_keyboard_key_normal_off_stone" />
+
+    <!-- Normal keys -->
+
+    <item android:state_pressed="true"
+          android:drawable="@drawable/btn_keyboard_key_fulltrans_pressed" />
+    <item android:drawable="@drawable/btn_keyboard_key_normal_stone" />
+</selector>
diff --git a/java/res/drawable/cancel.png b/java/res/drawable/cancel.png
deleted file mode 100644
index 081532b..0000000
--- a/java/res/drawable/cancel.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable/caution.png b/java/res/drawable/caution.png
deleted file mode 100644
index eaef534..0000000
--- a/java/res/drawable/caution.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable/dialog_top_dark_bottom_medium.9.png b/java/res/drawable/dialog_top_dark_bottom_medium.9.png
deleted file mode 100644
index cf7ecaf..0000000
--- a/java/res/drawable/dialog_top_dark_bottom_medium.9.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable/ic_dialog_alert_large.png b/java/res/drawable/ic_dialog_alert_large.png
deleted file mode 100644
index 2d4a164..0000000
--- a/java/res/drawable/ic_dialog_alert_large.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable/ic_dialog_voice_input.png b/java/res/drawable/ic_dialog_voice_input.png
deleted file mode 100644
index d289141..0000000
--- a/java/res/drawable/ic_dialog_voice_input.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable/ic_dialog_wave_0_0.png b/java/res/drawable/ic_dialog_wave_0_0.png
deleted file mode 100644
index 9c3c28f..0000000
--- a/java/res/drawable/ic_dialog_wave_0_0.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable/ic_dialog_wave_1_3.png b/java/res/drawable/ic_dialog_wave_1_3.png
deleted file mode 100644
index d33bd0d..0000000
--- a/java/res/drawable/ic_dialog_wave_1_3.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable/ic_dialog_wave_2_3.png b/java/res/drawable/ic_dialog_wave_2_3.png
deleted file mode 100644
index 5094a6e..0000000
--- a/java/res/drawable/ic_dialog_wave_2_3.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable/ic_dialog_wave_3_3.png b/java/res/drawable/ic_dialog_wave_3_3.png
deleted file mode 100644
index 6991756..0000000
--- a/java/res/drawable/ic_dialog_wave_3_3.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable/ic_dialog_wave_4_3.png b/java/res/drawable/ic_dialog_wave_4_3.png
deleted file mode 100644
index af5a84c..0000000
--- a/java/res/drawable/ic_dialog_wave_4_3.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable/keyboard_key_feedback.xml b/java/res/drawable/keyboard_key_feedback.xml
new file mode 100644
index 0000000..159ba86
--- /dev/null
+++ b/java/res/drawable/keyboard_key_feedback.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 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_long_pressable="true"
+            android:drawable="@drawable/keyboard_key_feedback_more_background" />
+
+    <item android:drawable="@drawable/keyboard_key_feedback_background" />
+</selector>
diff --git a/java/res/drawable/mic_slash.png b/java/res/drawable/mic_slash.png
deleted file mode 100644
index 0b0fb58..0000000
--- a/java/res/drawable/mic_slash.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable/ok_cancel.png b/java/res/drawable/ok_cancel.png
deleted file mode 100644
index 0601d32..0000000
--- a/java/res/drawable/ok_cancel.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable/speak_now_level0.png b/java/res/drawable/speak_now_level0.png
deleted file mode 100644
index abc8454..0000000
--- a/java/res/drawable/speak_now_level0.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable/speak_now_level1.png b/java/res/drawable/speak_now_level1.png
deleted file mode 100644
index 67cb235..0000000
--- a/java/res/drawable/speak_now_level1.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable/speak_now_level2.png b/java/res/drawable/speak_now_level2.png
deleted file mode 100644
index 1e07f26..0000000
--- a/java/res/drawable/speak_now_level2.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable/speak_now_level3.png b/java/res/drawable/speak_now_level3.png
deleted file mode 100644
index 31991da..0000000
--- a/java/res/drawable/speak_now_level3.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable/speak_now_level4.png b/java/res/drawable/speak_now_level4.png
deleted file mode 100644
index 7363ca8..0000000
--- a/java/res/drawable/speak_now_level4.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable/speak_now_level5.png b/java/res/drawable/speak_now_level5.png
deleted file mode 100644
index 9034908..0000000
--- a/java/res/drawable/speak_now_level5.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable/speak_now_level6.png b/java/res/drawable/speak_now_level6.png
deleted file mode 100644
index 3eaa9bd..0000000
--- a/java/res/drawable/speak_now_level6.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable/voice_ime_background.9.png b/java/res/drawable/voice_ime_background.9.png
deleted file mode 100644
index 6780249..0000000
--- a/java/res/drawable/voice_ime_background.9.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable/voice_swipe_hint.png b/java/res/drawable/voice_swipe_hint.png
deleted file mode 100644
index bb88732..0000000
--- a/java/res/drawable/voice_swipe_hint.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable/working.png b/java/res/drawable/working.png
deleted file mode 100644
index 6246a6d..0000000
--- a/java/res/drawable/working.png
+++ /dev/null
Binary files differ