diff --git a/res/drawable/bottombar_landscape_565.png b/res/drawable/bottombar_landscape_565.png
deleted file mode 100644
index 6121856704..0000000000
Binary files a/res/drawable/bottombar_landscape_565.png and /dev/null differ
diff --git a/res/drawable/chat_history_selector.xml b/res/drawable/chat_history_selector.xml
deleted file mode 100644
index d9b7023c40..0000000000
--- a/res/drawable/chat_history_selector.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 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:state_focused="true"
-        android:state_pressed="false"
-        android:drawable="@drawable/textfield_im_user_selected_pad" />
-    <item
-        android:state_focused="true"
-        android:state_pressed="true"
-        android:drawable="@drawable/textfield_im_user_pressed_pad" />
-</selector>
-        
\ No newline at end of file
diff --git a/res/drawable/conversation_header_background_light.xml b/res/drawable/conversation_header_background_light.xml
deleted file mode 100644
index c64d02d35c..0000000000
--- a/res/drawable/conversation_header_background_light.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 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_selected="true"
-        android:drawable="@android:color/transparent" />
-    <item android:state_pressed="true" android:state_selected="false"
-        android:drawable="@android:color/transparent" />
-    <item android:state_selected="false"
-          android:drawable="@color/light_list_bgcolor" />
-</selector>
diff --git a/res/drawable/conversation_item_background.xml b/res/drawable/conversation_item_background.xml
deleted file mode 100644
index d08ecc04b2..0000000000
--- a/res/drawable/conversation_item_background.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 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_selected="true"
-        android:drawable="@android:color/transparent" />
-    <item android:state_pressed="true" android:state_selected="false"
-        android:drawable="@android:color/transparent" />
-    <item android:state_selected="false"
-          android:drawable="@android:color/white" />
-</selector>
diff --git a/res/drawable/conversation_item_background_black.xml b/res/drawable/conversation_item_background_black.xml
deleted file mode 100644
index 8ad40de982..0000000000
--- a/res/drawable/conversation_item_background_black.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 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_selected="true"
-        android:drawable="@android:color/transparent" />
-    <item android:state_pressed="true" android:state_selected="false"
-        android:drawable="@android:color/transparent" />
-    <item android:state_selected="false"
-          android:drawable="@drawable/softgrey_background" />
-</selector>
diff --git a/res/drawable/conversation_item_background_key.xml b/res/drawable/conversation_item_background_key.xml
deleted file mode 100644
index 79d85d29a4..0000000000
--- a/res/drawable/conversation_item_background_key.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_selected="true"
-        android:drawable="@android:color/transparent" />
-    <item android:state_pressed="true" android:state_selected="false"
-        android:drawable="@android:color/transparent" />
-    <item android:state_selected="false"
-          android:drawable="@drawable/alert_background" />
-</selector>
diff --git a/res/drawable/conversation_item_background_lightblue.xml b/res/drawable/conversation_item_background_lightblue.xml
deleted file mode 100644
index 3e753fb4b6..0000000000
--- a/res/drawable/conversation_item_background_lightblue.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 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_selected="true"
-        android:drawable="@android:color/transparent" />
-    <item android:state_pressed="true" android:state_selected="false"
-        android:drawable="@android:color/transparent" />
-    <item android:state_selected="false"
-          android:drawable="@drawable/light_blue_background" />
-</selector>
diff --git a/res/drawable/conversation_item_background_lightgrey.xml b/res/drawable/conversation_item_background_lightgrey.xml
deleted file mode 100644
index 1302125dc3..0000000000
--- a/res/drawable/conversation_item_background_lightgrey.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 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_selected="true"
-        android:drawable="@android:color/transparent" />
-    <item android:state_pressed="true" android:state_selected="false"
-        android:drawable="@android:color/transparent" />
-    <item android:state_selected="false"
-          android:drawable="@drawable/lightgrey_background" />
-</selector>
diff --git a/res/drawable/dark_divider.xml b/res/drawable/dark_divider.xml
deleted file mode 100644
index 4e0c6d1fce..0000000000
--- a/res/drawable/dark_divider.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-  <gradient
-      android:startColor="#66666666"
-      android:centerColor="#aaaaaaaa"
-      android:endColor="#66666666"
-      android:angle="0" />
-</shape>
\ No newline at end of file
diff --git a/res/drawable/divider_vertical_dark.png b/res/drawable/divider_vertical_dark.png
deleted file mode 100644
index dcf850ea12..0000000000
Binary files a/res/drawable/divider_vertical_dark.png and /dev/null differ
diff --git a/res/drawable/header_gradient.xml b/res/drawable/header_gradient.xml
deleted file mode 100644
index 4344b2e9d4..0000000000
--- a/res/drawable/header_gradient.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-       android:shape="rectangle">
-        <gradient
-                android:startColor="#dddddddd"
-                android:endColor="#99999999"
-                android:angle="90"/>
-</shape>
diff --git a/res/drawable/ic_add.png b/res/drawable/ic_add.png
deleted file mode 100644
index 31b956ff92..0000000000
Binary files a/res/drawable/ic_add.png and /dev/null differ
diff --git a/res/drawable/ic_list_alert_sms_failed.png b/res/drawable/ic_list_alert_sms_failed.png
deleted file mode 100644
index 72e128be84..0000000000
Binary files a/res/drawable/ic_list_alert_sms_failed.png and /dev/null differ
diff --git a/res/drawable/ic_lock_iphone.png b/res/drawable/ic_lock_iphone.png
deleted file mode 100644
index b4717eff93..0000000000
Binary files a/res/drawable/ic_lock_iphone.png and /dev/null differ
diff --git a/res/drawable/ic_lock_iphone_green.png b/res/drawable/ic_lock_iphone_green.png
deleted file mode 100644
index d35fe88792..0000000000
Binary files a/res/drawable/ic_lock_iphone_green.png and /dev/null differ
diff --git a/res/drawable/ic_lock_iphone_green2.png b/res/drawable/ic_lock_iphone_green2.png
deleted file mode 100644
index d6cccb14d7..0000000000
Binary files a/res/drawable/ic_lock_iphone_green2.png and /dev/null differ
diff --git a/res/drawable/ic_lock_iphone_question.png b/res/drawable/ic_lock_iphone_question.png
deleted file mode 100644
index 1d9e999c2a..0000000000
Binary files a/res/drawable/ic_lock_iphone_question.png and /dev/null differ
diff --git a/res/drawable/ic_lock_iphone_red.png b/res/drawable/ic_lock_iphone_red.png
deleted file mode 100644
index dd9a9659f0..0000000000
Binary files a/res/drawable/ic_lock_iphone_red.png and /dev/null differ
diff --git a/res/drawable/ic_lock_iphone_red2.png b/res/drawable/ic_lock_iphone_red2.png
deleted file mode 100644
index ad6850d5e0..0000000000
Binary files a/res/drawable/ic_lock_iphone_red2.png and /dev/null differ
diff --git a/res/drawable/ic_lock_iphone_yellow.png b/res/drawable/ic_lock_iphone_yellow.png
deleted file mode 100644
index ccc07a4486..0000000000
Binary files a/res/drawable/ic_lock_iphone_yellow.png and /dev/null differ
diff --git a/res/drawable/ic_lock_iphone_yellow2.png b/res/drawable/ic_lock_iphone_yellow2.png
deleted file mode 100644
index c70659bb49..0000000000
Binary files a/res/drawable/ic_lock_iphone_yellow2.png and /dev/null differ
diff --git a/res/drawable/ic_lock_message_sms.png b/res/drawable/ic_lock_message_sms.png
deleted file mode 100644
index 367baabfc0..0000000000
Binary files a/res/drawable/ic_lock_message_sms.png and /dev/null differ
diff --git a/res/drawable/ic_lock_small.png b/res/drawable/ic_lock_small.png
deleted file mode 100644
index e8be7eba5c..0000000000
Binary files a/res/drawable/ic_lock_small.png and /dev/null differ
diff --git a/res/drawable/ic_menu_attachment.png b/res/drawable/ic_menu_attachment.png
deleted file mode 100644
index d5929e84b9..0000000000
Binary files a/res/drawable/ic_menu_attachment.png and /dev/null differ
diff --git a/res/drawable/ic_menu_movie.png b/res/drawable/ic_menu_movie.png
deleted file mode 100644
index 35d260bb0f..0000000000
Binary files a/res/drawable/ic_menu_movie.png and /dev/null differ
diff --git a/res/drawable/ic_menu_preferences.png b/res/drawable/ic_menu_preferences.png
deleted file mode 100644
index 81bca4ae6b..0000000000
Binary files a/res/drawable/ic_menu_preferences.png and /dev/null differ
diff --git a/res/drawable/ic_settings_iphone.png b/res/drawable/ic_settings_iphone.png
deleted file mode 100644
index 7d6bed2dd8..0000000000
Binary files a/res/drawable/ic_settings_iphone.png and /dev/null differ
diff --git a/res/drawable/ic_sms_mms_not_delivered.png b/res/drawable/ic_sms_mms_not_delivered.png
deleted file mode 100644
index 480b709fe4..0000000000
Binary files a/res/drawable/ic_sms_mms_not_delivered.png and /dev/null differ
diff --git a/res/drawable/ic_sms_mms_pending.png b/res/drawable/ic_sms_mms_pending.png
deleted file mode 100644
index 1bb9867e51..0000000000
Binary files a/res/drawable/ic_sms_mms_pending.png and /dev/null differ
diff --git a/res/drawable/incorrect.png b/res/drawable/incorrect.png
deleted file mode 100644
index 8d42beab4b..0000000000
Binary files a/res/drawable/incorrect.png and /dev/null differ
diff --git a/res/drawable/invalid.png b/res/drawable/invalid.png
deleted file mode 100644
index f2f28c4d60..0000000000
Binary files a/res/drawable/invalid.png and /dev/null differ
diff --git a/res/drawable/iphone_bar_top.png b/res/drawable/iphone_bar_top.png
deleted file mode 100644
index f9a62b345c..0000000000
Binary files a/res/drawable/iphone_bar_top.png and /dev/null differ
diff --git a/res/drawable/iphone_btn_personal_set.png b/res/drawable/iphone_btn_personal_set.png
deleted file mode 100644
index 49802d9aa2..0000000000
Binary files a/res/drawable/iphone_btn_personal_set.png and /dev/null differ
diff --git a/res/drawable/key.png b/res/drawable/key.png
deleted file mode 100644
index de44a079b9..0000000000
Binary files a/res/drawable/key.png and /dev/null differ
diff --git a/res/drawable/key_exchange_indicator.png b/res/drawable/key_exchange_indicator.png
deleted file mode 100644
index 7ae2d54c08..0000000000
Binary files a/res/drawable/key_exchange_indicator.png and /dev/null differ
diff --git a/res/drawable/key_exchange_item.9.png b/res/drawable/key_exchange_item.9.png
deleted file mode 100644
index 35e23aa253..0000000000
Binary files a/res/drawable/key_exchange_item.9.png and /dev/null differ
diff --git a/res/drawable/key_square.png b/res/drawable/key_square.png
deleted file mode 100644
index c43e37edf3..0000000000
Binary files a/res/drawable/key_square.png and /dev/null differ
diff --git a/res/drawable/light_border_background.xml b/res/drawable/light_border_background.xml
deleted file mode 100644
index eb953cbf48..0000000000
--- a/res/drawable/light_border_background.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-<solid android:color="#ffffff" />
-<stroke android:width="2dp" android:color="#ffffff" />
-<padding android:left="2dp" android:top="2dp" android:right="2dp"
-    android:bottom="2dp" />
-</shape>
diff --git a/res/drawable/menu_padlock.png b/res/drawable/menu_padlock.png
deleted file mode 100644
index 1705fc616d..0000000000
Binary files a/res/drawable/menu_padlock.png and /dev/null differ
diff --git a/res/drawable/padlock.gif b/res/drawable/padlock.gif
deleted file mode 100644
index bb6ddc045f..0000000000
Binary files a/res/drawable/padlock.gif and /dev/null differ
diff --git a/res/drawable/selector.png b/res/drawable/selector.png
deleted file mode 100644
index 5b5add5c65..0000000000
Binary files a/res/drawable/selector.png and /dev/null differ
diff --git a/res/drawable/stat_notify_sms.png b/res/drawable/stat_notify_sms.png
deleted file mode 100644
index b437d5b772..0000000000
Binary files a/res/drawable/stat_notify_sms.png and /dev/null differ
diff --git a/res/drawable/textfield_im_user_pressed_pad.9.png b/res/drawable/textfield_im_user_pressed_pad.9.png
deleted file mode 100644
index d6946850ea..0000000000
Binary files a/res/drawable/textfield_im_user_pressed_pad.9.png and /dev/null differ
diff --git a/res/drawable/textfield_im_user_selected_pad.9.png b/res/drawable/textfield_im_user_selected_pad.9.png
deleted file mode 100644
index 991a4c7f1f..0000000000
Binary files a/res/drawable/textfield_im_user_selected_pad.9.png and /dev/null differ
diff --git a/res/drawable/th_padlock.png b/res/drawable/th_padlock.png
deleted file mode 100644
index 8f6f5b6eb5..0000000000
Binary files a/res/drawable/th_padlock.png and /dev/null differ
diff --git a/res/drawable/valid.png b/res/drawable/valid.png
deleted file mode 100644
index 9658a03d8a..0000000000
Binary files a/res/drawable/valid.png and /dev/null differ
diff --git a/res/layout/conversation_fragment.xml b/res/layout/conversation_fragment.xml
index 55d83977b9..59baeac3ba 100644
--- a/res/layout/conversation_fragment.xml
+++ b/res/layout/conversation_fragment.xml
@@ -10,7 +10,6 @@
               android:layout_width="fill_parent"
               android:layout_height="0dp"
               android:layout_weight="1.0"
-              android:listSelector="@drawable/chat_history_selector"
               android:drawSelectorOnTop="true"
               android:transcriptMode="alwaysScroll"
               android:scrollbarAlwaysDrawVerticalTrack="false"
diff --git a/res/layout/recent_call_item_selectable.xml b/res/layout/recent_call_item_selectable.xml
index 562dc523b3..2c369c9d2f 100644
--- a/res/layout/recent_call_item_selectable.xml
+++ b/res/layout/recent_call_item_selectable.xml
@@ -1,18 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 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.
--->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
@@ -28,27 +14,12 @@
         android:gravity="center_vertical"
     />
 
-<!--    <ImageView android:id="@+id/call_icon"-->
-<!--        android:layout_width="wrap_content"-->
-<!--        android:layout_height="fill_parent"-->
-<!---->
-<!--        android:paddingLeft="14dip"-->
-<!--        android:paddingRight="11dip"-->
-<!--        -->
-<!--        android:gravity="center_vertical"-->
-<!--        android:src="@android:drawable/sym_action_call"-->
-<!--        android:background="@android:drawable/list_selector_background"-->
-<!--    />-->
-
     <View android:id="@+id/divider"
         android:layout_width="1dip"
         android:layout_height="fill_parent"
         android:layout_toRightOf="@id/call_type_icon"
         android:layout_marginRight="11dip"
-
-        android:background="@drawable/divider_vertical_dark"
     />
-
     
     <TextView android:id="@+id/date"
         android:layout_width="wrap_content"