Re-implement menu icons

TODO: Look at the whole icon loading code, it looks overly complicated.