Revert "Settings: option to hide battery icon (2/2)"

This reverts commit bfc99e7782b1007534cd4358154f9cb028915753.

Conflicts:
	res/values-es/revo_strings.xml
	res/values/revo_strings.xml

Change-Id: I0a6e2ac441c12230063e65e112fc5c1628b30348