Update #4212 by Henry: Finish to organize the icons and splash screens
Update #4212 by Henry: Finish to organize the icons and splash screens