Fill tool properly saves if advanced is active
Added overlay for advanced fill tool