diff --git a/code/game/machinery/lightswitch.dm b/code/game/machinery/lightswitch.dm
index 2936a5c2cb2..e32b3589280 100644
--- a/code/game/machinery/lightswitch.dm
+++ b/code/game/machinery/lightswitch.dm
@@ -13,16 +13,16 @@
 	name = "light switch" // Needed to remove the "(dir) bump" naming
 	switch(build_dir)
 		if(NORTH)
-			pixel_y = 25
+			pixel_y = -25
 			dir = NORTH
 		if(SOUTH)
-			pixel_y = -25
+			pixel_y = 25
 			dir = SOUTH
 		if(EAST)
-			pixel_x = 25
+			pixel_x = -25
 			dir = EAST
 		if(WEST)
-			pixel_x = -25
+			pixel_x = 25
 			dir = WEST
 
 	update_icon(UPDATE_ICON_STATE|UPDATE_OVERLAYS)
diff --git a/code/game/objects/items/mountable_frames/buttons_switches.dm b/code/game/objects/items/mountable_frames/buttons_switches.dm
index 0f1bd7434e9..56497939c33 100644
--- a/code/game/objects/items/mountable_frames/buttons_switches.dm
+++ b/code/game/objects/items/mountable_frames/buttons_switches.dm
@@ -21,7 +21,7 @@
 	metal_sheets_refunded = 1
 
 /obj/item/mounted/frame/light_switch/do_build(turf/on_wall, mob/user)
-	new /obj/machinery/light_switch(get_turf(user), get_dir(user, on_wall))
+	new /obj/machinery/light_switch(get_turf(user), get_dir(on_wall, user))
 	qdel(src)
 
 /obj/item/mounted/frame/light_switch/windowtint