Better painter logic
Bump icon size