diff --git a/apps/web/components/v2/apps/App.tsx b/apps/web/components/v2/apps/App.tsx
index 9d1f894c93..d86a47d05b 100644
--- a/apps/web/components/v2/apps/App.tsx
+++ b/apps/web/components/v2/apps/App.tsx
@@ -66,7 +66,7 @@ const Component = ({
   return (
     <div className="relative flex-1 flex-col items-start justify-start px-4 md:flex md:px-8 lg:flex-row lg:px-0">
       {hasImages && (
-        <div className="flex-2 mb-4 -ml-4 -mr-4 flex min-h-[450px] w-auto min-w-[672px] snap-x snap-mandatory flex-row overflow-auto whitespace-nowrap bg-gray-100  p-4 md:mb-8 md:-ml-8 md:-mr-8 md:p-8 lg:mx-0 lg:mb-0 lg:max-w-2xl lg:flex-col lg:rounded-md">
+        <div className="flex-2 mb-4 -ml-4 -mr-4 flex min-h-[450px] w-auto snap-x snap-mandatory flex-row overflow-auto whitespace-nowrap bg-gray-100  p-4 md:mb-8 md:-ml-8 md:-mr-8 md:p-8 lg:mx-0 lg:mb-0 lg:max-w-2xl lg:flex-col lg:rounded-md">
           {images ? (
             images.map((img) => (
               <img
diff --git a/packages/ui/v2/core/Shell.tsx b/packages/ui/v2/core/Shell.tsx
index 927bc113ca..ede20fe787 100644
--- a/packages/ui/v2/core/Shell.tsx
+++ b/packages/ui/v2/core/Shell.tsx
@@ -4,6 +4,7 @@ import { signOut, useSession } from "next-auth/react";
 import Link from "next/link";
 import { NextRouter, useRouter } from "next/router";
 import React, { Dispatch, Fragment, ReactNode, SetStateAction, useEffect, useState } from "react";
+import { Trash2 } from "react-feather";
 import { Toaster } from "react-hot-toast";
 
 import dayjs from "@calcom/dayjs";
@@ -26,6 +27,7 @@ import Dropdown, {
   DropdownMenuTrigger,
 } from "@calcom/ui/Dropdown";
 import { Icon } from "@calcom/ui/Icon";
+import Button from "@calcom/ui/v2/core/Button";
 
 /* TODO: Get this from endpoint */
 import pkg from "../../../../apps/web/package.json";
@@ -747,9 +749,13 @@ export function ShellMain(props: LayoutProps) {
     <>
       <div className="flex items-baseline sm:mt-0">
         {!!props.backPath && (
-          <Icon.FiArrowLeft
-            className="mr-3 hover:cursor-pointer"
+          <Button
+            size="icon"
+            color="minimal"
             onClick={() => router.push(props.backPath as string)}
+            StartIcon={Icon.FiArrowLeft}
+            aria-label="Go Back"
+            className="ltr:mr-2 rtl:ml-2"
           />
         )}
         {props.heading && (