Add icons, spash screen and demo
Fix merge conflict for image assets