Optimization of symbology (#SUITE-1303)