New icon and splash screen
Custom icon and splash screen
Merge upstream changes