Revert "Revert "Settings: follow kitkat's ui""

This reverts commit 7763cfac7bf1eafea5f3c318ad69a28633031281.

Change-Id: Ib86265add39250adf92ce7f3d58eacaffd8f3980