diff --git a/src/itdelatrisu/opsu/GameData.java b/src/itdelatrisu/opsu/GameData.java
index bfc27ebd..d600594e 100644
--- a/src/itdelatrisu/opsu/GameData.java
+++ b/src/itdelatrisu/opsu/GameData.java
@@ -980,7 +980,8 @@ public void drawHitResults(int trackPosition, boolean over) {
 				// results drawn OVER hit objects
 				if (over) {
 					// spinner
-					if (hitResult.hitResultType == HitObjectType.SPINNER && hitResult.result != HIT_MISS) {
+					if (hitResult.hitResultType == HitObjectType.SPINNER && hitResult.result != HIT_MISS &&
+					    Options.getSkin().getVersion() == 1) {
 						Image spinnerOsu = GameImage.SPINNER_OSU.getImage();
 						spinnerOsu.setAlpha(hitResult.alpha);
 						spinnerOsu.drawCentered(width / 2, height / 4);
diff --git a/src/itdelatrisu/opsu/states/Game.java b/src/itdelatrisu/opsu/states/Game.java
index ca841644..21ff371f 100644
--- a/src/itdelatrisu/opsu/states/Game.java
+++ b/src/itdelatrisu/opsu/states/Game.java
@@ -525,12 +525,13 @@ else if (breakIndex > 1) {
 				if ((endTimeDiff > 1500 && endTimeDiff < 2000) ||
 					(endTimeDiff > 500 && endTimeDiff < 1000)) {
 					Image arrow = GameImage.WARNINGARROW.getImage();
+					Color color = (Options.getSkin().getVersion() == 1) ? Color.white : Color.red;
 					arrow.setRotation(0);
-					arrow.draw(width * 0.15f, height * 0.15f);
-					arrow.draw(width * 0.15f, height * 0.75f);
+					arrow.draw(width * 0.15f, height * 0.15f, color);
+					arrow.draw(width * 0.15f, height * 0.75f, color);
 					arrow.setRotation(180);
-					arrow.draw(width * 0.75f, height * 0.15f);
-					arrow.draw(width * 0.75f, height * 0.75f);
+					arrow.draw(width * 0.75f, height * 0.15f, color);
+					arrow.draw(width * 0.75f, height * 0.75f, color);
 				}
 			}
 		}