Revert "[1/2] Settings: Add percent only and none options for battery icon"

This reverts commit 30bd9e2134b4d48f783a7fb68d979d87d30892e5.
Revert "[2/2] Settings: Optional statusbar battery icons"

This reverts commit dd86da192ea9e42107ee5dd708487230e00163f0.