r1904 + further icons usage overhaul