Fixed "first time pressed" issue with icons