Better Icons II & White Halo Toggle

Change-Id: Ic299f16fccdb47001713b49ed3f85c25bf10a743