More build bar icon work.

With any luck, I won't have to do any of that annoying stuff again.