diff --git a/src/main/java/seng302/gameServer/GameState.java b/src/main/java/seng302/gameServer/GameState.java
index 965c57ed..f28b29e1 100644
--- a/src/main/java/seng302/gameServer/GameState.java
+++ b/src/main/java/seng302/gameServer/GameState.java
@@ -1,8 +1,6 @@
 package seng302.gameServer;
 
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -26,8 +24,6 @@ import seng302.gameServer.messages.MarkRoundingMessage;
 import seng302.gameServer.messages.MarkType;
 import seng302.gameServer.messages.Message;
 import seng302.gameServer.messages.RoundingBoatStatus;
-import seng302.gameServer.messages.YachtEventCodeMessage;
-import seng302.gameServer.messages.YachtEventType;
 import seng302.model.GeoPoint;
 import seng302.model.Limit;
 import seng302.model.Player;
@@ -359,8 +355,8 @@ public class GameState implements Runnable {
      */
     private void spawnNewToken() {
         tokensInPlay.clear();
-        Token token = randomSpawn.getRandomTokenLocation();
-//        token.assignType(TokenType.WIND_WALKER);
+        Token token = randomSpawn.getRandomToken();
+//        token.assignType(TokenType.RANDOM);
         logger.debug("Spawned token of type " + token.getTokenType());
         tokensInPlay.add(token);
     }
diff --git a/src/main/java/seng302/utilities/RandomSpawn.java b/src/main/java/seng302/utilities/RandomSpawn.java
index 929e5766..b09fc032 100644
--- a/src/main/java/seng302/utilities/RandomSpawn.java
+++ b/src/main/java/seng302/utilities/RandomSpawn.java
@@ -16,6 +16,7 @@ public class RandomSpawn {
     private static final Integer DEGREES_IN_CIRCLE = 360;
 
     private HashMap<GeoPoint, Double> spawnRadii;
+    private Object[] spawnCentres;
     private Random random;
 
     /**
@@ -27,6 +28,7 @@ public class RandomSpawn {
         random = new Random();
 
         spawnRadii = generateSpawnRadii(markOrder);
+        spawnCentres = spawnRadii.keySet().toArray();
     }
 
     private HashMap<GeoPoint, Double> generateSpawnRadii(List<CompoundMark> markOrder) {
@@ -48,9 +50,8 @@ public class RandomSpawn {
      * @return A random token type at a random location in a random radii of the set of possible
      * radii
      */
-    public Token getRandomTokenLocation() {
-        Object[] keys = spawnRadii.keySet().toArray();
-        GeoPoint randomSpawnCentre = (GeoPoint) keys[random.nextInt(keys.length)];
+    public Token getRandomToken() {
+        GeoPoint randomSpawnCentre = (GeoPoint) spawnCentres[random.nextInt(spawnCentres.length)];
         Double spawnRadius = spawnRadii.get(randomSpawnCentre);
         Double randomDistance = spawnRadius * random.nextDouble();
         Double randomAngle = random.nextDouble() * DEGREES_IN_CIRCLE;
diff --git a/src/main/resources/icons/ayy_lmao.gif b/src/main/resources/icons/ayy_lmao.gif
deleted file mode 100644
index 884b1f50..00000000
Binary files a/src/main/resources/icons/ayy_lmao.gif and /dev/null differ
diff --git a/src/main/resources/icons/bumperIcon.png b/src/main/resources/icons/bumperIcon.png
index c1da6d4c..1a723028 100644
Binary files a/src/main/resources/icons/bumperIcon.png and b/src/main/resources/icons/bumperIcon.png differ
diff --git a/src/main/resources/icons/handlingIcon.png b/src/main/resources/icons/handlingIcon.png
index ac7cdcda..3286804e 100644
Binary files a/src/main/resources/icons/handlingIcon.png and b/src/main/resources/icons/handlingIcon.png differ
diff --git a/src/main/resources/icons/velocity.png b/src/main/resources/icons/velocity.png
index f9f2c3d4..22ee1d72 100644
Binary files a/src/main/resources/icons/velocity.png and b/src/main/resources/icons/velocity.png differ
diff --git a/src/main/resources/icons/windWalkerIcon.png b/src/main/resources/icons/windWalkerIcon.png
index 44ef53e8..5e39ddba 100644
Binary files a/src/main/resources/icons/windWalkerIcon.png and b/src/main/resources/icons/windWalkerIcon.png differ
diff --git a/src/main/resources/views/RaceView.fxml b/src/main/resources/views/RaceView.fxml
index 70c8399b..2d0769af 100644
--- a/src/main/resources/views/RaceView.fxml
+++ b/src/main/resources/views/RaceView.fxml
@@ -284,7 +284,7 @@
                           GridPane.columnIndex="4" GridPane.halignment="CENTER"
                           GridPane.rowIndex="1" GridPane.valignment="CENTER">
                             <image>
-                                <Image url="@../icons/ayy_lmao.gif"/>
+                                <Image url="@../icons/slowedIcon.png"/>
                             </image>
                         </ImageView>
                     </children>
diff --git a/src/test/java/seng302/utilities/RandomSpawnTest.java b/src/test/java/seng302/utilities/RandomSpawnTest.java
index 60966ab8..a50d3b11 100644
--- a/src/test/java/seng302/utilities/RandomSpawnTest.java
+++ b/src/test/java/seng302/utilities/RandomSpawnTest.java
@@ -39,7 +39,7 @@ public class RandomSpawnTest {
             .getDirtyMidPoint(compoundMark1.getMidPoint(), compoundMark2.getMidPoint());
         Double maxDistance = GeoUtility.getDistance(testMidPoint, compoundMark2.getMidPoint());
         for (int i = 0; i < 1000; i++) {
-            Token token = randomSpawn.getRandomTokenLocation();
+            Token token = randomSpawn.getRandomToken();
             Double distanceFromCentreRadius = GeoUtility.getDistance(testMidPoint, token);
             assertTrue("Out of bounds token", distanceFromCentreRadius <= maxDistance);
         }