Generic Production fix + some updated icons and restructuring