Fix for OP-1099: Hidden icons in Configuration tab
Merge branch 'bsongis/OP-1099_Hidden_icons_in_configuration_tab' into next