Moved icons, cleaned resource references and some Strings.