#23 reworked icons