Icons: some renaming, removal of old and unused