Combine admin icons

...aand backwards compatibility with regular images is kept. One less support issue!