Fix for non-changing icon on first click