diff --git a/frontend/android/assets/colorRushPhoto.png b/frontend/android/assets/colorRushPhoto.png
index b039323946590d58a11105872782fce8fb3b788c..c820977028c5614454677bec91f1fbb0de910816 100644
Binary files a/frontend/android/assets/colorRushPhoto.png and b/frontend/android/assets/colorRushPhoto.png differ
diff --git a/frontend/android/assets/colorRushPhotoEdit.png b/frontend/android/assets/colorRushPhotoEdit.png
index 5395ce3b9ab560e8ab4b9ea225cb94cf92a0b819..3f35ee58031891837e3e6431b85fde4cfb091e98 100644
Binary files a/frontend/android/assets/colorRushPhotoEdit.png and b/frontend/android/assets/colorRushPhotoEdit.png differ
diff --git a/frontend/core/src/com/gameware/game/states/PlayStateTemplate.java b/frontend/core/src/com/gameware/game/states/PlayStateTemplate.java
index 681fcf946d1d20ea2c6a3e82f96dbb27de645364..83bae43491a5be273acd8d720140af244029f703 100644
--- a/frontend/core/src/com/gameware/game/states/PlayStateTemplate.java
+++ b/frontend/core/src/com/gameware/game/states/PlayStateTemplate.java
@@ -66,7 +66,7 @@ public abstract class PlayStateTemplate extends State {
             gsm.set(new ScoreState(gsm, this.score, new FinishedTournamentState(gsm, tournament)));
         } else{
             //Tournament not finished
-            if(rc.isNextRound()) {
+            if(updatedRound.getTournamentPoints() != 0) {
                 try {
                     //Get new round if ready
                     Round nextRound = QueryIntermediate.getRoundFromTournament(tournament.get_id(), GameWare.getInstance().getPlayer().getId(), updatedRound.getRoundNr()+1);
@@ -74,8 +74,9 @@ public abstract class PlayStateTemplate extends State {
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
+            } else {
+                gsm.set(new ScoreState(gsm, this.score, new ViewTournamentState(gsm, tournament, updatedRound)));
             }
-            gsm.set(new ScoreState(gsm, this.score, new ViewTournamentState(gsm, tournament, updatedRound)));
         }
     }