diff --git a/res/drawable-hdpi/ic_exposure_0.png b/res/drawable-hdpi/ic_exposure_0.png
index da1fbd0..ba19c89 100644
--- a/res/drawable-hdpi/ic_exposure_0.png
+++ b/res/drawable-hdpi/ic_exposure_0.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_exposure_holo_light.png b/res/drawable-hdpi/ic_exposure_holo_light.png
index 9eaa59d..39662a4 100644
--- a/res/drawable-hdpi/ic_exposure_holo_light.png
+++ b/res/drawable-hdpi/ic_exposure_holo_light.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_exposure_n1.png b/res/drawable-hdpi/ic_exposure_n1.png
index 4bf5acb..e52dd74 100644
--- a/res/drawable-hdpi/ic_exposure_n1.png
+++ b/res/drawable-hdpi/ic_exposure_n1.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_exposure_n2.png b/res/drawable-hdpi/ic_exposure_n2.png
index e340e3a..738973d 100644
--- a/res/drawable-hdpi/ic_exposure_n2.png
+++ b/res/drawable-hdpi/ic_exposure_n2.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_exposure_n3.png b/res/drawable-hdpi/ic_exposure_n3.png
index 65f63a3..2cd63b4 100644
--- a/res/drawable-hdpi/ic_exposure_n3.png
+++ b/res/drawable-hdpi/ic_exposure_n3.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_exposure_p1.png b/res/drawable-hdpi/ic_exposure_p1.png
index c0d90b9..065e0bc 100644
--- a/res/drawable-hdpi/ic_exposure_p1.png
+++ b/res/drawable-hdpi/ic_exposure_p1.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_exposure_p2.png b/res/drawable-hdpi/ic_exposure_p2.png
index c6469be..92450c4 100644
--- a/res/drawable-hdpi/ic_exposure_p2.png
+++ b/res/drawable-hdpi/ic_exposure_p2.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_exposure_p3.png b/res/drawable-hdpi/ic_exposure_p3.png
index c4406aa..d1be9f6 100644
--- a/res/drawable-hdpi/ic_exposure_p3.png
+++ b/res/drawable-hdpi/ic_exposure_p3.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_flash_auto_holo_light.png b/res/drawable-hdpi/ic_flash_auto_holo_light.png
index b0597ea..a34d63a 100644
--- a/res/drawable-hdpi/ic_flash_auto_holo_light.png
+++ b/res/drawable-hdpi/ic_flash_auto_holo_light.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_flash_off_holo_light.png b/res/drawable-hdpi/ic_flash_off_holo_light.png
index 019966c..3fe45fc 100644
--- a/res/drawable-hdpi/ic_flash_off_holo_light.png
+++ b/res/drawable-hdpi/ic_flash_off_holo_light.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_flash_on_holo_light.png b/res/drawable-hdpi/ic_flash_on_holo_light.png
index 30f9398..2d67e45 100644
--- a/res/drawable-hdpi/ic_flash_on_holo_light.png
+++ b/res/drawable-hdpi/ic_flash_on_holo_light.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_flash_torch.png b/res/drawable-hdpi/ic_flash_torch.png
index fd47128..b577d1f 100644
--- a/res/drawable-hdpi/ic_flash_torch.png
+++ b/res/drawable-hdpi/ic_flash_torch.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_hdr.png b/res/drawable-hdpi/ic_hdr.png
index 3c05499..cda9890 100644
--- a/res/drawable-hdpi/ic_hdr.png
+++ b/res/drawable-hdpi/ic_hdr.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_hdr_off.png b/res/drawable-hdpi/ic_hdr_off.png
index 47c727f..28db73c 100644
--- a/res/drawable-hdpi/ic_hdr_off.png
+++ b/res/drawable-hdpi/ic_hdr_off.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_indicator_ev_0.png b/res/drawable-hdpi/ic_indicator_ev_0.png
index c1197d6..9092025 100644
--- a/res/drawable-hdpi/ic_indicator_ev_0.png
+++ b/res/drawable-hdpi/ic_indicator_ev_0.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_indicator_ev_n1.png b/res/drawable-hdpi/ic_indicator_ev_n1.png
index 522ef83..56c5e60 100644
--- a/res/drawable-hdpi/ic_indicator_ev_n1.png
+++ b/res/drawable-hdpi/ic_indicator_ev_n1.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_indicator_ev_n2.png b/res/drawable-hdpi/ic_indicator_ev_n2.png
index 6c6d98d..72838de 100644
--- a/res/drawable-hdpi/ic_indicator_ev_n2.png
+++ b/res/drawable-hdpi/ic_indicator_ev_n2.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_indicator_ev_n3.png b/res/drawable-hdpi/ic_indicator_ev_n3.png
index ccbb5cb..1200d63 100644
--- a/res/drawable-hdpi/ic_indicator_ev_n3.png
+++ b/res/drawable-hdpi/ic_indicator_ev_n3.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_indicator_ev_p1.png b/res/drawable-hdpi/ic_indicator_ev_p1.png
index b92bb67..5497c86 100644
--- a/res/drawable-hdpi/ic_indicator_ev_p1.png
+++ b/res/drawable-hdpi/ic_indicator_ev_p1.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_indicator_ev_p2.png b/res/drawable-hdpi/ic_indicator_ev_p2.png
index 5d60918..25107fe 100644
--- a/res/drawable-hdpi/ic_indicator_ev_p2.png
+++ b/res/drawable-hdpi/ic_indicator_ev_p2.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_indicator_ev_p3.png b/res/drawable-hdpi/ic_indicator_ev_p3.png
index a1be006..6d0c1e0 100644
--- a/res/drawable-hdpi/ic_indicator_ev_p3.png
+++ b/res/drawable-hdpi/ic_indicator_ev_p3.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_indicator_flash_auto.png b/res/drawable-hdpi/ic_indicator_flash_auto.png
index e600703..edb34a0 100644
--- a/res/drawable-hdpi/ic_indicator_flash_auto.png
+++ b/res/drawable-hdpi/ic_indicator_flash_auto.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_indicator_flash_off.png b/res/drawable-hdpi/ic_indicator_flash_off.png
index 60c70be..880ad07 100644
--- a/res/drawable-hdpi/ic_indicator_flash_off.png
+++ b/res/drawable-hdpi/ic_indicator_flash_off.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_indicator_flash_on.png b/res/drawable-hdpi/ic_indicator_flash_on.png
index 39316be..ec3d1d5 100644
--- a/res/drawable-hdpi/ic_indicator_flash_on.png
+++ b/res/drawable-hdpi/ic_indicator_flash_on.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_indicator_loc_off.png b/res/drawable-hdpi/ic_indicator_loc_off.png
new file mode 100644
index 0000000..d5937e4
--- /dev/null
+++ b/res/drawable-hdpi/ic_indicator_loc_off.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_indicator_loc_on.png b/res/drawable-hdpi/ic_indicator_loc_on.png
new file mode 100644
index 0000000..ae272a1
--- /dev/null
+++ b/res/drawable-hdpi/ic_indicator_loc_on.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_indicator_sce_hdr.png b/res/drawable-hdpi/ic_indicator_sce_hdr.png
new file mode 100644
index 0000000..de09fe1
--- /dev/null
+++ b/res/drawable-hdpi/ic_indicator_sce_hdr.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_indicator_sce_off.png b/res/drawable-hdpi/ic_indicator_sce_off.png
index 1814bfd..076d823 100644
--- a/res/drawable-hdpi/ic_indicator_sce_off.png
+++ b/res/drawable-hdpi/ic_indicator_sce_off.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_indicator_sce_on.png b/res/drawable-hdpi/ic_indicator_sce_on.png
index 71aa229..9ce466b 100644
--- a/res/drawable-hdpi/ic_indicator_sce_on.png
+++ b/res/drawable-hdpi/ic_indicator_sce_on.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_indicator_timer_off.png b/res/drawable-hdpi/ic_indicator_timer_off.png
new file mode 100644
index 0000000..e377f89
--- /dev/null
+++ b/res/drawable-hdpi/ic_indicator_timer_off.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_indicator_timer_on.png b/res/drawable-hdpi/ic_indicator_timer_on.png
new file mode 100644
index 0000000..8ceade6
--- /dev/null
+++ b/res/drawable-hdpi/ic_indicator_timer_on.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_indicator_wb_cloudy.png b/res/drawable-hdpi/ic_indicator_wb_cloudy.png
new file mode 100644
index 0000000..62f5c99
--- /dev/null
+++ b/res/drawable-hdpi/ic_indicator_wb_cloudy.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_indicator_wb_daylight.png b/res/drawable-hdpi/ic_indicator_wb_daylight.png
new file mode 100644
index 0000000..ffadb0e
--- /dev/null
+++ b/res/drawable-hdpi/ic_indicator_wb_daylight.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_indicator_wb_fluorescent.png b/res/drawable-hdpi/ic_indicator_wb_fluorescent.png
new file mode 100644
index 0000000..3c30bfb
--- /dev/null
+++ b/res/drawable-hdpi/ic_indicator_wb_fluorescent.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_indicator_wb_off.png b/res/drawable-hdpi/ic_indicator_wb_off.png
new file mode 100644
index 0000000..abe7405
--- /dev/null
+++ b/res/drawable-hdpi/ic_indicator_wb_off.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_indicator_wb_tungsten.png b/res/drawable-hdpi/ic_indicator_wb_tungsten.png
new file mode 100644
index 0000000..6de19d5
--- /dev/null
+++ b/res/drawable-hdpi/ic_indicator_wb_tungsten.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_location.png b/res/drawable-hdpi/ic_location.png
index f51acd8..ff85d79 100644
--- a/res/drawable-hdpi/ic_location.png
+++ b/res/drawable-hdpi/ic_location.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_location_off.png b/res/drawable-hdpi/ic_location_off.png
index 402944c..ae6e2ea 100644
--- a/res/drawable-hdpi/ic_location_off.png
+++ b/res/drawable-hdpi/ic_location_off.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_sce.png b/res/drawable-hdpi/ic_sce.png
index edc5383..dd8bbd7 100644
--- a/res/drawable-hdpi/ic_sce.png
+++ b/res/drawable-hdpi/ic_sce.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_sce_action.png b/res/drawable-hdpi/ic_sce_action.png
index 0b1285d..f968592 100644
--- a/res/drawable-hdpi/ic_sce_action.png
+++ b/res/drawable-hdpi/ic_sce_action.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_sce_night.png b/res/drawable-hdpi/ic_sce_night.png
index 62bedc7..dc42ec9 100644
--- a/res/drawable-hdpi/ic_sce_night.png
+++ b/res/drawable-hdpi/ic_sce_night.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_sce_off.png b/res/drawable-hdpi/ic_sce_off.png
new file mode 100644
index 0000000..4c64578
--- /dev/null
+++ b/res/drawable-hdpi/ic_sce_off.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_sce_party.png b/res/drawable-hdpi/ic_sce_party.png
index 7f2947a..6c664ba 100644
--- a/res/drawable-hdpi/ic_sce_party.png
+++ b/res/drawable-hdpi/ic_sce_party.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_sce_sunset.png b/res/drawable-hdpi/ic_sce_sunset.png
index 15a4be0..82f74e6 100644
--- a/res/drawable-hdpi/ic_sce_sunset.png
+++ b/res/drawable-hdpi/ic_sce_sunset.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_holo_light.png b/res/drawable-hdpi/ic_settings_holo_light.png
index c342846..5d315a3 100644
--- a/res/drawable-hdpi/ic_settings_holo_light.png
+++ b/res/drawable-hdpi/ic_settings_holo_light.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_switch_back.png b/res/drawable-hdpi/ic_switch_back.png
index 7d0ee61..02b1c6b 100644
--- a/res/drawable-hdpi/ic_switch_back.png
+++ b/res/drawable-hdpi/ic_switch_back.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_switch_front.png b/res/drawable-hdpi/ic_switch_front.png
index e8e99ce..09cbc24 100644
--- a/res/drawable-hdpi/ic_switch_front.png
+++ b/res/drawable-hdpi/ic_switch_front.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_timer_10s.png b/res/drawable-hdpi/ic_timer_10s.png
index 3eed668..9427956 100644
--- a/res/drawable-hdpi/ic_timer_10s.png
+++ b/res/drawable-hdpi/ic_timer_10s.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_timer_15s.png b/res/drawable-hdpi/ic_timer_15s.png
index 81743ad..ea0072a 100644
--- a/res/drawable-hdpi/ic_timer_15s.png
+++ b/res/drawable-hdpi/ic_timer_15s.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_timer_1s.png b/res/drawable-hdpi/ic_timer_1s.png
index 32128ad..e53f139 100644
--- a/res/drawable-hdpi/ic_timer_1s.png
+++ b/res/drawable-hdpi/ic_timer_1s.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_timer_3s.png b/res/drawable-hdpi/ic_timer_3s.png
index 6e27246..dc7e33e 100644
--- a/res/drawable-hdpi/ic_timer_3s.png
+++ b/res/drawable-hdpi/ic_timer_3s.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_timer_off.png b/res/drawable-hdpi/ic_timer_off.png
index 6d7bfbf..ab095ce 100644
--- a/res/drawable-hdpi/ic_timer_off.png
+++ b/res/drawable-hdpi/ic_timer_off.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_wb_auto.png b/res/drawable-hdpi/ic_wb_auto.png
index 4b887e9..0e07a04 100644
--- a/res/drawable-hdpi/ic_wb_auto.png
+++ b/res/drawable-hdpi/ic_wb_auto.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_wb_cloudy.png b/res/drawable-hdpi/ic_wb_cloudy.png
index 1d13d9a..fb42ada 100644
--- a/res/drawable-hdpi/ic_wb_cloudy.png
+++ b/res/drawable-hdpi/ic_wb_cloudy.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_wb_fluorescent.png b/res/drawable-hdpi/ic_wb_fluorescent.png
index e0c9e5f..fbf8c96 100644
--- a/res/drawable-hdpi/ic_wb_fluorescent.png
+++ b/res/drawable-hdpi/ic_wb_fluorescent.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_wb_incandescent.png b/res/drawable-hdpi/ic_wb_incandescent.png
index 352b869..295a807 100644
--- a/res/drawable-hdpi/ic_wb_incandescent.png
+++ b/res/drawable-hdpi/ic_wb_incandescent.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_wb_sunlight.png b/res/drawable-hdpi/ic_wb_sunlight.png
index 0b7719a..d256509 100644
--- a/res/drawable-hdpi/ic_wb_sunlight.png
+++ b/res/drawable-hdpi/ic_wb_sunlight.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_exposure_0.png b/res/drawable-mdpi/ic_exposure_0.png
index 52091b8..a3dcee4 100644
--- a/res/drawable-mdpi/ic_exposure_0.png
+++ b/res/drawable-mdpi/ic_exposure_0.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_exposure_holo_light.png b/res/drawable-mdpi/ic_exposure_holo_light.png
index 664305f..ebd2f41 100644
--- a/res/drawable-mdpi/ic_exposure_holo_light.png
+++ b/res/drawable-mdpi/ic_exposure_holo_light.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_exposure_n1.png b/res/drawable-mdpi/ic_exposure_n1.png
index a703353..e73f8b3 100644
--- a/res/drawable-mdpi/ic_exposure_n1.png
+++ b/res/drawable-mdpi/ic_exposure_n1.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_exposure_n2.png b/res/drawable-mdpi/ic_exposure_n2.png
index df1ab97..662c1f8 100644
--- a/res/drawable-mdpi/ic_exposure_n2.png
+++ b/res/drawable-mdpi/ic_exposure_n2.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_exposure_n3.png b/res/drawable-mdpi/ic_exposure_n3.png
index 2d66d48..e9c5243 100644
--- a/res/drawable-mdpi/ic_exposure_n3.png
+++ b/res/drawable-mdpi/ic_exposure_n3.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_exposure_p1.png b/res/drawable-mdpi/ic_exposure_p1.png
index 91877fb..a6703c2 100644
--- a/res/drawable-mdpi/ic_exposure_p1.png
+++ b/res/drawable-mdpi/ic_exposure_p1.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_exposure_p2.png b/res/drawable-mdpi/ic_exposure_p2.png
index 935455e..9e29e4b 100644
--- a/res/drawable-mdpi/ic_exposure_p2.png
+++ b/res/drawable-mdpi/ic_exposure_p2.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_exposure_p3.png b/res/drawable-mdpi/ic_exposure_p3.png
index c8af740..89e659a 100644
--- a/res/drawable-mdpi/ic_exposure_p3.png
+++ b/res/drawable-mdpi/ic_exposure_p3.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_flash_auto_holo_light.png b/res/drawable-mdpi/ic_flash_auto_holo_light.png
index 66d211d..55794e4 100644
--- a/res/drawable-mdpi/ic_flash_auto_holo_light.png
+++ b/res/drawable-mdpi/ic_flash_auto_holo_light.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_flash_off_holo_light.png b/res/drawable-mdpi/ic_flash_off_holo_light.png
index 43623dd..73b8ca8 100644
--- a/res/drawable-mdpi/ic_flash_off_holo_light.png
+++ b/res/drawable-mdpi/ic_flash_off_holo_light.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_flash_on_holo_light.png b/res/drawable-mdpi/ic_flash_on_holo_light.png
index 1e7aca5..9c99d37 100644
--- a/res/drawable-mdpi/ic_flash_on_holo_light.png
+++ b/res/drawable-mdpi/ic_flash_on_holo_light.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_flash_torch.png b/res/drawable-mdpi/ic_flash_torch.png
index 65271f9..398be51 100644
--- a/res/drawable-mdpi/ic_flash_torch.png
+++ b/res/drawable-mdpi/ic_flash_torch.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_hdr.png b/res/drawable-mdpi/ic_hdr.png
index a197627..45dae46 100644
--- a/res/drawable-mdpi/ic_hdr.png
+++ b/res/drawable-mdpi/ic_hdr.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_hdr_off.png b/res/drawable-mdpi/ic_hdr_off.png
index 0856cb0..c5003e6 100644
--- a/res/drawable-mdpi/ic_hdr_off.png
+++ b/res/drawable-mdpi/ic_hdr_off.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_indicator_ev_0.png b/res/drawable-mdpi/ic_indicator_ev_0.png
index a205fb0..6634dd9 100644
--- a/res/drawable-mdpi/ic_indicator_ev_0.png
+++ b/res/drawable-mdpi/ic_indicator_ev_0.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_indicator_ev_n1.png b/res/drawable-mdpi/ic_indicator_ev_n1.png
index 87352f7..528ecd3 100644
--- a/res/drawable-mdpi/ic_indicator_ev_n1.png
+++ b/res/drawable-mdpi/ic_indicator_ev_n1.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_indicator_ev_n2.png b/res/drawable-mdpi/ic_indicator_ev_n2.png
index 422f916..db4deb1 100644
--- a/res/drawable-mdpi/ic_indicator_ev_n2.png
+++ b/res/drawable-mdpi/ic_indicator_ev_n2.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_indicator_ev_n3.png b/res/drawable-mdpi/ic_indicator_ev_n3.png
index 8c97a4d..6b01a56 100644
--- a/res/drawable-mdpi/ic_indicator_ev_n3.png
+++ b/res/drawable-mdpi/ic_indicator_ev_n3.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_indicator_ev_p1.png b/res/drawable-mdpi/ic_indicator_ev_p1.png
index 92998a6..9a1f6f3 100644
--- a/res/drawable-mdpi/ic_indicator_ev_p1.png
+++ b/res/drawable-mdpi/ic_indicator_ev_p1.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_indicator_ev_p2.png b/res/drawable-mdpi/ic_indicator_ev_p2.png
index 74806ba..712ded5 100644
--- a/res/drawable-mdpi/ic_indicator_ev_p2.png
+++ b/res/drawable-mdpi/ic_indicator_ev_p2.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_indicator_ev_p3.png b/res/drawable-mdpi/ic_indicator_ev_p3.png
index 41f0039..d01c2c2 100644
--- a/res/drawable-mdpi/ic_indicator_ev_p3.png
+++ b/res/drawable-mdpi/ic_indicator_ev_p3.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_indicator_flash_auto.png b/res/drawable-mdpi/ic_indicator_flash_auto.png
index bc6cc56..c60e423 100644
--- a/res/drawable-mdpi/ic_indicator_flash_auto.png
+++ b/res/drawable-mdpi/ic_indicator_flash_auto.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_indicator_flash_off.png b/res/drawable-mdpi/ic_indicator_flash_off.png
index d84025a..6c2d75a 100644
--- a/res/drawable-mdpi/ic_indicator_flash_off.png
+++ b/res/drawable-mdpi/ic_indicator_flash_off.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_indicator_flash_on.png b/res/drawable-mdpi/ic_indicator_flash_on.png
index e21b544..8427072 100644
--- a/res/drawable-mdpi/ic_indicator_flash_on.png
+++ b/res/drawable-mdpi/ic_indicator_flash_on.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_indicator_loc_off.png b/res/drawable-mdpi/ic_indicator_loc_off.png
new file mode 100644
index 0000000..87841e3
--- /dev/null
+++ b/res/drawable-mdpi/ic_indicator_loc_off.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_indicator_loc_on.png b/res/drawable-mdpi/ic_indicator_loc_on.png
new file mode 100644
index 0000000..56a3a3b
--- /dev/null
+++ b/res/drawable-mdpi/ic_indicator_loc_on.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_indicator_sce_hdr.png b/res/drawable-mdpi/ic_indicator_sce_hdr.png
new file mode 100644
index 0000000..0651941
--- /dev/null
+++ b/res/drawable-mdpi/ic_indicator_sce_hdr.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_indicator_sce_off.png b/res/drawable-mdpi/ic_indicator_sce_off.png
index 0cb5d31..52ad713 100644
--- a/res/drawable-mdpi/ic_indicator_sce_off.png
+++ b/res/drawable-mdpi/ic_indicator_sce_off.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_indicator_sce_on.png b/res/drawable-mdpi/ic_indicator_sce_on.png
index ad08c11..510c39f 100644
--- a/res/drawable-mdpi/ic_indicator_sce_on.png
+++ b/res/drawable-mdpi/ic_indicator_sce_on.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_indicator_timer_off.png b/res/drawable-mdpi/ic_indicator_timer_off.png
new file mode 100644
index 0000000..c5f8117
--- /dev/null
+++ b/res/drawable-mdpi/ic_indicator_timer_off.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_indicator_timer_on.png b/res/drawable-mdpi/ic_indicator_timer_on.png
new file mode 100644
index 0000000..03d6c1b
--- /dev/null
+++ b/res/drawable-mdpi/ic_indicator_timer_on.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_indicator_wb_cloudy.png b/res/drawable-mdpi/ic_indicator_wb_cloudy.png
new file mode 100644
index 0000000..858394f
--- /dev/null
+++ b/res/drawable-mdpi/ic_indicator_wb_cloudy.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_indicator_wb_daylight.png b/res/drawable-mdpi/ic_indicator_wb_daylight.png
new file mode 100644
index 0000000..b8520e1
--- /dev/null
+++ b/res/drawable-mdpi/ic_indicator_wb_daylight.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_indicator_wb_fluorescent.png b/res/drawable-mdpi/ic_indicator_wb_fluorescent.png
new file mode 100644
index 0000000..cb34af1
--- /dev/null
+++ b/res/drawable-mdpi/ic_indicator_wb_fluorescent.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_indicator_wb_off.png b/res/drawable-mdpi/ic_indicator_wb_off.png
new file mode 100644
index 0000000..f20ddf5
--- /dev/null
+++ b/res/drawable-mdpi/ic_indicator_wb_off.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_indicator_wb_tungsten.png b/res/drawable-mdpi/ic_indicator_wb_tungsten.png
new file mode 100644
index 0000000..ebfb225
--- /dev/null
+++ b/res/drawable-mdpi/ic_indicator_wb_tungsten.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_location.png b/res/drawable-mdpi/ic_location.png
index 2a4e9bf..57cecba 100644
--- a/res/drawable-mdpi/ic_location.png
+++ b/res/drawable-mdpi/ic_location.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_location_off.png b/res/drawable-mdpi/ic_location_off.png
index f9971f1..548fd96 100644
--- a/res/drawable-mdpi/ic_location_off.png
+++ b/res/drawable-mdpi/ic_location_off.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_sce.png b/res/drawable-mdpi/ic_sce.png
index f55c15d..724d278 100644
--- a/res/drawable-mdpi/ic_sce.png
+++ b/res/drawable-mdpi/ic_sce.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_sce_action.png b/res/drawable-mdpi/ic_sce_action.png
index b43532b..2cd9a8c 100644
--- a/res/drawable-mdpi/ic_sce_action.png
+++ b/res/drawable-mdpi/ic_sce_action.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_sce_night.png b/res/drawable-mdpi/ic_sce_night.png
index 8ab9a0e..9479262 100644
--- a/res/drawable-mdpi/ic_sce_night.png
+++ b/res/drawable-mdpi/ic_sce_night.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_sce_off.png b/res/drawable-mdpi/ic_sce_off.png
new file mode 100644
index 0000000..2a3f950
--- /dev/null
+++ b/res/drawable-mdpi/ic_sce_off.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_sce_party.png b/res/drawable-mdpi/ic_sce_party.png
index 8d8a086..5f0f9cf 100644
--- a/res/drawable-mdpi/ic_sce_party.png
+++ b/res/drawable-mdpi/ic_sce_party.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_sce_sunset.png b/res/drawable-mdpi/ic_sce_sunset.png
index 09d3859..0cede83 100644
--- a/res/drawable-mdpi/ic_sce_sunset.png
+++ b/res/drawable-mdpi/ic_sce_sunset.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_holo_light.png b/res/drawable-mdpi/ic_settings_holo_light.png
index 0f87e8c..5b39398 100644
--- a/res/drawable-mdpi/ic_settings_holo_light.png
+++ b/res/drawable-mdpi/ic_settings_holo_light.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_switch_back.png b/res/drawable-mdpi/ic_switch_back.png
index 71d61fe..6dce903 100644
--- a/res/drawable-mdpi/ic_switch_back.png
+++ b/res/drawable-mdpi/ic_switch_back.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_switch_front.png b/res/drawable-mdpi/ic_switch_front.png
index 823bbd5..c8ff3be 100644
--- a/res/drawable-mdpi/ic_switch_front.png
+++ b/res/drawable-mdpi/ic_switch_front.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_timer_10s.png b/res/drawable-mdpi/ic_timer_10s.png
index 3497d8e..40bbb8c 100644
--- a/res/drawable-mdpi/ic_timer_10s.png
+++ b/res/drawable-mdpi/ic_timer_10s.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_timer_15s.png b/res/drawable-mdpi/ic_timer_15s.png
index a61f877..53d33d9 100644
--- a/res/drawable-mdpi/ic_timer_15s.png
+++ b/res/drawable-mdpi/ic_timer_15s.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_timer_1s.png b/res/drawable-mdpi/ic_timer_1s.png
index a2005a4..3b296e5 100644
--- a/res/drawable-mdpi/ic_timer_1s.png
+++ b/res/drawable-mdpi/ic_timer_1s.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_timer_3s.png b/res/drawable-mdpi/ic_timer_3s.png
index 7af60aa..2cf11eb 100644
--- a/res/drawable-mdpi/ic_timer_3s.png
+++ b/res/drawable-mdpi/ic_timer_3s.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_timer_off.png b/res/drawable-mdpi/ic_timer_off.png
index 0a986f0..d89f8d9 100644
--- a/res/drawable-mdpi/ic_timer_off.png
+++ b/res/drawable-mdpi/ic_timer_off.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_wb_auto.png b/res/drawable-mdpi/ic_wb_auto.png
index 0a410d4..3da3a5c 100644
--- a/res/drawable-mdpi/ic_wb_auto.png
+++ b/res/drawable-mdpi/ic_wb_auto.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_wb_cloudy.png b/res/drawable-mdpi/ic_wb_cloudy.png
index 0616d81..5dc6fbd 100644
--- a/res/drawable-mdpi/ic_wb_cloudy.png
+++ b/res/drawable-mdpi/ic_wb_cloudy.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_wb_fluorescent.png b/res/drawable-mdpi/ic_wb_fluorescent.png
index 0d30347..87c001b 100644
--- a/res/drawable-mdpi/ic_wb_fluorescent.png
+++ b/res/drawable-mdpi/ic_wb_fluorescent.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_wb_incandescent.png b/res/drawable-mdpi/ic_wb_incandescent.png
index 64e9110..f6512ef 100644
--- a/res/drawable-mdpi/ic_wb_incandescent.png
+++ b/res/drawable-mdpi/ic_wb_incandescent.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_wb_sunlight.png b/res/drawable-mdpi/ic_wb_sunlight.png
index 79df119..4a07ec4 100644
--- a/res/drawable-mdpi/ic_wb_sunlight.png
+++ b/res/drawable-mdpi/ic_wb_sunlight.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_exposure_0.png b/res/drawable-xhdpi/ic_exposure_0.png
index 07a6811..5752ed7 100644
--- a/res/drawable-xhdpi/ic_exposure_0.png
+++ b/res/drawable-xhdpi/ic_exposure_0.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_exposure_holo_light.png b/res/drawable-xhdpi/ic_exposure_holo_light.png
index 93f6fd1..06501ad 100644
--- a/res/drawable-xhdpi/ic_exposure_holo_light.png
+++ b/res/drawable-xhdpi/ic_exposure_holo_light.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_exposure_n1.png b/res/drawable-xhdpi/ic_exposure_n1.png
index e4787ab..d7fe917 100644
--- a/res/drawable-xhdpi/ic_exposure_n1.png
+++ b/res/drawable-xhdpi/ic_exposure_n1.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_exposure_n2.png b/res/drawable-xhdpi/ic_exposure_n2.png
index ee9ac23..5c47b96 100644
--- a/res/drawable-xhdpi/ic_exposure_n2.png
+++ b/res/drawable-xhdpi/ic_exposure_n2.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_exposure_n3.png b/res/drawable-xhdpi/ic_exposure_n3.png
index 0d25da8..6bf4ccb 100644
--- a/res/drawable-xhdpi/ic_exposure_n3.png
+++ b/res/drawable-xhdpi/ic_exposure_n3.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_exposure_p1.png b/res/drawable-xhdpi/ic_exposure_p1.png
index 8edec9b..c30265e 100644
--- a/res/drawable-xhdpi/ic_exposure_p1.png
+++ b/res/drawable-xhdpi/ic_exposure_p1.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_exposure_p2.png b/res/drawable-xhdpi/ic_exposure_p2.png
index ab1e122..183d25f 100644
--- a/res/drawable-xhdpi/ic_exposure_p2.png
+++ b/res/drawable-xhdpi/ic_exposure_p2.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_exposure_p3.png b/res/drawable-xhdpi/ic_exposure_p3.png
index e9f4bca..581a9a7 100644
--- a/res/drawable-xhdpi/ic_exposure_p3.png
+++ b/res/drawable-xhdpi/ic_exposure_p3.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_flash_auto_holo_light.png b/res/drawable-xhdpi/ic_flash_auto_holo_light.png
index 3b14acb..266d1c2 100644
--- a/res/drawable-xhdpi/ic_flash_auto_holo_light.png
+++ b/res/drawable-xhdpi/ic_flash_auto_holo_light.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_flash_off_holo_light.png b/res/drawable-xhdpi/ic_flash_off_holo_light.png
index 9b13a36..e289ac2 100644
--- a/res/drawable-xhdpi/ic_flash_off_holo_light.png
+++ b/res/drawable-xhdpi/ic_flash_off_holo_light.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_flash_on_holo_light.png b/res/drawable-xhdpi/ic_flash_on_holo_light.png
index 8cd0548..e2c63c7 100644
--- a/res/drawable-xhdpi/ic_flash_on_holo_light.png
+++ b/res/drawable-xhdpi/ic_flash_on_holo_light.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_flash_torch.png b/res/drawable-xhdpi/ic_flash_torch.png
index 2801e29..5681793 100644
--- a/res/drawable-xhdpi/ic_flash_torch.png
+++ b/res/drawable-xhdpi/ic_flash_torch.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_hdr.png b/res/drawable-xhdpi/ic_hdr.png
index 442c7df..12203a2 100644
--- a/res/drawable-xhdpi/ic_hdr.png
+++ b/res/drawable-xhdpi/ic_hdr.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_hdr_off.png b/res/drawable-xhdpi/ic_hdr_off.png
index 0fb7d61..66fe29e 100644
--- a/res/drawable-xhdpi/ic_hdr_off.png
+++ b/res/drawable-xhdpi/ic_hdr_off.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_indicator_ev_0.png b/res/drawable-xhdpi/ic_indicator_ev_0.png
index 949ed99..b86bb30 100644
--- a/res/drawable-xhdpi/ic_indicator_ev_0.png
+++ b/res/drawable-xhdpi/ic_indicator_ev_0.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_indicator_ev_n1.png b/res/drawable-xhdpi/ic_indicator_ev_n1.png
index 014beca..e99cc66 100644
--- a/res/drawable-xhdpi/ic_indicator_ev_n1.png
+++ b/res/drawable-xhdpi/ic_indicator_ev_n1.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_indicator_ev_n2.png b/res/drawable-xhdpi/ic_indicator_ev_n2.png
index 109fdfd..aced71d 100644
--- a/res/drawable-xhdpi/ic_indicator_ev_n2.png
+++ b/res/drawable-xhdpi/ic_indicator_ev_n2.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_indicator_ev_n3.png b/res/drawable-xhdpi/ic_indicator_ev_n3.png
index 27d75fb..41b9f59 100644
--- a/res/drawable-xhdpi/ic_indicator_ev_n3.png
+++ b/res/drawable-xhdpi/ic_indicator_ev_n3.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_indicator_ev_p1.png b/res/drawable-xhdpi/ic_indicator_ev_p1.png
index 800a0fd..2850c95 100644
--- a/res/drawable-xhdpi/ic_indicator_ev_p1.png
+++ b/res/drawable-xhdpi/ic_indicator_ev_p1.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_indicator_ev_p2.png b/res/drawable-xhdpi/ic_indicator_ev_p2.png
index 933fc71..c6355b1 100644
--- a/res/drawable-xhdpi/ic_indicator_ev_p2.png
+++ b/res/drawable-xhdpi/ic_indicator_ev_p2.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_indicator_ev_p3.png b/res/drawable-xhdpi/ic_indicator_ev_p3.png
index 82a5e0b..99b860d 100644
--- a/res/drawable-xhdpi/ic_indicator_ev_p3.png
+++ b/res/drawable-xhdpi/ic_indicator_ev_p3.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_indicator_flash_auto.png b/res/drawable-xhdpi/ic_indicator_flash_auto.png
index 746a721..08f507b 100644
--- a/res/drawable-xhdpi/ic_indicator_flash_auto.png
+++ b/res/drawable-xhdpi/ic_indicator_flash_auto.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_indicator_flash_off.png b/res/drawable-xhdpi/ic_indicator_flash_off.png
index af67e5e..a3580f1 100644
--- a/res/drawable-xhdpi/ic_indicator_flash_off.png
+++ b/res/drawable-xhdpi/ic_indicator_flash_off.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_indicator_flash_on.png b/res/drawable-xhdpi/ic_indicator_flash_on.png
index fdf8094..7e05e15 100644
--- a/res/drawable-xhdpi/ic_indicator_flash_on.png
+++ b/res/drawable-xhdpi/ic_indicator_flash_on.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_indicator_loc_off.png b/res/drawable-xhdpi/ic_indicator_loc_off.png
new file mode 100644
index 0000000..966855c
--- /dev/null
+++ b/res/drawable-xhdpi/ic_indicator_loc_off.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_indicator_loc_on.png b/res/drawable-xhdpi/ic_indicator_loc_on.png
new file mode 100644
index 0000000..3a4b44e
--- /dev/null
+++ b/res/drawable-xhdpi/ic_indicator_loc_on.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_indicator_sce_hdr.png b/res/drawable-xhdpi/ic_indicator_sce_hdr.png
new file mode 100644
index 0000000..b60abb3
--- /dev/null
+++ b/res/drawable-xhdpi/ic_indicator_sce_hdr.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_indicator_sce_off.png b/res/drawable-xhdpi/ic_indicator_sce_off.png
index dc58bb9..aad8cf8 100644
--- a/res/drawable-xhdpi/ic_indicator_sce_off.png
+++ b/res/drawable-xhdpi/ic_indicator_sce_off.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_indicator_sce_on.png b/res/drawable-xhdpi/ic_indicator_sce_on.png
index 7db8f9c..39cfa4b 100644
--- a/res/drawable-xhdpi/ic_indicator_sce_on.png
+++ b/res/drawable-xhdpi/ic_indicator_sce_on.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_indicator_timer_off.png b/res/drawable-xhdpi/ic_indicator_timer_off.png
new file mode 100644
index 0000000..0bbb9ee
--- /dev/null
+++ b/res/drawable-xhdpi/ic_indicator_timer_off.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_indicator_timer_on.png b/res/drawable-xhdpi/ic_indicator_timer_on.png
new file mode 100644
index 0000000..07cef15
--- /dev/null
+++ b/res/drawable-xhdpi/ic_indicator_timer_on.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_indicator_wb_cloudy.png b/res/drawable-xhdpi/ic_indicator_wb_cloudy.png
new file mode 100644
index 0000000..862ad5f
--- /dev/null
+++ b/res/drawable-xhdpi/ic_indicator_wb_cloudy.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_indicator_wb_daylight.png b/res/drawable-xhdpi/ic_indicator_wb_daylight.png
new file mode 100644
index 0000000..5c2a4dd
--- /dev/null
+++ b/res/drawable-xhdpi/ic_indicator_wb_daylight.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_indicator_wb_fluorescent.png b/res/drawable-xhdpi/ic_indicator_wb_fluorescent.png
new file mode 100644
index 0000000..226b36c
--- /dev/null
+++ b/res/drawable-xhdpi/ic_indicator_wb_fluorescent.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_indicator_wb_off.png b/res/drawable-xhdpi/ic_indicator_wb_off.png
new file mode 100644
index 0000000..c5e38b1
--- /dev/null
+++ b/res/drawable-xhdpi/ic_indicator_wb_off.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_indicator_wb_tungsten.png b/res/drawable-xhdpi/ic_indicator_wb_tungsten.png
new file mode 100644
index 0000000..a0b4485
--- /dev/null
+++ b/res/drawable-xhdpi/ic_indicator_wb_tungsten.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_sce.png b/res/drawable-xhdpi/ic_sce.png
index 33a553d..44d0d7a 100644
--- a/res/drawable-xhdpi/ic_sce.png
+++ b/res/drawable-xhdpi/ic_sce.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_sce_action.png b/res/drawable-xhdpi/ic_sce_action.png
index c2f7b72..d79a7e0 100644
--- a/res/drawable-xhdpi/ic_sce_action.png
+++ b/res/drawable-xhdpi/ic_sce_action.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_sce_night.png b/res/drawable-xhdpi/ic_sce_night.png
index 7541a1d..5dd62fc 100644
--- a/res/drawable-xhdpi/ic_sce_night.png
+++ b/res/drawable-xhdpi/ic_sce_night.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_sce_off.png b/res/drawable-xhdpi/ic_sce_off.png
new file mode 100644
index 0000000..0279dcc
--- /dev/null
+++ b/res/drawable-xhdpi/ic_sce_off.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_sce_party.png b/res/drawable-xhdpi/ic_sce_party.png
index c2b581f..638d2d3 100644
--- a/res/drawable-xhdpi/ic_sce_party.png
+++ b/res/drawable-xhdpi/ic_sce_party.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_sce_sunset.png b/res/drawable-xhdpi/ic_sce_sunset.png
index 846f736..721966e 100644
--- a/res/drawable-xhdpi/ic_sce_sunset.png
+++ b/res/drawable-xhdpi/ic_sce_sunset.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_holo_light.png b/res/drawable-xhdpi/ic_settings_holo_light.png
index 39be7bd..0da5b5e 100644
--- a/res/drawable-xhdpi/ic_settings_holo_light.png
+++ b/res/drawable-xhdpi/ic_settings_holo_light.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_switch_back.png b/res/drawable-xhdpi/ic_switch_back.png
index 8a10f6d..26f5e09 100644
--- a/res/drawable-xhdpi/ic_switch_back.png
+++ b/res/drawable-xhdpi/ic_switch_back.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_switch_front.png b/res/drawable-xhdpi/ic_switch_front.png
index 39b974b..8c0383a 100644
--- a/res/drawable-xhdpi/ic_switch_front.png
+++ b/res/drawable-xhdpi/ic_switch_front.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_timer_10s.png b/res/drawable-xhdpi/ic_timer_10s.png
index f03b3ed..cbda71d 100644
--- a/res/drawable-xhdpi/ic_timer_10s.png
+++ b/res/drawable-xhdpi/ic_timer_10s.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_timer_15s.png b/res/drawable-xhdpi/ic_timer_15s.png
index adce51d..373e0c9 100644
--- a/res/drawable-xhdpi/ic_timer_15s.png
+++ b/res/drawable-xhdpi/ic_timer_15s.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_timer_1s.png b/res/drawable-xhdpi/ic_timer_1s.png
index 3df431d..dd224a4 100644
--- a/res/drawable-xhdpi/ic_timer_1s.png
+++ b/res/drawable-xhdpi/ic_timer_1s.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_timer_3s.png b/res/drawable-xhdpi/ic_timer_3s.png
index a1396b2..1f12fc6 100644
--- a/res/drawable-xhdpi/ic_timer_3s.png
+++ b/res/drawable-xhdpi/ic_timer_3s.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_timer_off.png b/res/drawable-xhdpi/ic_timer_off.png
index ed637cf..8469394 100644
--- a/res/drawable-xhdpi/ic_timer_off.png
+++ b/res/drawable-xhdpi/ic_timer_off.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wb_auto.png b/res/drawable-xhdpi/ic_wb_auto.png
index c434eee..cbacd04 100644
--- a/res/drawable-xhdpi/ic_wb_auto.png
+++ b/res/drawable-xhdpi/ic_wb_auto.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wb_cloudy.png b/res/drawable-xhdpi/ic_wb_cloudy.png
index 199bc58..cf8ec8c 100644
--- a/res/drawable-xhdpi/ic_wb_cloudy.png
+++ b/res/drawable-xhdpi/ic_wb_cloudy.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wb_fluorescent.png b/res/drawable-xhdpi/ic_wb_fluorescent.png
index b9ab74a..6e03a85 100644
--- a/res/drawable-xhdpi/ic_wb_fluorescent.png
+++ b/res/drawable-xhdpi/ic_wb_fluorescent.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wb_incandescent.png b/res/drawable-xhdpi/ic_wb_incandescent.png
index eab4c6e..367ded3 100644
--- a/res/drawable-xhdpi/ic_wb_incandescent.png
+++ b/res/drawable-xhdpi/ic_wb_incandescent.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wb_sunlight.png b/res/drawable-xhdpi/ic_wb_sunlight.png
index 12602e6..497c4bd 100644
--- a/res/drawable-xhdpi/ic_wb_sunlight.png
+++ b/res/drawable-xhdpi/ic_wb_sunlight.png
Binary files differ
diff --git a/res/layout-land/camera_controls.xml b/res/layout-land/camera_controls.xml
index 683f0e5..e99c0cb 100644
--- a/res/layout-land/camera_controls.xml
+++ b/res/layout-land/camera_controls.xml
@@ -26,10 +26,10 @@
             android:layout_gravity="right" />
 
         <include layout="@layout/menu_indicators"
-            android:layout_width="80dip"
-            android:layout_height="80dip"
+            android:layout_width="64dip"
+            android:layout_height="64dip"
             android:layout_marginTop="-5dip"
-            android:layout_marginRight="-2dip"
+            android:layout_marginRight="6dip"
             android:layout_gravity="top|right"/>
 
         <com.android.camera.ui.PieMenuButton
diff --git a/res/layout-port/camera_controls.xml b/res/layout-port/camera_controls.xml
index 76e23be..77a19e9 100644
--- a/res/layout-port/camera_controls.xml
+++ b/res/layout-port/camera_controls.xml
@@ -26,10 +26,10 @@
             android:layout_gravity="bottom" />
 
         <include layout="@layout/menu_indicators"
-            android:layout_width="80dip"
-            android:layout_height="80dip"
+            android:layout_width="64dip"
+            android:layout_height="64dip"
             android:layout_gravity="bottom|right"
-            android:layout_marginBottom="-2dip"
+            android:layout_marginBottom="6dip"
             android:layout_marginRight="-5dip" />
 
         <com.android.camera.ui.PieMenuButton
diff --git a/res/layout/menu_indicators.xml b/res/layout/menu_indicators.xml
index 08e0465..da81e8a 100644
--- a/res/layout/menu_indicators.xml
+++ b/res/layout/menu_indicators.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
+<!-- Copyright (C) 2013 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.
@@ -13,38 +13,45 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/on_screen_indicators"
-    android:layout_width="80dip"
-    android:layout_height="80dip" >
+    android:layout_width="64dip"
+    android:layout_height="64dip" >
 
     <ImageView
-        android:id="@+id/menu_hdr_indicator"
+        android:id="@+id/menu_scenemode_indicator"
         style="@style/MenuIndicator"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentTop="true"
-        android:src="@drawable/ic_indicator_hdr_off" />
+        android:layout_gravity="left|top"
+        android:src="@drawable/ic_indicator_sce_off" />
+
+    <ImageView
+        android:id="@+id/menu_timer_indicator"
+        style="@style/MenuIndicator"
+        android:layout_gravity="center_horizontal|top"
+        android:src="@drawable/ic_indicator_timer_off" />
 
     <ImageView
         android:id="@+id/menu_flash_indicator"
         style="@style/MenuIndicator"
-        android:layout_toRightOf="@id/menu_hdr_indicator"
-        android:layout_alignTop="@id/menu_hdr_indicator"
+        android:layout_gravity="right|top"
         android:src="@drawable/ic_indicator_flash_off" />
 
     <ImageView
         android:id="@+id/menu_exposure_indicator"
         style="@style/MenuIndicator"
-        android:layout_below="@id/menu_hdr_indicator"
-        android:layout_alignLeft="@id/menu_hdr_indicator"
-        android:layout_alignParentLeft="true"
+        android:layout_gravity="left|bottom"
         android:src="@drawable/ic_indicator_ev_0" />
 
     <ImageView
-        android:id="@+id/menu_scenemode_indicator"
+        android:id="@+id/menu_location_indicator"
         style="@style/MenuIndicator"
-        android:layout_alignTop="@id/menu_exposure_indicator"
-        android:layout_toRightOf="@id/menu_exposure_indicator"
-        android:src="@drawable/ic_indicator_sce_off" />
+        android:layout_gravity="center_horizontal|bottom"
+        android:src="@drawable/ic_indicator_loc_off" />
 
-</RelativeLayout>
+    <ImageView
+        android:id="@+id/menu_wb_indicator"
+        style="@style/MenuIndicator"
+        android:layout_gravity="right|bottom"
+        android:src="@drawable/ic_indicator_wb_off" />
+
+</FrameLayout>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 7ad62fa..0f01029 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -324,6 +324,14 @@
         <item>@drawable/ic_wb_cloudy</item>
     </array>
 
+    <array name="camera_wb_indicators" translatable="false">
+        <item>@drawable/ic_indicator_wb_tungsten</item>
+        <item>@drawable/ic_indicator_wb_fluorescent</item>
+        <item>@drawable/ic_indicator_wb_off</item>
+        <item>@drawable/ic_indicator_wb_daylight</item>
+        <item>@drawable/ic_indicator_wb_cloudy</item>
+    </array>
+
     <!-- Camera Preferences Scene Mode dialog box entries -->
     <string-array name="pref_camera_scenemode_entries" translatable="false">
         <item>@string/pref_camera_scenemode_entry_action</item>
diff --git a/src/com/android/camera/ListPreference.java b/src/com/android/camera/ListPreference.java
index d1d3491..38866de 100644
--- a/src/com/android/camera/ListPreference.java
+++ b/src/com/android/camera/ListPreference.java
@@ -142,6 +142,10 @@
         return -1;
     }
 
+    public int getCurrentIndex() {
+        return findIndexOfValue(getValue());
+    }
+
     public String getEntry() {
         return mEntries[findIndexOfValue(getValue())].toString();
     }
diff --git a/src/com/android/camera/OnScreenIndicators.java b/src/com/android/camera/OnScreenIndicators.java
index 6c3819a..77c8faf 100644
--- a/src/com/android/camera/OnScreenIndicators.java
+++ b/src/com/android/camera/OnScreenIndicators.java
@@ -16,6 +16,8 @@
 
 package com.android.camera;
 
+import android.content.Context;
+import android.content.res.TypedArray;
 import android.hardware.Camera;
 import android.hardware.Camera.Parameters;
 import android.view.View;
@@ -28,13 +30,23 @@
  * settings in the viewfinder.
  */
 public class OnScreenIndicators {
+    private final int[] mWBArray;
     private final View mOnScreenIndicators;
     private final ImageView mExposureIndicator;
     private final ImageView mFlashIndicator;
     private final ImageView mSceneIndicator;
-    private final ImageView mHdrIndicator;
+    private final ImageView mLocationIndicator;
+    private final ImageView mTimerIndicator;
+    private final ImageView mWBIndicator;
 
-    public OnScreenIndicators(View onScreenIndicatorsView) {
+    public OnScreenIndicators(Context ctx, View onScreenIndicatorsView) {
+        TypedArray iconIds = ctx.getResources().obtainTypedArray(
+                R.array.camera_wb_indicators);
+        final int n = iconIds.length();
+        mWBArray = new int[n];
+        for (int i = 0; i < n; i++) {
+            mWBArray[i] = iconIds.getResourceId(i, R.drawable.ic_indicator_wb_off);
+        }
         mOnScreenIndicators = onScreenIndicatorsView;
         mExposureIndicator = (ImageView) onScreenIndicatorsView.findViewById(
                 R.id.menu_exposure_indicator);
@@ -42,7 +54,12 @@
                 R.id.menu_flash_indicator);
         mSceneIndicator = (ImageView) onScreenIndicatorsView.findViewById(
                 R.id.menu_scenemode_indicator);
-        mHdrIndicator = (ImageView) onScreenIndicatorsView.findViewById(R.id.menu_hdr_indicator);
+        mLocationIndicator = (ImageView) onScreenIndicatorsView.findViewById(
+                R.id.menu_location_indicator);
+        mTimerIndicator = (ImageView) onScreenIndicatorsView.findViewById(
+                R.id.menu_timer_indicator);
+        mWBIndicator = (ImageView) onScreenIndicatorsView.findViewById(
+                R.id.menu_wb_indicator);
     }
 
     /**
@@ -52,7 +69,9 @@
         updateExposureOnScreenIndicator(0);
         updateFlashOnScreenIndicator(Parameters.FLASH_MODE_OFF);
         updateSceneOnScreenIndicator(Parameters.SCENE_MODE_AUTO);
-        updateHdrOnScreenIndicator(Parameters.SCENE_MODE_AUTO);
+        updateWBIndicator(2);
+        updateTimerIndicator(false);
+        updateLocationIndicator(false);
     }
 
     /**
@@ -101,6 +120,23 @@
         mExposureIndicator.setImageResource(id);
     }
 
+    public void updateWBIndicator(int wbIndex) {
+        if (mWBIndicator == null) return;
+        mWBIndicator.setImageResource(mWBArray[wbIndex]);
+    }
+
+    public void updateTimerIndicator(boolean on) {
+        if (mTimerIndicator == null) return;
+        mTimerIndicator.setImageResource(on ? R.drawable.ic_indicator_timer_on
+                : R.drawable.ic_indicator_timer_off);
+    }
+
+    public void updateLocationIndicator(boolean on) {
+        if (mLocationIndicator == null) return;
+        mLocationIndicator.setImageResource(on ? R.drawable.ic_indicator_loc_on
+                : R.drawable.ic_indicator_loc_off);
+    }
+
     /**
      * Set the flash indicator to the given value.
      *
@@ -134,31 +170,16 @@
         if (mSceneIndicator == null) {
             return;
         }
-        if ((value == null) || Parameters.SCENE_MODE_AUTO.equals(value)
-                || Parameters.SCENE_MODE_HDR.equals(value)) {
+        if ((value == null) || Parameters.SCENE_MODE_AUTO.equals(value)) {
             mSceneIndicator.setImageResource(R.drawable.ic_indicator_sce_off);
+        } else if (Parameters.SCENE_MODE_HDR.equals(value)) {
+            mSceneIndicator.setImageResource(R.drawable.ic_indicator_sce_hdr);
         } else {
             mSceneIndicator.setImageResource(R.drawable.ic_indicator_sce_on);
         }
     }
 
     /**
-     * Sets the scene indicator to show whether HDR is on or off.
-     *
-     * @param value the current Parameters.SCENE_MODE_* value.
-     */
-    public void updateHdrOnScreenIndicator(String value) {
-        if (mHdrIndicator == null) {
-            return;
-        }
-        if ((value != null) && Parameters.SCENE_MODE_HDR.equals(value)) {
-            mHdrIndicator.setImageResource(R.drawable.ic_indicator_hdr_on);
-        } else {
-            mHdrIndicator.setImageResource(R.drawable.ic_indicator_hdr_off);
-        }
-    }
-
-    /**
      * Sets the visibility of all indicators.
      *
      * @param visibility View.VISIBLE, View.GONE etc.
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 3e71aa6..4d3f7fb 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -1909,7 +1909,7 @@
         mLocationManager.recordLocation(recordLocation);
 
         setCameraParametersWhenIdle(UPDATE_PARAM_PREFERENCE);
-        mUI.updateOnScreenIndicators(mParameters, mPreferences);
+        mUI.updateOnScreenIndicators(mParameters, mPreferenceGroup, mPreferences);
     }
 
     @Override
diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java
index 3f2945f..f7887c4 100644
--- a/src/com/android/camera/PhotoUI.java
+++ b/src/com/android/camera/PhotoUI.java
@@ -143,7 +143,7 @@
     }
 
     private void initIndicators() {
-        mOnScreenIndicators = new OnScreenIndicators(
+        mOnScreenIndicators = new OnScreenIndicators(mActivity,
                 mActivity.findViewById(R.id.on_screen_indicators));
     }
 
@@ -185,7 +185,7 @@
         mRenderOverlay.requestLayout();
 
         initializeZoom(params);
-        updateOnScreenIndicators(params, prefs);
+        updateOnScreenIndicators(params, prefGroup, prefs);
     }
 
     private void openMenu() {
@@ -294,13 +294,30 @@
     }
 
     public void updateOnScreenIndicators(Camera.Parameters params,
-            ComboPreferences prefs) {
+            PreferenceGroup group, ComboPreferences prefs) {
         if (params == null) return;
         mOnScreenIndicators.updateSceneOnScreenIndicator(params.getSceneMode());
         mOnScreenIndicators.updateExposureOnScreenIndicator(params,
                 CameraSettings.readExposure(prefs));
         mOnScreenIndicators.updateFlashOnScreenIndicator(params.getFlashMode());
-        mOnScreenIndicators.updateHdrOnScreenIndicator(params.getSceneMode());
+        int wbIndex = 2;
+        ListPreference pref = group.findPreference(CameraSettings.KEY_WHITE_BALANCE);
+        if (pref != null) {
+            wbIndex = pref.getCurrentIndex();
+        }
+        mOnScreenIndicators.updateWBIndicator(wbIndex);
+        pref = group.findPreference(CameraSettings.KEY_TIMER);
+        boolean timer = false;
+        if (pref != null) {
+            timer = !(pref.getCurrentIndex() == 0);
+        }
+        mOnScreenIndicators.updateTimerIndicator(timer);
+        boolean location = false;
+        pref = group.findPreference(CameraSettings.KEY_RECORD_LOCATION);
+        if (pref != null) {
+            location = !(pref.getCurrentIndex() == 0);
+        }
+        mOnScreenIndicators.updateLocationIndicator(location);
     }
 
 
diff --git a/src/com/android/camera/VideoUI.java b/src/com/android/camera/VideoUI.java
index 16a9d3c..e55de9e 100644
--- a/src/com/android/camera/VideoUI.java
+++ b/src/com/android/camera/VideoUI.java
@@ -100,7 +100,7 @@
                 }
             }
         });
-        mOnScreenIndicators = new OnScreenIndicators(
+        mOnScreenIndicators = new OnScreenIndicators(mActivity,
                 mActivity.findViewById(R.id.on_screen_indicators));
         mOnScreenIndicators.resetToDefault();
         if (mController.isVideoCaptureIntent()) {
diff --git a/src/com/android/gallery3d/ingest/IngestService.java b/src/com/android/gallery3d/ingest/IngestService.java
index 28d7211..05cc6f9 100644
--- a/src/com/android/gallery3d/ingest/IngestService.java
+++ b/src/com/android/gallery3d/ingest/IngestService.java
@@ -196,6 +196,7 @@
         if (device == mDevice) {
             setDevice(null);
             mNeedRelaunchNotification = false;
+            mNotificationManager.cancel(NotificationIds.INGEST_NOTIFICATION_SCANNING);
         }
     }