Revert "Status bar battery: swap icon and percentage"

This reverts commit 8f363ed52dc0515644992bb0394ddb0e8bfa2f33.