Fix some icons used on system bar

Change-Id: I15b73506e3a5a958ef6c6bd4f016764d0b10d088
Prevent unnecessary checks for system bar setting

Change-Id: Idcca6b9388692dc5b1933d9fed45f85e3c704263