Cleaned up icons, Fixes #5617

Fixes #5617

Also fixes my OCD