Trying to clean up icon registration