fix icon alignment

Change-Id: Ie42e2a63a7951d2b1d0b833b033af99bba531720
update settings layout

Change-Id: I8a2c53c8dea6772615cd5de80f8f5a21f666e7db