Settings: Fix merge derps

Change-Id: I2d499488292164ed090ac946488e4e8171db8304
Settings: Update drawables

Change-Id: I03e21c2a80e00bb7858f555716c9f0484f3cc458
Settings: Move HALO and HOVER to Interface Settings and update some strings

Change-Id: I7bc1d6e78e105395389221536d4995eeb01949f8