Revert "Temporary style fix until a refactor can be made"

This reverts commit 4ce424b06c1ece68755d68d69df3c0e83a0f937d.
An actual fix to increased icon size this time