Add resources for light theme

Bug: 10407819
Change-Id: Ie232b2d48a8d67355d7c31a878ebaa79aae7c44d

139 files changed, 145 insertions, 48 deletions

diff --git a/res/drawable-hdpi/ic_menu_add.png b/res/drawable-hdpi/ic_menu_add.png
deleted file mode 100644
index 4b68f52ad..000000000
--- a/res/drawable-hdpi/ic_menu_add.png
+++ /dev/null
diff --git a/res/drawable-hdpi/ic_menu_add_dark.png b/res/drawable-hdpi/ic_menu_add_dark.png
new file mode 100644
index 000000000..b45001e55
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_add_dark.png
diff --git a/res/drawable-hdpi/ic_menu_add_light.png b/res/drawable-hdpi/ic_menu_add_light.png
new file mode 100644
index 000000000..91b035402
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_add_light.png
diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_1.png b/res/drawable-hdpi/ic_wifi_lock_signal_1.png
deleted file mode 100644
index 60857b3b7..000000000
--- a/res/drawable-hdpi/ic_wifi_lock_signal_1.png
+++ /dev/null
diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_1_dark.png b/res/drawable-hdpi/ic_wifi_lock_signal_1_dark.png
new file mode 100644
index 000000000..2ec38ae5a
--- /dev/null
+++ b/res/drawable-hdpi/ic_wifi_lock_signal_1_dark.png
diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_1_light.png b/res/drawable-hdpi/ic_wifi_lock_signal_1_light.png
new file mode 100644
index 000000000..8b0009b14
--- /dev/null
+++ b/res/drawable-hdpi/ic_wifi_lock_signal_1_light.png
diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_2.png b/res/drawable-hdpi/ic_wifi_lock_signal_2.png
deleted file mode 100644
index 5e1f118a5..000000000
--- a/res/drawable-hdpi/ic_wifi_lock_signal_2.png
+++ /dev/null
diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_2_dark.png b/res/drawable-hdpi/ic_wifi_lock_signal_2_dark.png
new file mode 100644
index 000000000..a3383a84b
--- /dev/null
+++ b/res/drawable-hdpi/ic_wifi_lock_signal_2_dark.png
diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_2_light.png b/res/drawable-hdpi/ic_wifi_lock_signal_2_light.png
new file mode 100644
index 000000000..b79d3e5e7
--- /dev/null
+++ b/res/drawable-hdpi/ic_wifi_lock_signal_2_light.png
diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_3.png b/res/drawable-hdpi/ic_wifi_lock_signal_3.png
deleted file mode 100644
index 490bd584d..000000000
--- a/res/drawable-hdpi/ic_wifi_lock_signal_3.png
+++ /dev/null
diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_3_dark.png b/res/drawable-hdpi/ic_wifi_lock_signal_3_dark.png
new file mode 100644
index 000000000..e2cb17ecd
--- /dev/null
+++ b/res/drawable-hdpi/ic_wifi_lock_signal_3_dark.png
diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_3_light.png b/res/drawable-hdpi/ic_wifi_lock_signal_3_light.png
new file mode 100644
index 000000000..053c7afc4
--- /dev/null
+++ b/res/drawable-hdpi/ic_wifi_lock_signal_3_light.png
diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_4.png b/res/drawable-hdpi/ic_wifi_lock_signal_4.png
deleted file mode 100644
index e5fa8d1c0..000000000
--- a/res/drawable-hdpi/ic_wifi_lock_signal_4.png
+++ /dev/null
diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_4_dark.png b/res/drawable-hdpi/ic_wifi_lock_signal_4_dark.png
new file mode 100644
index 000000000..65b02dde1
--- /dev/null
+++ b/res/drawable-hdpi/ic_wifi_lock_signal_4_dark.png
diff --git a/res/drawable-hdpi/ic_wifi_lock_signal_4_light.png b/res/drawable-hdpi/ic_wifi_lock_signal_4_light.png
new file mode 100644
index 000000000..0516bd46e
--- /dev/null
+++ b/res/drawable-hdpi/ic_wifi_lock_signal_4_light.png
diff --git a/res/drawable-hdpi/ic_wifi_signal_1.png b/res/drawable-hdpi/ic_wifi_signal_1.png
deleted file mode 100644
index de9162ba5..000000000
--- a/res/drawable-hdpi/ic_wifi_signal_1.png
+++ /dev/null
diff --git a/res/drawable-hdpi/ic_wifi_signal_1_dark.png b/res/drawable-hdpi/ic_wifi_signal_1_dark.png
new file mode 100644
index 000000000..f3f020843
--- /dev/null
+++ b/res/drawable-hdpi/ic_wifi_signal_1_dark.png
diff --git a/res/drawable-hdpi/ic_wifi_signal_1_light.png b/res/drawable-hdpi/ic_wifi_signal_1_light.png
new file mode 100644
index 000000000..d9968b93f
--- /dev/null
+++ b/res/drawable-hdpi/ic_wifi_signal_1_light.png
diff --git a/res/drawable-hdpi/ic_wifi_signal_2.png b/res/drawable-hdpi/ic_wifi_signal_2.png
deleted file mode 100644
index 4c7559c3d..000000000
--- a/res/drawable-hdpi/ic_wifi_signal_2.png
+++ /dev/null
diff --git a/res/drawable-hdpi/ic_wifi_signal_2_dark.png b/res/drawable-hdpi/ic_wifi_signal_2_dark.png
new file mode 100644
index 000000000..9541c38da
--- /dev/null
+++ b/res/drawable-hdpi/ic_wifi_signal_2_dark.png
diff --git a/res/drawable-hdpi/ic_wifi_signal_2_light.png b/res/drawable-hdpi/ic_wifi_signal_2_light.png
new file mode 100644
index 000000000..d3065dead
--- /dev/null
+++ b/res/drawable-hdpi/ic_wifi_signal_2_light.png
diff --git a/res/drawable-hdpi/ic_wifi_signal_3.png b/res/drawable-hdpi/ic_wifi_signal_3.png
deleted file mode 100644
index 2d763246b..000000000
--- a/res/drawable-hdpi/ic_wifi_signal_3.png
+++ /dev/null
diff --git a/res/drawable-hdpi/ic_wifi_signal_3_dark.png b/res/drawable-hdpi/ic_wifi_signal_3_dark.png
new file mode 100644
index 000000000..be1ba3761
--- /dev/null
+++ b/res/drawable-hdpi/ic_wifi_signal_3_dark.png
diff --git a/res/drawable-hdpi/ic_wifi_signal_3_light.png b/res/drawable-hdpi/ic_wifi_signal_3_light.png
new file mode 100644
index 000000000..4a6407fd6
--- /dev/null
+++ b/res/drawable-hdpi/ic_wifi_signal_3_light.png
diff --git a/res/drawable-hdpi/ic_wifi_signal_4.png b/res/drawable-hdpi/ic_wifi_signal_4.png
deleted file mode 100644
index bd50fd7d1..000000000
--- a/res/drawable-hdpi/ic_wifi_signal_4.png
+++ /dev/null
diff --git a/res/drawable-hdpi/ic_wifi_signal_4_dark.png b/res/drawable-hdpi/ic_wifi_signal_4_dark.png
new file mode 100644
index 000000000..3fed8e638
--- /dev/null
+++ b/res/drawable-hdpi/ic_wifi_signal_4_dark.png
diff --git a/res/drawable-hdpi/ic_wifi_signal_4_light.png b/res/drawable-hdpi/ic_wifi_signal_4_light.png
new file mode 100644
index 000000000..e52acd6f4
--- /dev/null
+++ b/res/drawable-hdpi/ic_wifi_signal_4_light.png
diff --git a/res/drawable-hdpi/ic_wps.png b/res/drawable-hdpi/ic_wps.png
deleted file mode 100644
index 36c2a327f..000000000
--- a/res/drawable-hdpi/ic_wps.png
+++ /dev/null
diff --git a/res/drawable-hdpi/ic_wps_dark.png b/res/drawable-hdpi/ic_wps_dark.png
new file mode 100644
index 000000000..918b0cc48
--- /dev/null
+++ b/res/drawable-hdpi/ic_wps_dark.png
diff --git a/res/drawable-hdpi/ic_wps_light.png b/res/drawable-hdpi/ic_wps_light.png
new file mode 100644
index 000000000..5ad9f3eae
--- /dev/null
+++ b/res/drawable-hdpi/ic_wps_light.png
diff --git a/res/drawable-ldrtl-hdpi/ic_wifi_lock_signal_1.png b/res/drawable-ldrtl-hdpi/ic_wifi_lock_signal_1.png
deleted file mode 100644
index 5806c4f79..000000000
--- a/res/drawable-ldrtl-hdpi/ic_wifi_lock_signal_1.png
+++ /dev/null
diff --git a/res/drawable-ldrtl-hdpi/ic_wifi_lock_signal_2.png b/res/drawable-ldrtl-hdpi/ic_wifi_lock_signal_2.png
deleted file mode 100644
index c3a1d91aa..000000000
--- a/res/drawable-ldrtl-hdpi/ic_wifi_lock_signal_2.png
+++ /dev/null
diff --git a/res/drawable-ldrtl-hdpi/ic_wifi_lock_signal_3.png b/res/drawable-ldrtl-hdpi/ic_wifi_lock_signal_3.png
deleted file mode 100644
index 36ea00156..000000000
--- a/res/drawable-ldrtl-hdpi/ic_wifi_lock_signal_3.png
+++ /dev/null
diff --git a/res/drawable-ldrtl-hdpi/ic_wifi_lock_signal_4.png b/res/drawable-ldrtl-hdpi/ic_wifi_lock_signal_4.png
deleted file mode 100644
index 6c4f25254..000000000
--- a/res/drawable-ldrtl-hdpi/ic_wifi_lock_signal_4.png
+++ /dev/null
diff --git a/res/drawable-ldrtl-mdpi/ic_wifi_lock_signal_1.png b/res/drawable-ldrtl-mdpi/ic_wifi_lock_signal_1.png
deleted file mode 100644
index 3f635f8b3..000000000
--- a/res/drawable-ldrtl-mdpi/ic_wifi_lock_signal_1.png
+++ /dev/null
diff --git a/res/drawable-ldrtl-mdpi/ic_wifi_lock_signal_2.png b/res/drawable-ldrtl-mdpi/ic_wifi_lock_signal_2.png
deleted file mode 100644
index 04aae2d38..000000000
--- a/res/drawable-ldrtl-mdpi/ic_wifi_lock_signal_2.png
+++ /dev/null
diff --git a/res/drawable-ldrtl-mdpi/ic_wifi_lock_signal_3.png b/res/drawable-ldrtl-mdpi/ic_wifi_lock_signal_3.png
deleted file mode 100644
index 17609df47..000000000
--- a/res/drawable-ldrtl-mdpi/ic_wifi_lock_signal_3.png
+++ /dev/null
diff --git a/res/drawable-ldrtl-mdpi/ic_wifi_lock_signal_4.png b/res/drawable-ldrtl-mdpi/ic_wifi_lock_signal_4.png
deleted file mode 100644
index 90a8e27d9..000000000
--- a/res/drawable-ldrtl-mdpi/ic_wifi_lock_signal_4.png
+++ /dev/null
diff --git a/res/drawable-ldrtl-xhdpi/ic_wifi_lock_signal_1.png b/res/drawable-ldrtl-xhdpi/ic_wifi_lock_signal_1.png
deleted file mode 100644
index 0e124bd67..000000000
--- a/res/drawable-ldrtl-xhdpi/ic_wifi_lock_signal_1.png
+++ /dev/null
diff --git a/res/drawable-ldrtl-xhdpi/ic_wifi_lock_signal_2.png b/res/drawable-ldrtl-xhdpi/ic_wifi_lock_signal_2.png
deleted file mode 100644
index d97d5d43d..000000000
--- a/res/drawable-ldrtl-xhdpi/ic_wifi_lock_signal_2.png
+++ /dev/null
diff --git a/res/drawable-ldrtl-xhdpi/ic_wifi_lock_signal_3.png b/res/drawable-ldrtl-xhdpi/ic_wifi_lock_signal_3.png
deleted file mode 100644
index 99a8384fb..000000000
--- a/res/drawable-ldrtl-xhdpi/ic_wifi_lock_signal_3.png
+++ /dev/null
diff --git a/res/drawable-ldrtl-xhdpi/ic_wifi_lock_signal_4.png b/res/drawable-ldrtl-xhdpi/ic_wifi_lock_signal_4.png
deleted file mode 100644
index 40307f82f..000000000
--- a/res/drawable-ldrtl-xhdpi/ic_wifi_lock_signal_4.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_menu_add.png b/res/drawable-mdpi/ic_menu_add.png
deleted file mode 100644
index 15ffadd36..000000000
--- a/res/drawable-mdpi/ic_menu_add.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_menu_add_dark.png b/res/drawable-mdpi/ic_menu_add_dark.png
new file mode 100644
index 000000000..e6add2b29
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_add_dark.png
diff --git a/res/drawable-mdpi/ic_menu_add_light.png b/res/drawable-mdpi/ic_menu_add_light.png
new file mode 100644
index 000000000..8b558100e
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_add_light.png
diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_1.png b/res/drawable-mdpi/ic_wifi_lock_signal_1.png
deleted file mode 100644
index e8ac823bf..000000000
--- a/res/drawable-mdpi/ic_wifi_lock_signal_1.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_1_dark.png b/res/drawable-mdpi/ic_wifi_lock_signal_1_dark.png
new file mode 100644
index 000000000..d6868aa28
--- /dev/null
+++ b/res/drawable-mdpi/ic_wifi_lock_signal_1_dark.png
diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_1_light.png b/res/drawable-mdpi/ic_wifi_lock_signal_1_light.png
new file mode 100644
index 000000000..eb41a107b
--- /dev/null
+++ b/res/drawable-mdpi/ic_wifi_lock_signal_1_light.png
diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_2.png b/res/drawable-mdpi/ic_wifi_lock_signal_2.png
deleted file mode 100644
index 6034a89b6..000000000
--- a/res/drawable-mdpi/ic_wifi_lock_signal_2.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_2_dark.png b/res/drawable-mdpi/ic_wifi_lock_signal_2_dark.png
new file mode 100644
index 000000000..ada9739f5
--- /dev/null
+++ b/res/drawable-mdpi/ic_wifi_lock_signal_2_dark.png
diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_2_light.png b/res/drawable-mdpi/ic_wifi_lock_signal_2_light.png
new file mode 100644
index 000000000..ff041c42c
--- /dev/null
+++ b/res/drawable-mdpi/ic_wifi_lock_signal_2_light.png
diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_3.png b/res/drawable-mdpi/ic_wifi_lock_signal_3.png
deleted file mode 100644
index 0089a55d0..000000000
--- a/res/drawable-mdpi/ic_wifi_lock_signal_3.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_3_dark.png b/res/drawable-mdpi/ic_wifi_lock_signal_3_dark.png
new file mode 100644
index 000000000..0a294ff2d
--- /dev/null
+++ b/res/drawable-mdpi/ic_wifi_lock_signal_3_dark.png
diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_3_light.png b/res/drawable-mdpi/ic_wifi_lock_signal_3_light.png
new file mode 100644
index 000000000..98cf1ff8d
--- /dev/null
+++ b/res/drawable-mdpi/ic_wifi_lock_signal_3_light.png
diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_4.png b/res/drawable-mdpi/ic_wifi_lock_signal_4.png
deleted file mode 100644
index ae02f2428..000000000
--- a/res/drawable-mdpi/ic_wifi_lock_signal_4.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_4_dark.png b/res/drawable-mdpi/ic_wifi_lock_signal_4_dark.png
new file mode 100644
index 000000000..ccda2c772
--- /dev/null
+++ b/res/drawable-mdpi/ic_wifi_lock_signal_4_dark.png
diff --git a/res/drawable-mdpi/ic_wifi_lock_signal_4_light.png b/res/drawable-mdpi/ic_wifi_lock_signal_4_light.png
new file mode 100644
index 000000000..83af4de06
--- /dev/null
+++ b/res/drawable-mdpi/ic_wifi_lock_signal_4_light.png
diff --git a/res/drawable-mdpi/ic_wifi_signal_1.png b/res/drawable-mdpi/ic_wifi_signal_1.png
deleted file mode 100644
index e99a47d25..000000000
--- a/res/drawable-mdpi/ic_wifi_signal_1.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_wifi_signal_1_dark.png b/res/drawable-mdpi/ic_wifi_signal_1_dark.png
new file mode 100644
index 000000000..6715c5d89
--- /dev/null
+++ b/res/drawable-mdpi/ic_wifi_signal_1_dark.png
diff --git a/res/drawable-mdpi/ic_wifi_signal_1_light.png b/res/drawable-mdpi/ic_wifi_signal_1_light.png
new file mode 100644
index 000000000..eec60c0a9
--- /dev/null
+++ b/res/drawable-mdpi/ic_wifi_signal_1_light.png
diff --git a/res/drawable-mdpi/ic_wifi_signal_2.png b/res/drawable-mdpi/ic_wifi_signal_2.png
deleted file mode 100644
index 79516ea19..000000000
--- a/res/drawable-mdpi/ic_wifi_signal_2.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_wifi_signal_2_dark.png b/res/drawable-mdpi/ic_wifi_signal_2_dark.png
new file mode 100644
index 000000000..e31d19f04
--- /dev/null
+++ b/res/drawable-mdpi/ic_wifi_signal_2_dark.png
diff --git a/res/drawable-mdpi/ic_wifi_signal_2_light.png b/res/drawable-mdpi/ic_wifi_signal_2_light.png
new file mode 100644
index 000000000..7caa144d0
--- /dev/null
+++ b/res/drawable-mdpi/ic_wifi_signal_2_light.png
diff --git a/res/drawable-mdpi/ic_wifi_signal_3.png b/res/drawable-mdpi/ic_wifi_signal_3.png
deleted file mode 100644
index f2af11d38..000000000
--- a/res/drawable-mdpi/ic_wifi_signal_3.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_wifi_signal_3_dark.png b/res/drawable-mdpi/ic_wifi_signal_3_dark.png
new file mode 100644
index 000000000..bd6a1e8c0
--- /dev/null
+++ b/res/drawable-mdpi/ic_wifi_signal_3_dark.png
diff --git a/res/drawable-mdpi/ic_wifi_signal_3_light.png b/res/drawable-mdpi/ic_wifi_signal_3_light.png
new file mode 100644
index 000000000..7be251517
--- /dev/null
+++ b/res/drawable-mdpi/ic_wifi_signal_3_light.png
diff --git a/res/drawable-mdpi/ic_wifi_signal_4.png b/res/drawable-mdpi/ic_wifi_signal_4.png
deleted file mode 100644
index 3d4288ea2..000000000
--- a/res/drawable-mdpi/ic_wifi_signal_4.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_wifi_signal_4_dark.png b/res/drawable-mdpi/ic_wifi_signal_4_dark.png
new file mode 100644
index 000000000..af125c246
--- /dev/null
+++ b/res/drawable-mdpi/ic_wifi_signal_4_dark.png
diff --git a/res/drawable-mdpi/ic_wifi_signal_4_light.png b/res/drawable-mdpi/ic_wifi_signal_4_light.png
new file mode 100644
index 000000000..658761a41
--- /dev/null
+++ b/res/drawable-mdpi/ic_wifi_signal_4_light.png
diff --git a/res/drawable-mdpi/ic_wps.png b/res/drawable-mdpi/ic_wps.png
deleted file mode 100644
index e522e9774..000000000
--- a/res/drawable-mdpi/ic_wps.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_wps_dark.png b/res/drawable-mdpi/ic_wps_dark.png
new file mode 100644
index 000000000..77d73a808
--- /dev/null
+++ b/res/drawable-mdpi/ic_wps_dark.png
diff --git a/res/drawable-mdpi/ic_wps_light.png b/res/drawable-mdpi/ic_wps_light.png
new file mode 100644
index 000000000..ef560fa5c
--- /dev/null
+++ b/res/drawable-mdpi/ic_wps_light.png
diff --git a/res/drawable-xhdpi/ic_menu_add.png b/res/drawable-xhdpi/ic_menu_add.png
deleted file mode 100644
index 420510e93..000000000
--- a/res/drawable-xhdpi/ic_menu_add.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_menu_add_dark.png b/res/drawable-xhdpi/ic_menu_add_dark.png
new file mode 100644
index 000000000..6e2e18a04
--- /dev/null
+++ b/res/drawable-xhdpi/ic_menu_add_dark.png
diff --git a/res/drawable-xhdpi/ic_menu_add_light.png b/res/drawable-xhdpi/ic_menu_add_light.png
new file mode 100644
index 000000000..4109b2ca6
--- /dev/null
+++ b/res/drawable-xhdpi/ic_menu_add_light.png
diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_1.png b/res/drawable-xhdpi/ic_wifi_lock_signal_1.png
deleted file mode 100644
index 8b8cb03d3..000000000
--- a/res/drawable-xhdpi/ic_wifi_lock_signal_1.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_1_dark.png b/res/drawable-xhdpi/ic_wifi_lock_signal_1_dark.png
new file mode 100644
index 000000000..c2be32fc6
--- /dev/null
+++ b/res/drawable-xhdpi/ic_wifi_lock_signal_1_dark.png
diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_1_light.png b/res/drawable-xhdpi/ic_wifi_lock_signal_1_light.png
new file mode 100644
index 000000000..57c8fb29c
--- /dev/null
+++ b/res/drawable-xhdpi/ic_wifi_lock_signal_1_light.png
diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_2.png b/res/drawable-xhdpi/ic_wifi_lock_signal_2.png
deleted file mode 100644
index 411269c53..000000000
--- a/res/drawable-xhdpi/ic_wifi_lock_signal_2.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_2_dark.png b/res/drawable-xhdpi/ic_wifi_lock_signal_2_dark.png
new file mode 100644
index 000000000..9e65730d0
--- /dev/null
+++ b/res/drawable-xhdpi/ic_wifi_lock_signal_2_dark.png
diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_2_light.png b/res/drawable-xhdpi/ic_wifi_lock_signal_2_light.png
new file mode 100644
index 000000000..db783f81c
--- /dev/null
+++ b/res/drawable-xhdpi/ic_wifi_lock_signal_2_light.png
diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_3.png b/res/drawable-xhdpi/ic_wifi_lock_signal_3.png
deleted file mode 100644
index f0d92a055..000000000
--- a/res/drawable-xhdpi/ic_wifi_lock_signal_3.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_3_dark.png b/res/drawable-xhdpi/ic_wifi_lock_signal_3_dark.png
new file mode 100644
index 000000000..5a12175f5
--- /dev/null
+++ b/res/drawable-xhdpi/ic_wifi_lock_signal_3_dark.png
diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_3_light.png b/res/drawable-xhdpi/ic_wifi_lock_signal_3_light.png
new file mode 100644
index 000000000..8b7df74d8
--- /dev/null
+++ b/res/drawable-xhdpi/ic_wifi_lock_signal_3_light.png
diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_4.png b/res/drawable-xhdpi/ic_wifi_lock_signal_4.png
deleted file mode 100644
index d26694d7a..000000000
--- a/res/drawable-xhdpi/ic_wifi_lock_signal_4.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_4_dark.png b/res/drawable-xhdpi/ic_wifi_lock_signal_4_dark.png
new file mode 100644
index 000000000..4d2942c69
--- /dev/null
+++ b/res/drawable-xhdpi/ic_wifi_lock_signal_4_dark.png
diff --git a/res/drawable-xhdpi/ic_wifi_lock_signal_4_light.png b/res/drawable-xhdpi/ic_wifi_lock_signal_4_light.png
new file mode 100644
index 000000000..bf26501a1
--- /dev/null
+++ b/res/drawable-xhdpi/ic_wifi_lock_signal_4_light.png
diff --git a/res/drawable-xhdpi/ic_wifi_signal_1.png b/res/drawable-xhdpi/ic_wifi_signal_1.png
deleted file mode 100644
index 3fded085f..000000000
--- a/res/drawable-xhdpi/ic_wifi_signal_1.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_wifi_signal_1_dark.png b/res/drawable-xhdpi/ic_wifi_signal_1_dark.png
new file mode 100644
index 000000000..bf1634cd1
--- /dev/null
+++ b/res/drawable-xhdpi/ic_wifi_signal_1_dark.png
diff --git a/res/drawable-xhdpi/ic_wifi_signal_1_light.png b/res/drawable-xhdpi/ic_wifi_signal_1_light.png
new file mode 100644
index 000000000..0f58f3d5f
--- /dev/null
+++ b/res/drawable-xhdpi/ic_wifi_signal_1_light.png
diff --git a/res/drawable-xhdpi/ic_wifi_signal_2.png b/res/drawable-xhdpi/ic_wifi_signal_2.png
deleted file mode 100644
index 3a32026d3..000000000
--- a/res/drawable-xhdpi/ic_wifi_signal_2.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_wifi_signal_2_dark.png b/res/drawable-xhdpi/ic_wifi_signal_2_dark.png
new file mode 100644
index 000000000..5345ff30b
--- /dev/null
+++ b/res/drawable-xhdpi/ic_wifi_signal_2_dark.png
diff --git a/res/drawable-xhdpi/ic_wifi_signal_2_light.png b/res/drawable-xhdpi/ic_wifi_signal_2_light.png
new file mode 100644
index 000000000..c5bcc7e6a
--- /dev/null
+++ b/res/drawable-xhdpi/ic_wifi_signal_2_light.png
diff --git a/res/drawable-xhdpi/ic_wifi_signal_3.png b/res/drawable-xhdpi/ic_wifi_signal_3.png
deleted file mode 100644
index 161694093..000000000
--- a/res/drawable-xhdpi/ic_wifi_signal_3.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_wifi_signal_3_dark.png b/res/drawable-xhdpi/ic_wifi_signal_3_dark.png
new file mode 100644
index 000000000..8cc3a6ea1
--- /dev/null
+++ b/res/drawable-xhdpi/ic_wifi_signal_3_dark.png
diff --git a/res/drawable-xhdpi/ic_wifi_signal_3_light.png b/res/drawable-xhdpi/ic_wifi_signal_3_light.png
new file mode 100644
index 000000000..1cdacc5af
--- /dev/null
+++ b/res/drawable-xhdpi/ic_wifi_signal_3_light.png
diff --git a/res/drawable-xhdpi/ic_wifi_signal_4.png b/res/drawable-xhdpi/ic_wifi_signal_4.png
deleted file mode 100644
index 8b256c325..000000000
--- a/res/drawable-xhdpi/ic_wifi_signal_4.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_wifi_signal_4_dark.png b/res/drawable-xhdpi/ic_wifi_signal_4_dark.png
new file mode 100644
index 000000000..c9aa4e581
--- /dev/null
+++ b/res/drawable-xhdpi/ic_wifi_signal_4_dark.png
diff --git a/res/drawable-xhdpi/ic_wifi_signal_4_light.png b/res/drawable-xhdpi/ic_wifi_signal_4_light.png
new file mode 100644
index 000000000..3cf1c8da2
--- /dev/null
+++ b/res/drawable-xhdpi/ic_wifi_signal_4_light.png
diff --git a/res/drawable-xhdpi/ic_wps.png b/res/drawable-xhdpi/ic_wps.png
deleted file mode 100644
index 71308f213..000000000
--- a/res/drawable-xhdpi/ic_wps.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_wps_dark.png b/res/drawable-xhdpi/ic_wps_dark.png
new file mode 100644
index 000000000..3ea4a3b6b
--- /dev/null
+++ b/res/drawable-xhdpi/ic_wps_dark.png
diff --git a/res/drawable-xhdpi/ic_wps_light.png b/res/drawable-xhdpi/ic_wps_light.png
new file mode 100644
index 000000000..f913d2c00
--- /dev/null
+++ b/res/drawable-xhdpi/ic_wps_light.png
diff --git a/res/drawable-xxhdpi/ic_menu_add_dark.png b/res/drawable-xxhdpi/ic_menu_add_dark.png
new file mode 100644
index 000000000..5b4923fda
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_menu_add_dark.png
diff --git a/res/drawable-xxhdpi/ic_menu_add_light.png b/res/drawable-xxhdpi/ic_menu_add_light.png
new file mode 100644
index 000000000..767b80801
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_menu_add_light.png
diff --git a/res/drawable-xxhdpi/ic_wifi_lock_signal_1_dark.png b/res/drawable-xxhdpi/ic_wifi_lock_signal_1_dark.png
new file mode 100644
index 000000000..20739fab9
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_wifi_lock_signal_1_dark.png
diff --git a/res/drawable-xxhdpi/ic_wifi_lock_signal_1_light.png b/res/drawable-xxhdpi/ic_wifi_lock_signal_1_light.png
new file mode 100644
index 000000000..c13edffdb
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_wifi_lock_signal_1_light.png
diff --git a/res/drawable-xxhdpi/ic_wifi_lock_signal_2_dark.png b/res/drawable-xxhdpi/ic_wifi_lock_signal_2_dark.png
new file mode 100644
index 000000000..9cd652a4d
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_wifi_lock_signal_2_dark.png
diff --git a/res/drawable-xxhdpi/ic_wifi_lock_signal_2_light.png b/res/drawable-xxhdpi/ic_wifi_lock_signal_2_light.png
new file mode 100644
index 000000000..cb7f0c254
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_wifi_lock_signal_2_light.png
diff --git a/res/drawable-xxhdpi/ic_wifi_lock_signal_3_dark.png b/res/drawable-xxhdpi/ic_wifi_lock_signal_3_dark.png
new file mode 100644
index 000000000..99097df39
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_wifi_lock_signal_3_dark.png
diff --git a/res/drawable-xxhdpi/ic_wifi_lock_signal_3_light.png b/res/drawable-xxhdpi/ic_wifi_lock_signal_3_light.png
new file mode 100644
index 000000000..a0961f4c6
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_wifi_lock_signal_3_light.png
diff --git a/res/drawable-xxhdpi/ic_wifi_lock_signal_4_dark.png b/res/drawable-xxhdpi/ic_wifi_lock_signal_4_dark.png
new file mode 100644
index 000000000..6c00a9c9c
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_wifi_lock_signal_4_dark.png
diff --git a/res/drawable-xxhdpi/ic_wifi_lock_signal_4_light.png b/res/drawable-xxhdpi/ic_wifi_lock_signal_4_light.png
new file mode 100644
index 000000000..74e1a4011
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_wifi_lock_signal_4_light.png
diff --git a/res/drawable-xxhdpi/ic_wifi_signal_1_dark.png b/res/drawable-xxhdpi/ic_wifi_signal_1_dark.png
new file mode 100644
index 000000000..b50fda532
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_wifi_signal_1_dark.png
diff --git a/res/drawable-xxhdpi/ic_wifi_signal_1_light.png b/res/drawable-xxhdpi/ic_wifi_signal_1_light.png
new file mode 100644
index 000000000..f6fad9d94
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_wifi_signal_1_light.png
diff --git a/res/drawable-xxhdpi/ic_wifi_signal_2_dark.png b/res/drawable-xxhdpi/ic_wifi_signal_2_dark.png
new file mode 100644
index 000000000..f90602321
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_wifi_signal_2_dark.png
diff --git a/res/drawable-xxhdpi/ic_wifi_signal_2_light.png b/res/drawable-xxhdpi/ic_wifi_signal_2_light.png
new file mode 100644
index 000000000..7f5859b40
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_wifi_signal_2_light.png
diff --git a/res/drawable-xxhdpi/ic_wifi_signal_3_dark.png b/res/drawable-xxhdpi/ic_wifi_signal_3_dark.png
new file mode 100644
index 000000000..ef4095290
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_wifi_signal_3_dark.png
diff --git a/res/drawable-xxhdpi/ic_wifi_signal_3_light.png b/res/drawable-xxhdpi/ic_wifi_signal_3_light.png
new file mode 100644
index 000000000..e3151b33f
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_wifi_signal_3_light.png
diff --git a/res/drawable-xxhdpi/ic_wifi_signal_4_dark.png b/res/drawable-xxhdpi/ic_wifi_signal_4_dark.png
new file mode 100644
index 000000000..13f942511
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_wifi_signal_4_dark.png
diff --git a/res/drawable-xxhdpi/ic_wifi_signal_4_light.png b/res/drawable-xxhdpi/ic_wifi_signal_4_light.png
new file mode 100644
index 000000000..96e25e5f5
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_wifi_signal_4_light.png
diff --git a/res/drawable-xxhdpi/ic_wps_dark.png b/res/drawable-xxhdpi/ic_wps_dark.png
new file mode 100644
index 000000000..8b38db86f
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_wps_dark.png
diff --git a/res/drawable-xxhdpi/ic_wps_light.png b/res/drawable-xxhdpi/ic_wps_light.png
new file mode 100644
index 000000000..00841755b
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_wps_light.png
diff --git a/res/drawable/wifi_signal.xml b/res/drawable/wifi_signal_dark.xml
index 86c1ab099..b578f4776 100644
--- a/res/drawable/wifi_signal.xml
+++ b/res/drawable/wifi_signal_dark.xml
@@ -16,7 +16,7 @@
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
-    <item settings:state_encrypted="true" android:drawable="@drawable/wifi_signal_lock" />
-    <item settings:state_encrypted="false" android:drawable="@drawable/wifi_signal_open" />
+    <item settings:state_encrypted="true" android:drawable="@drawable/wifi_signal_lock_dark" />
+    <item settings:state_encrypted="false" android:drawable="@drawable/wifi_signal_open_dark" />
 </selector>
 
diff --git a/res/drawable/wifi_signal_light.xml b/res/drawable/wifi_signal_light.xml
new file mode 100644
index 000000000..f1f74e310
--- /dev/null
+++ b/res/drawable/wifi_signal_light.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 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"
+        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
+    <item settings:state_encrypted="true" android:drawable="@drawable/wifi_signal_lock_light" />
+    <item settings:state_encrypted="false" android:drawable="@drawable/wifi_signal_open_light" />
+</selector>
+
diff --git a/res/drawable/wifi_signal_lock_dark.xml b/res/drawable/wifi_signal_lock_dark.xml
new file mode 100644
index 000000000..37226a808
--- /dev/null
+++ b/res/drawable/wifi_signal_lock_dark.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 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.
+-->
+
+<level-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:maxLevel="0" android:drawable="@drawable/ic_wifi_lock_signal_1_dark" />
+    <item android:maxLevel="1" android:drawable="@drawable/ic_wifi_lock_signal_2_dark" />
+    <item android:maxLevel="2" android:drawable="@drawable/ic_wifi_lock_signal_3_dark" />
+    <item android:maxLevel="3" android:drawable="@drawable/ic_wifi_lock_signal_4_dark" />
+</level-list>
+
diff --git a/res/drawable/wifi_signal_lock_light.xml b/res/drawable/wifi_signal_lock_light.xml
new file mode 100644
index 000000000..bf2d3604c
--- /dev/null
+++ b/res/drawable/wifi_signal_lock_light.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 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.
+-->
+
+<level-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:maxLevel="0" android:drawable="@drawable/ic_wifi_lock_signal_1_light" />
+    <item android:maxLevel="1" android:drawable="@drawable/ic_wifi_lock_signal_2_light" />
+    <item android:maxLevel="2" android:drawable="@drawable/ic_wifi_lock_signal_3_light" />
+    <item android:maxLevel="3" android:drawable="@drawable/ic_wifi_lock_signal_4_light" />
+</level-list>
+
diff --git a/res/drawable/wifi_signal_lock.xml b/res/drawable/wifi_signal_open_dark.xml
index 2ad6d91d2..d696983dc 100644
--- a/res/drawable/wifi_signal_lock.xml
+++ b/res/drawable/wifi_signal_open_dark.xml
@@ -15,9 +15,9 @@
 -->
 
 <level-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:maxLevel="0" android:drawable="@drawable/ic_wifi_lock_signal_1" />
-    <item android:maxLevel="1" android:drawable="@drawable/ic_wifi_lock_signal_2" />
-    <item android:maxLevel="2" android:drawable="@drawable/ic_wifi_lock_signal_3" />
-    <item android:maxLevel="3" android:drawable="@drawable/ic_wifi_lock_signal_4" />
+    <item android:maxLevel="0" android:drawable="@drawable/ic_wifi_signal_1_dark" />
+    <item android:maxLevel="1" android:drawable="@drawable/ic_wifi_signal_2_dark" />
+    <item android:maxLevel="2" android:drawable="@drawable/ic_wifi_signal_3_dark" />
+    <item android:maxLevel="3" android:drawable="@drawable/ic_wifi_signal_4_dark" />
 </level-list>
 
diff --git a/res/drawable/wifi_signal_open.xml b/res/drawable/wifi_signal_open_light.xml
index b506dd334..c54e9e93d 100644
--- a/res/drawable/wifi_signal_open.xml
+++ b/res/drawable/wifi_signal_open_light.xml
@@ -15,9 +15,9 @@
 -->
 
 <level-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:maxLevel="0" android:drawable="@drawable/ic_wifi_signal_1" />
-    <item android:maxLevel="1" android:drawable="@drawable/ic_wifi_signal_2" />
-    <item android:maxLevel="2" android:drawable="@drawable/ic_wifi_signal_3" />
-    <item android:maxLevel="3" android:drawable="@drawable/ic_wifi_signal_4" />
+    <item android:maxLevel="0" android:drawable="@drawable/ic_wifi_signal_1_light" />
+    <item android:maxLevel="1" android:drawable="@drawable/ic_wifi_signal_2_light" />
+    <item android:maxLevel="2" android:drawable="@drawable/ic_wifi_signal_3_light" />
+    <item android:maxLevel="3" android:drawable="@drawable/ic_wifi_signal_4_light" />
 </level-list>
 
diff --git a/res/layout/preference_widget_wifi_signal.xml b/res/layout/preference_widget_wifi_signal.xml
index 6df203c3a..c2541a5f6 100644
--- a/res/layout/preference_widget_wifi_signal.xml
+++ b/res/layout/preference_widget_wifi_signal.xml
@@ -15,8 +15,8 @@
 -->
 
 <ImageView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/signal" 
+    android:id="@+id/signal"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:src="@drawable/wifi_signal"
+    android:src="?attr/wifi_signal"
     android:contentDescription="@null" />
diff --git a/res/layout/setup_preference.xml b/res/layout/setup_preference.xml
index 7e917d885..d0cbc02d6 100644
--- a/res/layout/setup_preference.xml
+++ b/res/layout/setup_preference.xml
@@ -33,7 +33,6 @@
             android:id="@+id/title_bar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_alignBottom="@id/title"
             android:gravity="bottom"
             android:orientation="horizontal">
             <TextView
@@ -52,7 +51,7 @@
                 android:layout_marginStart="8dip"
                 android:layout_marginEnd="8dip"
                 android:layout_marginBottom="8dip"
-                android:src="@*android:drawable/ic_menu_moreoverflow_holo_dark"
+                android:src="?attr/ic_menu_moreoverflow"
                 android:background="?android:attr/actionBarItemBackground"
                 android:contentDescription="@string/wifi_menu_more_options" />
 
@@ -124,7 +123,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:src="@drawable/ic_menu_add" />
+                android:src="?attr/ic_menu_add" />
 
             <TextView
                 android:id="@+id/other"
diff --git a/res/layout/wifi_wps_dialog.xml b/res/layout/wifi_wps_dialog.xml
index 1c5713a91..a86823d66 100644
--- a/res/layout/wifi_wps_dialog.xml
+++ b/res/layout/wifi_wps_dialog.xml
@@ -35,7 +35,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:layout_marginTop="8dip"
-                android:src="@drawable/ic_wps" />
+                android:src="?attr/ic_wps" />
 
         <ProgressBar
                 android:id="@+id/wps_timeout_bar"
diff --git a/res/menu/vpn.xml b/res/menu/vpn.xml
index dd8f64cbe..3e0a78804 100644
--- a/res/menu/vpn.xml
+++ b/res/menu/vpn.xml
@@ -18,7 +18,7 @@
     <item
         android:id="@+id/vpn_create"
         android:title="@string/vpn_create"
-        android:icon="@drawable/ic_menu_add"
+        android:icon="?attr/ic_menu_add"
         android:showAsAction="always" />
     <item
         android:id="@+id/vpn_lockdown"
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 28c199e28..b8b1ad2be 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -15,24 +15,45 @@
 -->
 
 <resources>
+    <attr name="ic_menu_add" format="reference" />
+    <attr name="ic_menu_moreoverflow" format="reference" />
+    <attr name="ic_wps" format="reference" />
+    <attr name="wifi_signal" format="reference" />
+
     <style name="SetupWizardWifiTheme" parent="android:Theme.Holo.NoActionBar">
         <item name="android:windowSoftInputMode">adjustPan</item>
         <item name="@*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item>
         <item name="android:alertDialogTheme">@style/Theme.WifiDialog</item>
+        <item name="ic_menu_add">@drawable/ic_menu_add_dark</item>
+        <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_holo_dark</item>
+        <item name="ic_wps">@drawable/ic_wps_dark</item>
+        <item name="wifi_signal">@drawable/wifi_signal_dark</item>
     </style>
 
     <style name="SetupWizardWifiTheme.Light" parent="android:Theme.Holo.Light.NoActionBar">
         <item name="android:windowSoftInputMode">adjustPan</item>
         <item name="@*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item>
         <item name="android:alertDialogTheme">@style/Theme.Light.WifiDialog</item>
-        </style>
+        <item name="ic_menu_add">@drawable/ic_menu_add_light</item>
+        <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_holo_light</item>
+        <item name="ic_wps">@drawable/ic_wps_light</item>
+        <item name="wifi_signal">@drawable/wifi_signal_light</item>
+    </style>
 
     <style name="Theme.WifiDialog" parent="@*android:style/Theme.Holo.Dialog.Alert">
         <item name="android:windowSoftInputMode">adjustResize</item>
+        <item name="ic_menu_add">@drawable/ic_menu_add_dark</item>
+        <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_holo_dark</item>
+        <item name="ic_wps">@drawable/ic_wps_dark</item>
+        <item name="wifi_signal">@drawable/wifi_signal_dark</item>
     </style>
 
     <style name="Theme.Light.WifiDialog" parent="@*android:style/Theme.Holo.Light.Dialog.Alert">
         <item name="android:windowSoftInputMode">adjustResize</item>
+        <item name="ic_menu_add">@drawable/ic_menu_add_light</item>
+        <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_holo_light</item>
+        <item name="ic_wps">@drawable/ic_wps_light</item>
+        <item name="wifi_signal">@drawable/wifi_signal_light</item>
     </style>
 
     <style name="Theme.Settings" parent="@android:style/Theme.Holo">
@@ -42,5 +63,9 @@
         <item name="@*android:preferenceFragmentListStyle">@style/PreferenceFragmentListSinglePane</item>
         <item name="@*android:preferenceFragmentPaddingSide">@dimen/settings_side_margin</item>
         <item name="apnPreferenceStyle">@style/ApnPreference</item>
+        <item name="ic_menu_add">@drawable/ic_menu_add_dark</item>
+        <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_holo_dark</item>
+        <item name="ic_wps">@drawable/ic_wps_dark</item>
+        <item name="wifi_signal">@drawable/wifi_signal_dark</item>
     </style>
 </resources>
diff --git a/res/xml/settings_headers.xml b/res/xml/settings_headers.xml
index 65c42efbb..1d27a35af 100644
--- a/res/xml/settings_headers.xml
+++ b/res/xml/settings_headers.xml
@@ -158,7 +158,7 @@
     <header
             android:id="@+id/account_add"
             android:title="@string/add_account_label"
-            android:icon="@drawable/ic_menu_add">
+            android:icon="@drawable/ic_menu_add_dark">
         <intent
             android:action="android.settings.ADD_ACCOUNT_SETTINGS"/>
     </header>
diff --git a/res/xml/user_settings.xml b/res/xml/user_settings.xml
index cf393b35d..3a0ab742d 100644
--- a/res/xml/user_settings.xml
+++ b/res/xml/user_settings.xml
@@ -26,6 +26,6 @@
     <Preference
             android:key="user_add"
             android:title="@string/user_add_user_menu"
-            android:icon="@drawable/ic_menu_add" />
+            android:icon="@drawable/ic_menu_add_dark" />
 
 </PreferenceScreen>
diff --git a/src/com/android/settings/UserDictionarySettings.java b/src/com/android/settings/UserDictionarySettings.java
index 9f6df5072..da120048d 100644
--- a/src/com/android/settings/UserDictionarySettings.java
+++ b/src/com/android/settings/UserDictionarySettings.java
@@ -16,6 +16,9 @@
 
 package com.android.settings;
 
+import com.android.settings.inputmethod.UserDictionaryAddWordContents;
+import com.android.settings.inputmethod.UserDictionarySettingsUtils;
+
 import android.app.ListFragment;
 import android.content.ContentResolver;
 import android.content.Context;
@@ -37,9 +40,6 @@ import android.widget.SectionIndexer;
 import android.widget.SimpleCursorAdapter;
 import android.widget.TextView;
 
-import com.android.settings.inputmethod.UserDictionaryAddWordContents;
-import com.android.settings.inputmethod.UserDictionarySettingsUtils;
-
 import java.util.Locale;
 
 public class UserDictionarySettings extends ListFragment {
@@ -165,7 +165,7 @@ public class UserDictionarySettings extends ListFragment {
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         MenuItem actionItem =
                 menu.add(0, OPTIONS_MENU_ADD, 0, R.string.user_dict_settings_add_menu_title)
-                .setIcon(R.drawable.ic_menu_add);
+                .setIcon(R.drawable.ic_menu_add_dark);
         actionItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM |
                 MenuItem.SHOW_AS_ACTION_WITH_TEXT);
     }
@@ -236,8 +236,9 @@ public class UserDictionarySettings extends ListFragment {
 
         private AlphabetIndexer mIndexer;
 
-        private ViewBinder mViewBinder = new ViewBinder() {
+        private final ViewBinder mViewBinder = new ViewBinder() {
 
+            @Override
             public boolean setViewValue(View v, Cursor c, int columnIndex) {
                 if (columnIndex == INDEX_SHORTCUT) {
                     final String shortcut = c.getString(INDEX_SHORTCUT);
@@ -268,14 +269,17 @@ public class UserDictionarySettings extends ListFragment {
             setViewBinder(mViewBinder);
         }
 
+        @Override
         public int getPositionForSection(int section) {
             return null == mIndexer ? 0 : mIndexer.getPositionForSection(section);
         }
 
+        @Override
         public int getSectionForPosition(int position) {
             return null == mIndexer ? 0 : mIndexer.getSectionForPosition(position);
         }
 
+        @Override
         public Object[] getSections() {
             return null == mIndexer ? null : mIndexer.getSections();
         }
diff --git a/src/com/android/settings/wifi/AccessPoint.java b/src/com/android/settings/wifi/AccessPoint.java
index 20146eb27..c4d1f7c65 100644
--- a/src/com/android/settings/wifi/AccessPoint.java
+++ b/src/com/android/settings/wifi/AccessPoint.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.wifi;
 
+import com.android.settings.R;
+
 import android.content.Context;
 import android.net.NetworkInfo.DetailedState;
 import android.net.wifi.ScanResult;
@@ -29,8 +31,6 @@ import android.util.Log;
 import android.view.View;
 import android.widget.ImageView;
 
-import com.android.settings.R;
-
 class AccessPoint extends Preference {
     static final String TAG = "Settings.AccessPoint";
 
@@ -211,7 +211,8 @@ class AccessPoint extends Preference {
             signal.setImageDrawable(null);
         } else {
             signal.setImageLevel(getLevel());
-            signal.setImageResource(R.drawable.wifi_signal);
+            signal.setImageDrawable(getContext().getTheme().obtainStyledAttributes(
+                    new int[] {R.attr.wifi_signal}).getDrawable(0));
             signal.setImageState((security != SECURITY_NONE) ?
                     STATE_SECURED : STATE_NONE, true);
         }
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index 9fc101070..1caf58bcd 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -19,12 +19,9 @@ package com.android.settings.wifi;
 import static android.net.wifi.WifiConfiguration.INVALID_NETWORK_ID;
 import static android.os.UserManager.DISALLOW_CONFIG_WIFI;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicBoolean;
+import com.android.settings.R;
+import com.android.settings.RestrictedSettingsFragment;
+import com.android.settings.wifi.p2p.WifiP2pSettings;
 
 import android.app.ActionBar;
 import android.app.Activity;
@@ -37,6 +34,7 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.pm.PackageManager;
 import android.content.res.Resources;
+import android.content.res.TypedArray;
 import android.location.LocationManager;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
@@ -76,9 +74,12 @@ import android.widget.Switch;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.android.settings.R;
-import com.android.settings.RestrictedSettingsFragment;
-import com.android.settings.wifi.p2p.WifiP2pSettings;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
  * Two types of UI are provided here.
@@ -134,7 +135,7 @@ public class WifiSettings extends RestrictedSettingsFragment
     private DetailedState mLastState;
     private WifiInfo mLastInfo;
 
-    private AtomicBoolean mConnected = new AtomicBoolean(false);
+    private final AtomicBoolean mConnected = new AtomicBoolean(false);
 
     private WifiDialog mDialog;
 
@@ -447,10 +448,11 @@ public class WifiSettings extends RestrictedSettingsFragment
         if (isRestrictedAndNotPinProtected()) return;
 
         final boolean wifiIsEnabled = mWifiManager.isWifiEnabled();
+        TypedArray ta = getActivity().getTheme().obtainStyledAttributes(
+                new int[] {R.attr.ic_menu_add, R.attr.ic_wps});
         if (mSetupWizardMode) {
-            // FIXME: add setIcon() when graphics are available
             menu.add(Menu.NONE, MENU_ID_WPS_PBC, 0, R.string.wifi_menu_wps_pbc)
-                    .setIcon(R.drawable.ic_wps)
+                    .setIcon(ta.getDrawable(1))
                     .setEnabled(wifiIsEnabled)
                     .setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
             menu.add(Menu.NONE, MENU_ID_ADD_NETWORK, 0, R.string.wifi_add_network)
@@ -458,11 +460,11 @@ public class WifiSettings extends RestrictedSettingsFragment
                     .setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
         } else {
             menu.add(Menu.NONE, MENU_ID_WPS_PBC, 0, R.string.wifi_menu_wps_pbc)
-                    .setIcon(R.drawable.ic_wps)
+                    .setIcon(ta.getDrawable(1))
                     .setEnabled(wifiIsEnabled)
                     .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
             menu.add(Menu.NONE, MENU_ID_ADD_NETWORK, 0, R.string.wifi_add_network)
-                    .setIcon(R.drawable.ic_menu_add)
+                    .setIcon(ta.getDrawable(0))
                     .setEnabled(wifiIsEnabled)
                     .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
             menu.add(Menu.NONE, MENU_ID_SCAN, 0, R.string.wifi_menu_scan)
@@ -481,6 +483,7 @@ public class WifiSettings extends RestrictedSettingsFragment
                     //.setIcon(android.R.drawable.ic_menu_manage)
                     .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
         }
+        ta.recycle();
         super.onCreateOptionsMenu(menu, inflater);
     }
 
@@ -808,7 +811,7 @@ public class WifiSettings extends RestrictedSettingsFragment
 
     /** A restricted multimap for use in constructAccessPoints */
     private class Multimap<K,V> {
-        private HashMap<K,List<V>> store = new HashMap<K,List<V>>();
+        private final HashMap<K,List<V>> store = new HashMap<K,List<V>>();
         /** retrieve a non-null list of values with key K */
         List<V> getAll(K key) {
             List<V> values = store.get(key);
diff --git a/src/com/android/settings/wifi/p2p/WifiP2pPeer.java b/src/com/android/settings/wifi/p2p/WifiP2pPeer.java
index 1eb810eb6..a364021dd 100644
--- a/src/com/android/settings/wifi/p2p/WifiP2pPeer.java
+++ b/src/com/android/settings/wifi/p2p/WifiP2pPeer.java
@@ -20,21 +20,18 @@ import com.android.settings.R;
 
 import android.content.Context;
 import android.net.wifi.WifiManager;
-import android.net.wifi.p2p.WifiP2pManager;
 import android.net.wifi.p2p.WifiP2pDevice;
 import android.preference.Preference;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.ImageView;
 
-import java.util.Comparator;
-
 public class WifiP2pPeer extends Preference {
 
     private static final int[] STATE_SECURED = {R.attr.state_encrypted};
     public WifiP2pDevice device;
 
-    private int mRssi;
+    private final int mRssi;
     private ImageView mSignal;
 
     private static final int SIGNAL_LEVELS = 4;
@@ -57,7 +54,7 @@ public class WifiP2pPeer extends Preference {
         if (mRssi == Integer.MAX_VALUE) {
             mSignal.setImageDrawable(null);
         } else {
-            mSignal.setImageResource(R.drawable.wifi_signal);
+            mSignal.setImageResource(R.drawable.wifi_signal_dark);
             mSignal.setImageState(STATE_SECURED,  true);
         }
         refresh();