Seems OK yeah. Probably before this PR is merged the docs should be updated to explain these icons/behaviours and why they exist.
----
I guess it's outside the scope of the PR, but in the long run I think it would be better to come up with a better designed, more holistic approach to settings that doesn't confuse users or require adding all these little icons/labels/special cases everywhere.