Clean code, modify icons, rename extension