Replace tabs with spaces
Simplify icon size selection by using MAX() macro