Fix IconOptions & ActiveForm Row