[UI] Icon cleanup