diff --git a/apps/editor/public/icons/elevator.svg b/apps/editor/public/icons/elevator.svg
deleted file mode 100644
index ddc9563e..00000000
--- a/apps/editor/public/icons/elevator.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" role="img" aria-label="Elevator">
-  <rect x="12" y="6" width="40" height="52" rx="5" fill="#d9e2ec"/>
-  <rect x="16" y="10" width="32" height="44" rx="2" fill="#64748b"/>
-  <path d="M32 10v44" stroke="#d9e2ec" stroke-width="2.5"/>
-  <rect x="20" y="15" width="10" height="15" rx="1.5" fill="#9bd7ff" opacity=".9"/>
-  <rect x="34" y="15" width="10" height="15" rx="1.5" fill="#9bd7ff" opacity=".9"/>
-  <circle cx="23" cy="41" r="2.2" fill="#fbbf24"/>
-  <circle cx="41" cy="41" r="2.2" fill="#fbbf24"/>
-  <path d="M26 48h12" stroke="#d9e2ec" stroke-linecap="round" stroke-width="3"/>
-</svg>
diff --git a/packages/editor/src/components/editor/wall-move-side-handles.tsx b/packages/editor/src/components/editor/wall-move-side-handles.tsx
index 43bd9019..917e01e0 100644
--- a/packages/editor/src/components/editor/wall-move-side-handles.tsx
+++ b/packages/editor/src/components/editor/wall-move-side-handles.tsx
@@ -3,7 +3,9 @@
 import {
   type AnyNodeId,
   DEFAULT_WALL_HEIGHT,
+  getWallCurveFrameAt,
   getWallThickness,
+  isCurvedWall,
   sceneRegistry,
   useScene,
   type WallNode,
@@ -11,6 +13,7 @@ import {
 import { useViewer } from '@pascal-app/viewer'
 import { createPortal, type ThreeEvent } from '@react-three/fiber'
 import { useEffect, useMemo, useState } from 'react'
+import { useThree } from '@react-three/fiber'
 import {
   BufferGeometry,
   ConeGeometry,
@@ -18,6 +21,7 @@ import {
   DoubleSide,
   Float32BufferAttribute,
   type Object3D,
+  OrthographicCamera,
 } from 'three'
 import { sfxEmitter } from '../../lib/sfx-bus'
 import useEditor from '../../store/use-editor'
@@ -157,6 +161,14 @@ function WallMoveSideHandlesForWall({ wall }: { wall: WallNode }) {
 function WallMoveArrowHandle({ wall, handle }: { wall: WallNode; handle: WallMoveHandle }) {
   const [isHovered, setIsHovered] = useState(false)
   const arrowGeometry = useMemo(() => createArrowHandleGeometry(), [])
+  const { camera } = useThree()
+
+  const zoom =
+    camera instanceof OrthographicCamera
+      ? 1 / camera.zoom
+      : 1
+
+  const scale = (isHovered ? 1.12 : 1) * zoom
 
   useEffect(() => {
     return () => {
@@ -186,7 +198,7 @@ function WallMoveArrowHandle({ wall, handle }: { wall: WallNode; handle: WallMov
     <group
       position={handle.position}
       rotation={[0, handle.rotationY, 0]}
-      scale={isHovered ? 1.12 : 1}
+      scale={scale}
     >
       <mesh
         frustumCulled={false}
@@ -228,11 +240,13 @@ function getWallMoveHandles(wall: WallNode): WallMoveHandle[] {
     return []
   }
 
-  const normal: [number, number] = [-dz / length, dx / length]
-  const midpoint: [number, number] = [
-    (wall.start[0] + wall.end[0]) / 2,
-    (wall.start[1] + wall.end[1]) / 2,
-  ]
+  const frame = isCurvedWall(wall) ? getWallCurveFrameAt(wall, 0.5) : null
+  const normal: [number, number] = frame
+    ? [frame.normal.x, frame.normal.y]
+    : [-dz / length, dx / length]
+  const midpoint: [number, number] = frame
+    ? [frame.point.x, frame.point.y]
+    : [(wall.start[0] + wall.end[0]) / 2, (wall.start[1] + wall.end[1]) / 2]
   const wallHeight = wall.height ?? DEFAULT_WALL_HEIGHT
   const handleHeight = Math.max(wallHeight - HANDLE_TOP_INSET, HANDLE_MIN_HEIGHT)
   const offset = Math.max(getWallThickness(wall) / 2 + HANDLE_OFFSET, HANDLE_MIN_OFFSET)