Settings: fix checkbox privacyguard + cleanup

Fix padding issue as well big cleanup. Danny showed an
easyer way :D

finally finished

Change-Id: I4002a52c7d5ba6261482a7ba5ef32952e04f8f2e
Merge "Settings: fix checkbox privacyguard + cleanup" into jb4.2