More updates to icons

I believe consistency is important, so I'm updating a lot of them. I
will however not be touching the units that aren't in their final form.
As with all the changes, feel free to revert if you don't agree.