Converted over water waves.
Merge remote-tracking branch 'origin/features/ui-ugui' into features/placeholder-icons
added icons, change sprite directory