Instead of using a Grid, just use a Typography element. This prevents
the icon from wrapping when there's not enough space.

This patch also clarifies the icon's type and allows the caller to
set properties directly to the icon when differentiation is needed.