Striking my previous comment since after a git blame, it looks I added this abstract icon rule - we should make this more robust to handle in-line (e.g. header actions) vs. block-style buttons (add a component) with icons. This can wait be a separate clean up effort.