More icon renaming stuff...