Revert "Issue #1356602 by nicholasruunu, mcjim, rteijeiro, chrisjlee | jenlampton: Clean up icons in misc."

This clean-up accidentally introduced a few regressions, so rolling back until it's ready.

This reverts commit fab42693.