Massive icon update/cleanup.

- Added a number of new icons for toolbar, specifically for video.
- Deleted a number of unused drawables.

Bug: 16355221
Bug: 16014280
Change-Id: I9aa08cbb16fe3ee32eac6940801175732fdfc46e

80 files changed, 7 insertions, 30 deletions

diff --git a/InCallUI/res/drawable-hdpi/dial_background_texture.png b/InCallUI/res/drawable-hdpi/dial_background_texture.png
deleted file mode 100644
index 9df3b1e75..000000000
--- a/InCallUI/res/drawable-hdpi/dial_background_texture.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-hdpi/dial_num_0_no_plus_wht.png b/InCallUI/res/drawable-hdpi/dial_num_0_no_plus_wht.png
deleted file mode 100644
index 69849eca3..000000000
--- a/InCallUI/res/drawable-hdpi/dial_num_0_no_plus_wht.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-hdpi/dial_num_1_no_vm_wht.png b/InCallUI/res/drawable-hdpi/dial_num_1_no_vm_wht.png
deleted file mode 100644
index af7ec4296..000000000
--- a/InCallUI/res/drawable-hdpi/dial_num_1_no_vm_wht.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-hdpi/dial_num_2_wht.png b/InCallUI/res/drawable-hdpi/dial_num_2_wht.png
deleted file mode 100644
index 2ae20ab39..000000000
--- a/InCallUI/res/drawable-hdpi/dial_num_2_wht.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-hdpi/dial_num_3_wht.png b/InCallUI/res/drawable-hdpi/dial_num_3_wht.png
deleted file mode 100644
index 991d5f3dc..000000000
--- a/InCallUI/res/drawable-hdpi/dial_num_3_wht.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-hdpi/dial_num_4_wht.png b/InCallUI/res/drawable-hdpi/dial_num_4_wht.png
deleted file mode 100644
index 7aad3ef97..000000000
--- a/InCallUI/res/drawable-hdpi/dial_num_4_wht.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-hdpi/dial_num_5_wht.png b/InCallUI/res/drawable-hdpi/dial_num_5_wht.png
deleted file mode 100644
index 42a1d0bb5..000000000
--- a/InCallUI/res/drawable-hdpi/dial_num_5_wht.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-hdpi/dial_num_6_wht.png b/InCallUI/res/drawable-hdpi/dial_num_6_wht.png
deleted file mode 100644
index b03e0191a..000000000
--- a/InCallUI/res/drawable-hdpi/dial_num_6_wht.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-hdpi/dial_num_7_wht.png b/InCallUI/res/drawable-hdpi/dial_num_7_wht.png
deleted file mode 100644
index 8b72fffd6..000000000
--- a/InCallUI/res/drawable-hdpi/dial_num_7_wht.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-hdpi/dial_num_8_wht.png b/InCallUI/res/drawable-hdpi/dial_num_8_wht.png
deleted file mode 100644
index 822f21a94..000000000
--- a/InCallUI/res/drawable-hdpi/dial_num_8_wht.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-hdpi/dial_num_9_wht.png b/InCallUI/res/drawable-hdpi/dial_num_9_wht.png
deleted file mode 100644
index 2ee944b5d..000000000
--- a/InCallUI/res/drawable-hdpi/dial_num_9_wht.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-hdpi/dial_num_pound_wht.png b/InCallUI/res/drawable-hdpi/dial_num_pound_wht.png
deleted file mode 100644
index e10e57d5b..000000000
--- a/InCallUI/res/drawable-hdpi/dial_num_pound_wht.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-hdpi/dial_num_star_wht.png b/InCallUI/res/drawable-hdpi/dial_num_star_wht.png
deleted file mode 100644
index 1dfc111e7..000000000
--- a/InCallUI/res/drawable-hdpi/dial_num_star_wht.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-hdpi/ic_bluetooth_holo_dark.png b/InCallUI/res/drawable-hdpi/ic_bluetooth_holo_dark.png
deleted file mode 100644
index ba22b0f8d..000000000
--- a/InCallUI/res/drawable-hdpi/ic_bluetooth_holo_dark.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-hdpi/ic_in_call_bt_dk.png b/InCallUI/res/drawable-hdpi/ic_in_call_bt_dk.png
deleted file mode 100644
index 4901a2c1c..000000000
--- a/InCallUI/res/drawable-hdpi/ic_in_call_bt_dk.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-hdpi/ic_sound_bluetooth_holo_dark.png b/InCallUI/res/drawable-hdpi/ic_sound_bluetooth_holo_dark.png
deleted file mode 100644
index c7f2402dd..000000000
--- a/InCallUI/res/drawable-hdpi/ic_sound_bluetooth_holo_dark.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-hdpi/ic_sound_handset_holo_dark.png b/InCallUI/res/drawable-hdpi/ic_sound_handset_holo_dark.png
deleted file mode 100644
index 288141a2a..000000000
--- a/InCallUI/res/drawable-hdpi/ic_sound_handset_holo_dark.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-hdpi/ic_sound_holo_dark.png b/InCallUI/res/drawable-hdpi/ic_sound_holo_dark.png
deleted file mode 100644
index 08ee3e8fe..000000000
--- a/InCallUI/res/drawable-hdpi/ic_sound_holo_dark.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-hdpi/ic_text_holo_dark.png b/InCallUI/res/drawable-hdpi/ic_text_holo_dark.png
deleted file mode 100644
index 6d21e42c5..000000000
--- a/InCallUI/res/drawable-hdpi/ic_text_holo_dark.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-hdpi/ic_toolbar_audio_bluetooth.png b/InCallUI/res/drawable-hdpi/ic_toolbar_audio_bluetooth.png
new file mode 100644
index 000000000..05e19bc25
--- /dev/null
+++ b/InCallUI/res/drawable-hdpi/ic_toolbar_audio_bluetooth.png
diff --git a/InCallUI/res/drawable-hdpi/ic_toolbar_audio_headphones.png b/InCallUI/res/drawable-hdpi/ic_toolbar_audio_headphones.png
new file mode 100644
index 000000000..413fdff26
--- /dev/null
+++ b/InCallUI/res/drawable-hdpi/ic_toolbar_audio_headphones.png
diff --git a/InCallUI/res/drawable-hdpi/ic_toolbar_audio_phone.png b/InCallUI/res/drawable-hdpi/ic_toolbar_audio_phone.png
new file mode 100644
index 000000000..90ee1fb5f
--- /dev/null
+++ b/InCallUI/res/drawable-hdpi/ic_toolbar_audio_phone.png
diff --git a/InCallUI/res/drawable-hdpi/ic_toolbar_video.png b/InCallUI/res/drawable-hdpi/ic_toolbar_video.png
new file mode 100644
index 000000000..cef47aaff
--- /dev/null
+++ b/InCallUI/res/drawable-hdpi/ic_toolbar_video.png
diff --git a/InCallUI/res/drawable-hdpi/ic_toolbar_video_off.png b/InCallUI/res/drawable-hdpi/ic_toolbar_video_off.png
new file mode 100644
index 000000000..968ded7d8
--- /dev/null
+++ b/InCallUI/res/drawable-hdpi/ic_toolbar_video_off.png
diff --git a/InCallUI/res/drawable-hdpi/ic_toolbar_video_switch.png b/InCallUI/res/drawable-hdpi/ic_toolbar_video_switch.png
new file mode 100644
index 000000000..cdd623dc0
--- /dev/null
+++ b/InCallUI/res/drawable-hdpi/ic_toolbar_video_switch.png
diff --git a/InCallUI/res/drawable-hdpi/list_pressed_holo_dark.9.png b/InCallUI/res/drawable-hdpi/list_pressed_holo_dark.9.png
deleted file mode 100644
index 596accb8a..000000000
--- a/InCallUI/res/drawable-hdpi/list_pressed_holo_dark.9.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-ldrtl-hdpi/ic_sound_handset_holo_dark.png b/InCallUI/res/drawable-ldrtl-hdpi/ic_sound_handset_holo_dark.png
deleted file mode 100644
index 207d94180..000000000
--- a/InCallUI/res/drawable-ldrtl-hdpi/ic_sound_handset_holo_dark.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-ldrtl-hdpi/ic_sound_holo_dark.png b/InCallUI/res/drawable-ldrtl-hdpi/ic_sound_holo_dark.png
deleted file mode 100644
index c2e8adbbf..000000000
--- a/InCallUI/res/drawable-ldrtl-hdpi/ic_sound_holo_dark.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-ldrtl-hdpi/ic_text_holo_dark.png b/InCallUI/res/drawable-ldrtl-hdpi/ic_text_holo_dark.png
deleted file mode 100644
index 667e961e4..000000000
--- a/InCallUI/res/drawable-ldrtl-hdpi/ic_text_holo_dark.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-ldrtl-mdpi/ic_sound_handset_holo_dark.png b/InCallUI/res/drawable-ldrtl-mdpi/ic_sound_handset_holo_dark.png
deleted file mode 100644
index 6bf0e8d6d..000000000
--- a/InCallUI/res/drawable-ldrtl-mdpi/ic_sound_handset_holo_dark.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-ldrtl-mdpi/ic_sound_holo_dark.png b/InCallUI/res/drawable-ldrtl-mdpi/ic_sound_holo_dark.png
deleted file mode 100644
index 561e8fab1..000000000
--- a/InCallUI/res/drawable-ldrtl-mdpi/ic_sound_holo_dark.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-ldrtl-mdpi/ic_text_holo_dark.png b/InCallUI/res/drawable-ldrtl-mdpi/ic_text_holo_dark.png
deleted file mode 100644
index 4429d0237..000000000
--- a/InCallUI/res/drawable-ldrtl-mdpi/ic_text_holo_dark.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-ldrtl-xhdpi/ic_sound_handset_holo_dark.png b/InCallUI/res/drawable-ldrtl-xhdpi/ic_sound_handset_holo_dark.png
deleted file mode 100644
index 1c1f1ad56..000000000
--- a/InCallUI/res/drawable-ldrtl-xhdpi/ic_sound_handset_holo_dark.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-ldrtl-xhdpi/ic_sound_holo_dark.png b/InCallUI/res/drawable-ldrtl-xhdpi/ic_sound_holo_dark.png
deleted file mode 100644
index ac38205d1..000000000
--- a/InCallUI/res/drawable-ldrtl-xhdpi/ic_sound_holo_dark.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-ldrtl-xhdpi/ic_text_holo_dark.png b/InCallUI/res/drawable-ldrtl-xhdpi/ic_text_holo_dark.png
deleted file mode 100644
index 2a28bab37..000000000
--- a/InCallUI/res/drawable-ldrtl-xhdpi/ic_text_holo_dark.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-mdpi/dial_background_texture.png b/InCallUI/res/drawable-mdpi/dial_background_texture.png
deleted file mode 100644
index 90cd07c02..000000000
--- a/InCallUI/res/drawable-mdpi/dial_background_texture.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-mdpi/ic_bluetooth_holo_dark.png b/InCallUI/res/drawable-mdpi/ic_bluetooth_holo_dark.png
deleted file mode 100644
index fb69031dc..000000000
--- a/InCallUI/res/drawable-mdpi/ic_bluetooth_holo_dark.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-mdpi/ic_in_call_bt_dk.png b/InCallUI/res/drawable-mdpi/ic_in_call_bt_dk.png
deleted file mode 100644
index 820ebe1a4..000000000
--- a/InCallUI/res/drawable-mdpi/ic_in_call_bt_dk.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-mdpi/ic_sound_bluetooth_holo_dark.png b/InCallUI/res/drawable-mdpi/ic_sound_bluetooth_holo_dark.png
deleted file mode 100644
index c0e95cbeb..000000000
--- a/InCallUI/res/drawable-mdpi/ic_sound_bluetooth_holo_dark.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-mdpi/ic_sound_handset_holo_dark.png b/InCallUI/res/drawable-mdpi/ic_sound_handset_holo_dark.png
deleted file mode 100644
index e5fce5754..000000000
--- a/InCallUI/res/drawable-mdpi/ic_sound_handset_holo_dark.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-mdpi/ic_sound_holo_dark.png b/InCallUI/res/drawable-mdpi/ic_sound_holo_dark.png
deleted file mode 100644
index 060f926d3..000000000
--- a/InCallUI/res/drawable-mdpi/ic_sound_holo_dark.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-mdpi/ic_text_holo_dark.png b/InCallUI/res/drawable-mdpi/ic_text_holo_dark.png
deleted file mode 100644
index 80b95eec1..000000000
--- a/InCallUI/res/drawable-mdpi/ic_text_holo_dark.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-mdpi/ic_toolbar_audio_bluetooth.png b/InCallUI/res/drawable-mdpi/ic_toolbar_audio_bluetooth.png
new file mode 100644
index 000000000..a6634ed66
--- /dev/null
+++ b/InCallUI/res/drawable-mdpi/ic_toolbar_audio_bluetooth.png
diff --git a/InCallUI/res/drawable-mdpi/ic_toolbar_audio_headphones.png b/InCallUI/res/drawable-mdpi/ic_toolbar_audio_headphones.png
new file mode 100644
index 000000000..b387e850a
--- /dev/null
+++ b/InCallUI/res/drawable-mdpi/ic_toolbar_audio_headphones.png
diff --git a/InCallUI/res/drawable-mdpi/ic_toolbar_audio_phone.png b/InCallUI/res/drawable-mdpi/ic_toolbar_audio_phone.png
new file mode 100644
index 000000000..b4d887cf3
--- /dev/null
+++ b/InCallUI/res/drawable-mdpi/ic_toolbar_audio_phone.png
diff --git a/InCallUI/res/drawable-mdpi/ic_toolbar_video.png b/InCallUI/res/drawable-mdpi/ic_toolbar_video.png
new file mode 100644
index 000000000..3f13f9c31
--- /dev/null
+++ b/InCallUI/res/drawable-mdpi/ic_toolbar_video.png
diff --git a/InCallUI/res/drawable-mdpi/ic_toolbar_video_off.png b/InCallUI/res/drawable-mdpi/ic_toolbar_video_off.png
new file mode 100644
index 000000000..64a69f2a7
--- /dev/null
+++ b/InCallUI/res/drawable-mdpi/ic_toolbar_video_off.png
diff --git a/InCallUI/res/drawable-mdpi/ic_toolbar_video_switch.png b/InCallUI/res/drawable-mdpi/ic_toolbar_video_switch.png
new file mode 100644
index 000000000..6d097c9e7
--- /dev/null
+++ b/InCallUI/res/drawable-mdpi/ic_toolbar_video_switch.png
diff --git a/InCallUI/res/drawable-mdpi/list_pressed_holo_dark.9.png b/InCallUI/res/drawable-mdpi/list_pressed_holo_dark.9.png
deleted file mode 100644
index fd0e8d7d7..000000000
--- a/InCallUI/res/drawable-mdpi/list_pressed_holo_dark.9.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-xhdpi/dial_background_texture.png b/InCallUI/res/drawable-xhdpi/dial_background_texture.png
deleted file mode 100644
index 02aacc87d..000000000
--- a/InCallUI/res/drawable-xhdpi/dial_background_texture.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-xhdpi/ic_bluetooth_holo_dark.png b/InCallUI/res/drawable-xhdpi/ic_bluetooth_holo_dark.png
deleted file mode 100644
index 24cb8939d..000000000
--- a/InCallUI/res/drawable-xhdpi/ic_bluetooth_holo_dark.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-xhdpi/ic_in_call_bt_dk.png b/InCallUI/res/drawable-xhdpi/ic_in_call_bt_dk.png
deleted file mode 100644
index 8ca78f4e8..000000000
--- a/InCallUI/res/drawable-xhdpi/ic_in_call_bt_dk.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-xhdpi/ic_sound_bluetooth_holo_dark.png b/InCallUI/res/drawable-xhdpi/ic_sound_bluetooth_holo_dark.png
deleted file mode 100644
index 867d87da9..000000000
--- a/InCallUI/res/drawable-xhdpi/ic_sound_bluetooth_holo_dark.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-xhdpi/ic_sound_handset_holo_dark.png b/InCallUI/res/drawable-xhdpi/ic_sound_handset_holo_dark.png
deleted file mode 100644
index 42e19bd95..000000000
--- a/InCallUI/res/drawable-xhdpi/ic_sound_handset_holo_dark.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-xhdpi/ic_sound_holo_dark.png b/InCallUI/res/drawable-xhdpi/ic_sound_holo_dark.png
deleted file mode 100644
index aa2a5af1f..000000000
--- a/InCallUI/res/drawable-xhdpi/ic_sound_holo_dark.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-xhdpi/ic_text_holo_dark.png b/InCallUI/res/drawable-xhdpi/ic_text_holo_dark.png
deleted file mode 100644
index e80a04234..000000000
--- a/InCallUI/res/drawable-xhdpi/ic_text_holo_dark.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-xhdpi/ic_toolbar_audio_bluetooth.png b/InCallUI/res/drawable-xhdpi/ic_toolbar_audio_bluetooth.png
new file mode 100644
index 000000000..88f6bb945
--- /dev/null
+++ b/InCallUI/res/drawable-xhdpi/ic_toolbar_audio_bluetooth.png
diff --git a/InCallUI/res/drawable-xhdpi/ic_toolbar_audio_headphones.png b/InCallUI/res/drawable-xhdpi/ic_toolbar_audio_headphones.png
new file mode 100644
index 000000000..1acfcafbd
--- /dev/null
+++ b/InCallUI/res/drawable-xhdpi/ic_toolbar_audio_headphones.png
diff --git a/InCallUI/res/drawable-xhdpi/ic_toolbar_audio_phone.png b/InCallUI/res/drawable-xhdpi/ic_toolbar_audio_phone.png
new file mode 100644
index 000000000..0ba8f1e3e
--- /dev/null
+++ b/InCallUI/res/drawable-xhdpi/ic_toolbar_audio_phone.png
diff --git a/InCallUI/res/drawable-xhdpi/ic_toolbar_video.png b/InCallUI/res/drawable-xhdpi/ic_toolbar_video.png
new file mode 100644
index 000000000..b20f50498
--- /dev/null
+++ b/InCallUI/res/drawable-xhdpi/ic_toolbar_video.png
diff --git a/InCallUI/res/drawable-xhdpi/ic_toolbar_video_off.png b/InCallUI/res/drawable-xhdpi/ic_toolbar_video_off.png
new file mode 100644
index 000000000..1b269a6a7
--- /dev/null
+++ b/InCallUI/res/drawable-xhdpi/ic_toolbar_video_off.png
diff --git a/InCallUI/res/drawable-xhdpi/ic_toolbar_video_switch.png b/InCallUI/res/drawable-xhdpi/ic_toolbar_video_switch.png
new file mode 100644
index 000000000..fae6bfdb1
--- /dev/null
+++ b/InCallUI/res/drawable-xhdpi/ic_toolbar_video_switch.png
diff --git a/InCallUI/res/drawable-xhdpi/list_pressed_holo_dark.9.png b/InCallUI/res/drawable-xhdpi/list_pressed_holo_dark.9.png
deleted file mode 100644
index 29037a0d7..000000000
--- a/InCallUI/res/drawable-xhdpi/list_pressed_holo_dark.9.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-xxhdpi/dial_background_texture.png b/InCallUI/res/drawable-xxhdpi/dial_background_texture.png
deleted file mode 100644
index 437741c83..000000000
--- a/InCallUI/res/drawable-xxhdpi/dial_background_texture.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-xxhdpi/ic_bluetooth_holo_dark.png b/InCallUI/res/drawable-xxhdpi/ic_bluetooth_holo_dark.png
deleted file mode 100644
index 4b668b722..000000000
--- a/InCallUI/res/drawable-xxhdpi/ic_bluetooth_holo_dark.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-xxhdpi/ic_in_call_bt_dk.png b/InCallUI/res/drawable-xxhdpi/ic_in_call_bt_dk.png
deleted file mode 100644
index e94c77214..000000000
--- a/InCallUI/res/drawable-xxhdpi/ic_in_call_bt_dk.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-xxhdpi/ic_sound_bluetooth_holo_dark.png b/InCallUI/res/drawable-xxhdpi/ic_sound_bluetooth_holo_dark.png
deleted file mode 100644
index 8646bec41..000000000
--- a/InCallUI/res/drawable-xxhdpi/ic_sound_bluetooth_holo_dark.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-xxhdpi/ic_sound_handset_holo_dark.png b/InCallUI/res/drawable-xxhdpi/ic_sound_handset_holo_dark.png
deleted file mode 100644
index 7f89efbed..000000000
--- a/InCallUI/res/drawable-xxhdpi/ic_sound_handset_holo_dark.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-xxhdpi/ic_sound_holo_dark.png b/InCallUI/res/drawable-xxhdpi/ic_sound_holo_dark.png
deleted file mode 100644
index 5d36d4ecc..000000000
--- a/InCallUI/res/drawable-xxhdpi/ic_sound_holo_dark.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-xxhdpi/ic_text_holo_dark.png b/InCallUI/res/drawable-xxhdpi/ic_text_holo_dark.png
deleted file mode 100644
index b73e8b048..000000000
--- a/InCallUI/res/drawable-xxhdpi/ic_text_holo_dark.png
+++ /dev/null
diff --git a/InCallUI/res/drawable-xxhdpi/ic_toolbar_audio_bluetooth.png b/InCallUI/res/drawable-xxhdpi/ic_toolbar_audio_bluetooth.png
new file mode 100644
index 000000000..b8a385d14
--- /dev/null
+++ b/InCallUI/res/drawable-xxhdpi/ic_toolbar_audio_bluetooth.png
diff --git a/InCallUI/res/drawable-xxhdpi/ic_toolbar_audio_headphones.png b/InCallUI/res/drawable-xxhdpi/ic_toolbar_audio_headphones.png
new file mode 100644
index 000000000..62d0ae331
--- /dev/null
+++ b/InCallUI/res/drawable-xxhdpi/ic_toolbar_audio_headphones.png
diff --git a/InCallUI/res/drawable-xxhdpi/ic_toolbar_audio_phone.png b/InCallUI/res/drawable-xxhdpi/ic_toolbar_audio_phone.png
new file mode 100644
index 000000000..0e88501d6
--- /dev/null
+++ b/InCallUI/res/drawable-xxhdpi/ic_toolbar_audio_phone.png
diff --git a/InCallUI/res/drawable-xxhdpi/ic_toolbar_video.png b/InCallUI/res/drawable-xxhdpi/ic_toolbar_video.png
new file mode 100644
index 000000000..5c52dd6c6
--- /dev/null
+++ b/InCallUI/res/drawable-xxhdpi/ic_toolbar_video.png
diff --git a/InCallUI/res/drawable-xxhdpi/ic_toolbar_video_off.png b/InCallUI/res/drawable-xxhdpi/ic_toolbar_video_off.png
new file mode 100644
index 000000000..898b7c04d
--- /dev/null
+++ b/InCallUI/res/drawable-xxhdpi/ic_toolbar_video_off.png
diff --git a/InCallUI/res/drawable-xxhdpi/ic_toolbar_video_switch.png b/InCallUI/res/drawable-xxhdpi/ic_toolbar_video_switch.png
new file mode 100644
index 000000000..4380a47ca
--- /dev/null
+++ b/InCallUI/res/drawable-xxhdpi/ic_toolbar_video_switch.png
diff --git a/InCallUI/res/drawable-xxhdpi/list_pressed_holo_dark.9.png b/InCallUI/res/drawable-xxhdpi/list_pressed_holo_dark.9.png
deleted file mode 100644
index d4952eaf0..000000000
--- a/InCallUI/res/drawable-xxhdpi/list_pressed_holo_dark.9.png
+++ /dev/null
diff --git a/InCallUI/res/drawable/btn_compound_audio.xml b/InCallUI/res/drawable/btn_compound_audio.xml
index ae4a2de4d..9c474c956 100644
--- a/InCallUI/res/drawable/btn_compound_audio.xml
+++ b/InCallUI/res/drawable/btn_compound_audio.xml
@@ -70,7 +70,7 @@
 
     <!-- Bluetooth is active -->
     <item android:id="@+id/bluetoothItem">
-        <bitmap android:src="@drawable/ic_sound_bluetooth_holo_dark"
+        <bitmap android:src="@drawable/ic_toolbar_audio_bluetooth"
                 android:gravity="center"
                 android:tint="@color/selectable_icon_tint"  />
     </item>
@@ -78,7 +78,7 @@
 
     <!-- Handset earpiece is active -->
     <item android:id="@+id/handsetItem">
-        <bitmap android:src="@drawable/ic_sound_handset_holo_dark"
+        <bitmap android:src="@drawable/ic_toolbar_audio_phone"
                 android:gravity="center"
                 android:tint="@color/selectable_icon_tint" />
     </item>
diff --git a/InCallUI/res/drawable/clickable_dim_effect.xml b/InCallUI/res/drawable/clickable_dim_effect.xml
deleted file mode 100644
index e4b4f6fd6..000000000
--- a/InCallUI/res/drawable/clickable_dim_effect.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 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.
--->
-
-<!-- Background drawable used with dim effect for secondary photo. -->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_pressed="true" android:state_enabled="true"
-          android:drawable="@drawable/list_pressed_holo_dark" />
-    <item android:drawable="@color/on_hold_dim_effect" />
-
-</selector>
diff --git a/InCallUI/res/menu/incall_audio_mode_menu.xml b/InCallUI/res/menu/incall_audio_mode_menu.xml
index 0af65895f..070c1813a 100644
--- a/InCallUI/res/menu/incall_audio_mode_menu.xml
+++ b/InCallUI/res/menu/incall_audio_mode_menu.xml
@@ -19,20 +19,21 @@
     <!-- TODO: Need final icon assets.  Also, PopupMenu currently ignores the
          android:icon attribute anyway(!) -->
     <item android:id="@+id/audio_mode_speaker"
-          android:icon="@drawable/ic_sound_holo_dark"
+          android:icon="@drawable/ic_toolbar_speaker_on"
           android:title="@string/audio_mode_speaker" />
 
     <!-- We display *either* "earpiece" or "wired headset", never both,
          depending on whether a wired headset is physically plugged in
          (see InCallTouchUi.showAudioModePopup().) -->
     <item android:id="@+id/audio_mode_earpiece"
-          android:icon="@drawable/fab_ic_call"
+          android:icon="@drawable/ic_toolbar_audio_phone"
           android:title="@string/audio_mode_earpiece" />
+
     <item android:id="@+id/audio_mode_wired_headset"
-          android:icon="@drawable/fab_ic_call"
+          android:icon="@drawable/ic_toolbar_audio_headphones"
           android:title="@string/audio_mode_wired_headset" />
 
     <item android:id="@+id/audio_mode_bluetooth"
-          android:icon="@drawable/ic_bluetooth_holo_dark"
+          android:icon="@drawable/ic_toolbar_audio_bluetooth"
           android:title="@string/audio_mode_bluetooth" />
 </menu>