Merge branch '1556-order-of-icons' into 'devel_16.0.x'

preserver order

See merge request !1357
41 jobs for devel_16.0.x in 17 minutes and 6 seconds (queued for 8 seconds)