diff --git a/core/frontend/src/components/vehiclesetup/OrientationPicker.vue b/core/frontend/src/components/vehiclesetup/OrientationPicker.vue
index 4a755e987..f8e04c752 100644
--- a/core/frontend/src/components/vehiclesetup/OrientationPicker.vue
+++ b/core/frontend/src/components/vehiclesetup/OrientationPicker.vue
@@ -8,7 +8,27 @@
       return-object
       :item-text="'name'"
     />
-    <div ref="threemount" class="threejsmount" />
+    <div class="threejs-container">
+      <div ref="threemount" class="threejsmount" />
+      <div class="control-overlay">
+          <v-btn
+            :color="transformMode === 'rotate' ? 'primary' : ''"
+            @click="setTransformMode('rotate')"
+            small
+          >
+            <v-icon>mdi-rotate-3d</v-icon>
+            Rotate
+          </v-btn>
+          <v-btn
+            :color="transformMode === 'translate' ? 'primary' : ''"
+            @click="setTransformMode('translate')"
+            small
+          >
+            <v-icon>mdi-arrow-all</v-icon>
+            Move
+          </v-btn>
+      </div>
+    </div>
   </v-card>
 </template>
 
@@ -59,6 +79,7 @@ export default {
   data() {
     return {
       transformControls: undefined as TransformControls | undefined,
+      transformMode: 'rotate' as 'rotate' | 'translate',
       rotations: [
         new Rotation('NONE', 0, 0, 0),
         new Rotation('YAW_45', 0, 0, 45),
@@ -147,6 +168,9 @@ export default {
     selectedRotation(rotation) {
       this.rotateObject(rotation)
     },
+    selectedRotation(rotation) {
+      this.rotateObject(rotation)
+    },
   },
   mounted() {
     const scene = new THREE.Scene()
@@ -199,7 +223,7 @@ export default {
       orbitControls.enabled = true
     })
     
-    this.transformControls.setMode('translate')
+    this.transformControls.setMode(this.transformMode)
     this.transformControls.setSpace('local')
     scene.add(this.transformControls)
     const animate = () : void => {
@@ -220,6 +244,12 @@ export default {
     window.removeEventListener('resize', this.resize)
   },
   methods: {
+    setTransformMode(mode: 'rotate' | 'translate') {
+      this.transformMode = mode
+      if (this.transformControls) {
+        this.transformControls.setMode(mode)
+      }
+    },
     rotateObject(rotation: Rotation | undefined) {
       if (!rotation) {
         return