diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm
index c925f2a1d4f..c17bd4c21f9 100644
--- a/code/game/objects/items/weapons/weaponry.dm
+++ b/code/game/objects/items/weapons/weaponry.dm
@@ -291,6 +291,7 @@
 	name = "skateboard"
 	desc = "A skateboard. It can be placed on its wheels and ridden, or used as a strong weapon."
 	icon_state = "skateboard"
+	item_state = "skateboard"
 	force = 12
 	throwforce = 4
 	w_class = 5.0
@@ -298,5 +299,4 @@
 
 /obj/item/weapon/melee/skateboard/attack_self(mob/user)
 	new /obj/vehicle/scooter/skateboard(get_turf(user))
-	user << "<span class='notice'>You place the skateboard down on its wheels. It's ready to ride.</span>"
 	qdel(src)
diff --git a/code/modules/vehicles/scooter.dm b/code/modules/vehicles/scooter.dm
index 0ecc8c31d37..dcd29d0a221 100644
--- a/code/modules/vehicles/scooter.dm
+++ b/code/modules/vehicles/scooter.dm
@@ -34,7 +34,7 @@
 				if(WEST)
 					buckled_mob.pixel_x = 2
 			if(buckled_mob.get_num_legs() > 0)
-				buckled_mob.pixel_y = 4
+				buckled_mob.pixel_y = 5
 			else
 				buckled_mob.pixel_y = -4
 
@@ -78,8 +78,10 @@
 	var/mob/living/carbon/M = usr
 	if(!istype(M) || M.incapacitated() || !Adjacent(M))
 		return
+	if(has_buckled_mobs() && over_object == M)
+		M << "<span class='warning'>You can't lift this up when somebody's on it.</span>"
+		return
 	if(over_object == M)
-		M << "<span class='notice'>You lift up the skateboard.</span>"
 		var/obj/item/weapon/melee/skateboard/board = new /obj/item/weapon/melee/skateboard()
 		M.put_in_hands(board)
 		qdel(src)
diff --git a/icons/mob/inhands/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi
index 2b7ff65eb98..e68ffabae02 100644
Binary files a/icons/mob/inhands/items_lefthand.dmi and b/icons/mob/inhands/items_lefthand.dmi differ
diff --git a/icons/mob/inhands/items_righthand.dmi b/icons/mob/inhands/items_righthand.dmi
index 46c92f609f8..3c5c823b0fc 100644
Binary files a/icons/mob/inhands/items_righthand.dmi and b/icons/mob/inhands/items_righthand.dmi differ
diff --git a/icons/obj/vehicles.dmi b/icons/obj/vehicles.dmi
index d9ff675828f..5dd427941e1 100644
Binary files a/icons/obj/vehicles.dmi and b/icons/obj/vehicles.dmi differ
diff --git a/icons/obj/weapons.dmi b/icons/obj/weapons.dmi
index 0924a71b3d5..3eaa0a859e8 100644
Binary files a/icons/obj/weapons.dmi and b/icons/obj/weapons.dmi differ