revamp Settings Appearance

Change-Id: I1affc54373a1944855b38df935501408214482ac