Fixed all icons

Merge before we start breaking things ;)