Draft: Adjust icon handling

This reverts commit c0f4ad86.

Merge request reports

Loading