Bring back infuse4g device settings

PS2:
- kk style icon taken from Slim, credits dexter93
PS4:
- cleanup whitespaces & tabs

Revert "Initial changes for cmhw and advanced display settings to follow"

This reverts commit 0320c9b1e4c9b721fefdd4e4c231c8bfce1bff25.

Change-Id: I7da763a4c2615e4e76860b0b41ccc286086252ac