diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm
index 64ce472b56c..bd3419fc0a4 100644
--- a/code/modules/mob/living/simple_animal/friendly/cat.dm
+++ b/code/modules/mob/living/simple_animal/friendly/cat.dm
@@ -30,6 +30,19 @@
 	var/mob/living/simple_animal/mouse/movement_target
 	gold_core_spawnable = 2
 
+/mob/living/simple_animal/pet/cat/New()
+	..()
+	verbs += /mob/living/proc/lay_down
+
+/mob/living/simple_animal/pet/cat/update_canmove()
+	..()
+	if(client)
+		if (resting)
+			icon_state = "[icon_living]_rest"
+		else
+			icon_state = "[icon_living]"
+
+
 /mob/living/simple_animal/pet/cat/space
 	name = "space cat"
 	desc = "It's a cat... in space!"
@@ -42,7 +55,7 @@
 
 /mob/living/simple_animal/pet/cat/kitten
 	name = "kitten"
-	desc = "D'aaawwww"
+	desc = "D'aaawwww."
 	icon_state = "kitten"
 	icon_living = "kitten"
 	icon_dead = "kitten_dead"
@@ -108,22 +121,25 @@
 	gold_core_spawnable = 0
 
 /mob/living/simple_animal/pet/cat/Life()
-	if(!stat && !buckled)
+	if(!stat && !buckled && !client)
 		if(prob(1))
-			emote("me", 1, pick("stretches out for a belly rub.", "wags its tail."))
+			emote("me", 1, pick("stretches out for a belly rub.", "wags its tail.", "lies down."))
 			icon_state = "[icon_living]_rest"
 			resting = 1
+			update_canmove()
 		else if (prob(1))
-			emote("me", 1, pick("sits down.", "crouches on its hind legs."))
+			emote("me", 1, pick("sits down.", "crouches on its hind legs.", "looks alert."))
 			icon_state = "[icon_living]_sit"
 			resting = 1
+			update_canmove()
 		else if (prob(1))
 			if (resting)
-				emote("me", 1, pick("gets up and meows.", "walks around."))
+				emote("me", 1, pick("gets up and meows.", "walks around.", "stops resting."))
 				icon_state = "[icon_living]"
 				resting = 0
+				update_canmove()
 			else
-				emote("me", 1, pick("grooms its fur.", "twitches its whiskers."))
+				emote("me", 1, pick("grooms its fur.", "twitches its whiskers.", "shakes out its coat."))
 
 	//MICE!
 	if((src.loc) && isturf(src.loc))
diff --git a/icons/mob/pets.dmi b/icons/mob/pets.dmi
index a816f07aa19..ef3cc7be5fe 100644
Binary files a/icons/mob/pets.dmi and b/icons/mob/pets.dmi differ