Clean up prefixes since we have icons