[BUGFIX] Follow up: Remove icon doesn't work