Change handler icon, still sucks unfortunately :-(