diff --git a/src/components/submit-form/crop-portrait.tsx b/src/components/submit-form/image-editor.tsx
similarity index 79%
rename from src/components/submit-form/crop-portrait.tsx
rename to src/components/submit-form/image-editor.tsx
index 8b0ed7f..df1069a 100644
--- a/src/components/submit-form/crop-portrait.tsx
+++ b/src/components/submit-form/image-editor.tsx
@@ -11,7 +11,7 @@ interface Props {
 	setImage: React.Dispatch<React.SetStateAction<string | undefined>>;
 }
 
-export default function CropPortrait({ isOpen, setIsOpen, image, setImage }: Props) {
+export default function ImageEditorPortrait({ isOpen, setIsOpen, image, setImage }: Props) {
 	const [isVisible, setIsVisible] = useState(false);
 	const [crop, setCrop] = useState<Crop>();
 
@@ -38,9 +38,27 @@ export default function CropPortrait({ isOpen, setIsOpen, image, setImage }: Pro
 		ctx.drawImage(image, crop.x * scaleX, crop.y * scaleY, crop.width * scaleX, crop.height * scaleY, 0, 0, crop.width * scaleX, crop.height * scaleY);
 
 		setImage(canvas.toDataURL());
-		close();
+		setCrop(undefined);
 	}, [crop, setImage]);
 
+	const rotate = () => {
+		if (!imageRef.current || !canvasRef.current) return;
+
+		const image = imageRef.current;
+		const canvas = canvasRef.current;
+		const ctx = canvas.getContext("2d");
+		if (!ctx) return;
+
+		canvas.width = image.naturalHeight;
+		canvas.height = image.naturalWidth;
+
+		ctx.translate(canvas.width / 2, canvas.height / 2);
+		ctx.rotate(Math.PI / 2);
+		ctx.drawImage(image, -image.naturalWidth / 2, -image.naturalHeight / 2);
+
+		setImage(canvas.toDataURL());
+	};
+
 	const close = () => {
 		setIsVisible(false);
 		setTimeout(() => {
@@ -68,7 +86,7 @@ export default function CropPortrait({ isOpen, setIsOpen, image, setImage }: Pro
 				}`}
 			>
 				<div className="flex justify-between items-center mb-2">
-					<h2 className="text-xl font-bold">Crop Portrait</h2>
+					<h2 className="text-xl font-bold">Edit Image</h2>
 					<button type="button" aria-label="Close" onClick={close} className="text-red-400 hover:text-red-500 text-2xl cursor-pointer">
 						<Icon icon="material-symbols:close-rounded" />
 					</button>
@@ -88,6 +106,9 @@ export default function CropPortrait({ isOpen, setIsOpen, image, setImage }: Pro
 					<button type="button" onClick={applyCrop} className="pill button">
 						Crop
 					</button>
+					<button type="button" onClick={rotate} className="pill button">
+						Rotate
+					</button>
 				</div>
 			</div>
 		</div>
diff --git a/src/components/submit-form/switch-file-upload.tsx b/src/components/submit-form/switch-file-upload.tsx
index b774e39..d606690 100644
--- a/src/components/submit-form/switch-file-upload.tsx
+++ b/src/components/submit-form/switch-file-upload.tsx
@@ -5,7 +5,7 @@ import { FileWithPath } from "react-dropzone";
 import { Icon } from "@iconify/react";
 import Dropzone from "../dropzone";
 import Camera from "./camera";
-import CropPortrait from "./crop-portrait";
+import ImageEditorPortrait from "./image-editor";
 
 interface Props {
 	text: string;
@@ -55,8 +55,8 @@ export default function SwitchFileUpload({ text, forceCrop, image, setImage }: P
 				Use your camera
 			</button>
 			<button type="button" aria-label="Crop image" onClick={() => setIsCropOpen(true)} className="pill button gap-2">
-				<Icon icon="material-symbols:crop" fontSize={20} />
-				Crop Image
+				<Icon icon="mdi:image-edit" fontSize={20} />
+				Edit Image
 			</button>
 
 			<Camera
@@ -67,7 +67,7 @@ export default function SwitchFileUpload({ text, forceCrop, image, setImage }: P
 					if (forceCrop) setIsCropOpen(true);
 				}}
 			/>
-			<CropPortrait isOpen={isCropOpen} setIsOpen={setIsCropOpen} image={image} setImage={setImage} />
+			<ImageEditorPortrait isOpen={isCropOpen} setIsOpen={setIsCropOpen} image={image} setImage={setImage} />
 		</div>
 	);
 }