Re-add icon, use updated event handlers
prevent grey paint which matches the background