#3443904: Rework implementation of field type icon

Tom Keitelrequested to merge
issue/view_mode_switch-3443904:3443904-rework-implementation-of into 2.x

Closes #3443904

Merge request reports