diff --git a/packages/manager/.changeset/pr-9601-tech-stories-1693323398599.md b/packages/manager/.changeset/pr-9601-tech-stories-1693323398599.md
new file mode 100644
index 00000000000..ddf88b89f9e
--- /dev/null
+++ b/packages/manager/.changeset/pr-9601-tech-stories-1693323398599.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Tech Stories
+---
+
+De-Redux-ify and clean up the Volumes Drawer ([#9601](https://github.com/linode/manager/pull/9601))
diff --git a/packages/manager/cypress/e2e/core/volumes/create-volume.spec.ts b/packages/manager/cypress/e2e/core/volumes/create-volume.spec.ts
index f20cb3709ba..4fd3de68d54 100644
--- a/packages/manager/cypress/e2e/core/volumes/create-volume.spec.ts
+++ b/packages/manager/cypress/e2e/core/volumes/create-volume.spec.ts
@@ -195,7 +195,6 @@ describe('volume create flow', () => {
 
         // Confirm volume configuration drawer opens, then close it.
         cy.get('[data-qa-drawer="true"]').within(() => {
-          fbtVisible('Volume scheduled for creation.');
           getClick('[data-qa-close-drawer="true"]');
         });
 
diff --git a/packages/manager/cypress/e2e/core/volumes/resize-volume.spec.ts b/packages/manager/cypress/e2e/core/volumes/resize-volume.spec.ts
index 7acda47845d..3af33370680 100644
--- a/packages/manager/cypress/e2e/core/volumes/resize-volume.spec.ts
+++ b/packages/manager/cypress/e2e/core/volumes/resize-volume.spec.ts
@@ -88,12 +88,7 @@ describe('volume resize flow', () => {
 
         // Confirm that volume is resized.
         cy.wait('@resizeVolume').its('response.statusCode').should('eq', 200);
-        cy.findByText('Volume scheduled to be resized.')
-          .should('be.visible')
-          .closest('[data-qa-drawer="true"]')
-          .within(() => {
-            cy.findByText('Close').click();
-          });
+        cy.findByText('Volume scheduled to be resized.').should('be.visible');
 
         cy.findByText(volume.label)
           .closest('tr')
diff --git a/packages/manager/cypress/e2e/core/volumes/update-volume.spec.ts b/packages/manager/cypress/e2e/core/volumes/update-volume.spec.ts
index 447c1c4f7ce..30a8e065be2 100644
--- a/packages/manager/cypress/e2e/core/volumes/update-volume.spec.ts
+++ b/packages/manager/cypress/e2e/core/volumes/update-volume.spec.ts
@@ -49,7 +49,7 @@ describe('volume update flow', () => {
           cy.findByDisplayValue(volume.label)
             .should('be.visible')
             .click()
-            .type(`{selectall}{backspace}${newLabel}{enter}`);
+            .type(`{selectall}{backspace}${newLabel}`);
 
           cy.findByText('Type to choose or create a tag.')
             .should('be.visible')
diff --git a/packages/manager/src/MainContent.tsx b/packages/manager/src/MainContent.tsx
index ce608bc497f..7bd2f36720a 100644
--- a/packages/manager/src/MainContent.tsx
+++ b/packages/manager/src/MainContent.tsx
@@ -26,7 +26,6 @@ import {
 } from 'src/features/NotificationCenter/NotificationContext';
 import { ToastNotifications } from 'src/features/ToastNotifications/ToastNotifications';
 import { TopMenu } from 'src/features/TopMenu/TopMenu';
-import VolumeDrawer from 'src/features/Volumes/VolumeDrawer';
 import { useAccountManagement } from 'src/hooks/useAccountManagement';
 import { useFlags } from 'src/hooks/useFlags';
 import { usePreferences } from 'src/queries/preferences';
@@ -381,7 +380,6 @@ const MainContent = (props: CombinedProps) => {
             </NotificationProvider>
             <Footer desktopMenuIsOpen={desktopMenuIsOpen} />
             <ToastNotifications />
-            <VolumeDrawer />
           </ComplianceUpdateProvider>
         )}
       </PreferenceToggle>
diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodeStorage/LinodeVolumes.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodeStorage/LinodeVolumes.tsx
index 50920585c41..ca8b429bc93 100644
--- a/packages/manager/src/features/Linodes/LinodesDetail/LinodeStorage/LinodeVolumes.tsx
+++ b/packages/manager/src/features/Linodes/LinodesDetail/LinodeStorage/LinodeVolumes.tsx
@@ -1,9 +1,8 @@
+import { Volume } from '@linode/api-v4';
 import Grid from '@mui/material/Unstable_Grid2';
 import { styled } from '@mui/material/styles';
 import * as React from 'react';
-import { connect } from 'react-redux';
 import { useParams } from 'react-router-dom';
-import { Dispatch, bindActionCreators } from 'redux';
 
 import AddNewLink from 'src/components/AddNewLink';
 import { Hidden } from 'src/components/Hidden';
@@ -17,79 +16,25 @@ import { TableRowEmpty } from 'src/components/TableRowEmpty/TableRowEmpty';
 import { TableRowError } from 'src/components/TableRowError/TableRowError';
 import { TableRowLoading } from 'src/components/TableRowLoading/TableRowLoading';
 import { TableSortCell } from 'src/components/TableSortCell';
-import { DestructiveVolumeDialog } from 'src/features/Volumes/DestructiveVolumeDialog';
-import { VolumeAttachmentDrawer } from 'src/features/Volumes/VolumeAttachmentDrawer';
+import { CloneVolumeDrawer } from 'src/features/Volumes/CloneVolumeDrawer';
+import { DeleteVolumeDialog } from 'src/features/Volumes/DeleteVolumeDialog';
+import { DetachVolumeDialog } from 'src/features/Volumes/DetachVolumeDialog';
+import { EditVolumeDrawer } from 'src/features/Volumes/EditVolumeDrawer';
+import { ResizeVolumeDrawer } from 'src/features/Volumes/ResizeVolumeDrawer';
+import { VolumeDetailsDrawer } from 'src/features/Volumes/VolumeDetailsDrawer';
 import { VolumeTableRow } from 'src/features/Volumes/VolumeTableRow';
-import { ActionHandlers as VolumeHandlers } from 'src/features/Volumes/VolumesActionMenu';
 import { useOrder } from 'src/hooks/useOrder';
 import { usePagination } from 'src/hooks/usePagination';
 import { useLinodeQuery } from 'src/queries/linodes/linodes';
 import { useRegionsQuery } from 'src/queries/regions';
 import { useLinodeVolumesQuery } from 'src/queries/volumes';
-import {
-  LinodeOptions,
-  Origin as VolumeDrawerOrigin,
-  openForClone,
-  openForConfig,
-  openForCreating,
-  openForEdit,
-  openForResize,
-} from 'src/store/volumeForm';
 
 import { StyledRootGrid, StyledTypography } from './CommonLinodeStorage.styles';
-
-interface DispatchProps {
-  openForClone: (
-    volumeId: number,
-    volumeLabel: string,
-    volumeSize: number,
-    volumeRegion: string
-  ) => void;
-  openForConfig: (volumeLabel: string, volumePath: string) => void;
-  openForCreating: (
-    origin: VolumeDrawerOrigin,
-    linodeOptions?: LinodeOptions
-  ) => void;
-  openForEdit: (
-    volumeId: number,
-    volumeLabel: string,
-    volumeTags: string[]
-  ) => void;
-  openForResize: (
-    volumeId: number,
-    volumeSize: number,
-    volumeLabel: string,
-    volumeRegion: string
-  ) => void;
-}
-
-const mapDispatchToProps = (dispatch: Dispatch) =>
-  bindActionCreators(
-    {
-      openForClone,
-      openForConfig,
-      openForCreating,
-      openForEdit,
-      openForResize,
-    },
-    dispatch
-  );
-
-const connected = connect(undefined, mapDispatchToProps);
-
-type Props = DispatchProps;
+import { LinodeVolumeAddDrawer } from 'src/features/Volumes/VolumeDrawer/LinodeVolumeAddDrawer';
 
 export const preferenceKey = 'linode-volumes';
 
-export const LinodeVolumes = connected((props: Props) => {
-  const {
-    openForClone,
-    openForConfig,
-    openForCreating,
-    openForEdit,
-    openForResize,
-  } = props;
-
+export const LinodeVolumes = () => {
   const { linodeId } = useParams<{ linodeId: string }>();
   const id = Number(linodeId);
 
@@ -121,91 +66,49 @@ export const LinodeVolumes = connected((props: Props) => {
     filter
   );
 
-  const [attachmentDrawer, setAttachmentDrawer] = React.useState({
-    linodeRegion: '',
-    open: false,
-    volumeId: 0,
-    volumeLabel: '',
-  });
+  const [selectedVolumeId, setSelectedVolumeId] = React.useState<number>();
+  const [isDetailsDrawerOpen, setIsDetailsDrawerOpen] = React.useState(false);
+  const [isEditDrawerOpen, setIsEditDrawerOpen] = React.useState(false);
+  const [isResizeDrawerOpen, setIsResizeDrawerOpen] = React.useState(false);
+  const [isCloneDrawerOpen, setIsCloneDrawerOpen] = React.useState(false);
+  const [isCreateDrawerOpen, setIsCreateDrawerOpen] = React.useState(false);
+  const [isDetachDialogOpen, setIsDetachDialogOpen] = React.useState(false);
+  const [isDeleteDialogOpen, setIsDeleteDialogOpen] = React.useState(false);
 
-  const [destructiveDialog, setDestructiveDialog] = React.useState<{
-    linodeLabel: string;
-    mode: 'delete' | 'detach';
-    open: boolean;
-    volumeId?: number;
-    volumeLabel: string;
-  }>({
-    linodeLabel: '',
-    mode: 'detach',
-    open: false,
-    volumeId: 0,
-    volumeLabel: '',
-  });
+  const selectedVolume = data?.data.find((v) => v.id === selectedVolumeId);
 
-  const handleCloseAttachDrawer = () => {
-    setAttachmentDrawer((attachmentDrawer) => ({
-      ...attachmentDrawer,
-      open: false,
-    }));
+  const handleDetach = (volume: Volume) => {
+    setSelectedVolumeId(volume.id);
+    setIsDetachDialogOpen(true);
   };
 
-  const handleAttach = (volumeId: number, label: string, regionID: string) => {
-    setAttachmentDrawer((attachmentDrawer) => ({
-      ...attachmentDrawer,
-      linodeRegion: regionID,
-      open: true,
-      volumeId,
-      volumeLabel: label,
-    }));
+  const handleDelete = (volume: Volume) => {
+    setSelectedVolumeId(volume.id);
+    setIsDeleteDialogOpen(true);
   };
 
-  const handleDetach = (
-    volumeId: number,
-    volumeLabel: string,
-    linodeLabel: string,
-    linodeId: number
-  ) => {
-    setDestructiveDialog((destructiveDialog) => ({
-      ...destructiveDialog,
-      error: '',
-      linodeId,
-      linodeLabel,
-      mode: 'detach',
-      open: true,
-      volumeId,
-      volumeLabel,
-    }));
+  const handleDetails = (volume: Volume) => {
+    setSelectedVolumeId(volume.id);
+    setIsDetailsDrawerOpen(true);
   };
 
-  const handleDelete = (volumeId: number, volumeLabel: string) => {
-    setDestructiveDialog((destructiveDialog) => ({
-      ...destructiveDialog,
-      error: '',
-      linodeLabel: '',
-      mode: 'delete',
-      open: true,
-      volumeId,
-      volumeLabel,
-    }));
+  const handleEdit = (volume: Volume) => {
+    setSelectedVolumeId(volume.id);
+    setIsEditDrawerOpen(true);
   };
 
-  const closeDestructiveDialog = () => {
-    setDestructiveDialog((destructiveDialog) => ({
-      ...destructiveDialog,
-      open: false,
-    }));
+  const handleResize = (volume: Volume) => {
+    setSelectedVolumeId(volume.id);
+    setIsResizeDrawerOpen(true);
   };
 
-  const openCreateVolumeDrawer = (e: any) => {
-    e.preventDefault();
+  const handleClone = (volume: Volume) => {
+    setSelectedVolumeId(volume.id);
+    setIsCloneDrawerOpen(true);
+  };
 
-    if (linode) {
-      return openForCreating('Created from Linode Details', {
-        linodeId: linode.id,
-        linodeLabel: linode.label,
-        linodeRegion: linode.region,
-      });
-    }
+  const handleCreateVolume = () => {
+    setIsCreateDrawerOpen(true);
   };
 
   const region = regions.find((thisRegion) => thisRegion.id === linode?.region);
@@ -214,16 +117,6 @@ export const LinodeVolumes = connected((props: Props) => {
     return null;
   }
 
-  const handlers: VolumeHandlers = {
-    handleAttach,
-    handleDelete,
-    handleDetach,
-    openForClone,
-    openForConfig,
-    openForEdit,
-    openForResize,
-  };
-
   const renderTableContent = () => {
     if (isLoading) {
       return (
@@ -240,14 +133,24 @@ export const LinodeVolumes = connected((props: Props) => {
     } else if (data?.results === 0) {
       return <TableRowEmpty colSpan={5} message="No Volumes to display." />;
     } else if (data) {
-      return data.data.map((volume) => (
-        <VolumeTableRow
-          key={volume.id}
-          {...volume}
-          {...handlers}
-          isDetailsPageRow
-        />
-      ));
+      return data.data.map((volume) => {
+        return (
+          <VolumeTableRow
+            handlers={{
+              handleAttach: () => null,
+              handleClone: () => handleClone(volume),
+              handleDelete: () => handleDelete(volume),
+              handleDetach: () => handleDetach(volume),
+              handleDetails: () => handleDetails(volume),
+              handleEdit: () => handleEdit(volume),
+              handleResize: () => handleResize(volume),
+            }}
+            isDetailsPageRow
+            key={volume.id}
+            volume={volume}
+          />
+        );
+      });
     }
 
     return null;
@@ -268,7 +171,7 @@ export const LinodeVolumes = connected((props: Props) => {
           <AddNewLink
             disabled={false}
             label="Create Volume"
-            onClick={openCreateVolumeDrawer}
+            onClick={handleCreateVolume}
           />
         </StyledNewWrapperGrid>
       </StyledRootGrid>
@@ -315,25 +218,47 @@ export const LinodeVolumes = connected((props: Props) => {
         page={pagination.page}
         pageSize={pagination.pageSize}
       />
-      <VolumeAttachmentDrawer
-        linodeRegion={attachmentDrawer.linodeRegion || ''}
-        onClose={handleCloseAttachDrawer}
-        open={attachmentDrawer.open}
-        volumeId={attachmentDrawer.volumeId || 0}
-        volumeLabel={attachmentDrawer.volumeLabel || ''}
+      {linode && (
+        <LinodeVolumeAddDrawer
+          linode={linode}
+          onClose={() => setIsCreateDrawerOpen(false)}
+          open={isCreateDrawerOpen}
+          openDetails={handleDetails}
+        />
+      )}
+      <VolumeDetailsDrawer
+        onClose={() => setIsDetailsDrawerOpen(false)}
+        open={isDetailsDrawerOpen}
+        volume={selectedVolume}
+      />
+      <EditVolumeDrawer
+        onClose={() => setIsEditDrawerOpen(false)}
+        open={isEditDrawerOpen}
+        volume={selectedVolume}
+      />
+      <ResizeVolumeDrawer
+        onClose={() => setIsResizeDrawerOpen(false)}
+        open={isResizeDrawerOpen}
+        volume={selectedVolume}
+      />
+      <CloneVolumeDrawer
+        onClose={() => setIsCloneDrawerOpen(false)}
+        open={isCloneDrawerOpen}
+        volume={selectedVolume}
+      />
+      <DetachVolumeDialog
+        onClose={() => setIsDetachDialogOpen(false)}
+        open={isDetachDialogOpen}
+        volume={selectedVolume}
       />
-      <DestructiveVolumeDialog
-        linodeId={id}
-        linodeLabel={destructiveDialog.linodeLabel}
-        mode={destructiveDialog.mode}
-        onClose={closeDestructiveDialog}
-        open={destructiveDialog.open}
-        volumeId={destructiveDialog.volumeId ?? 0}
-        volumeLabel={destructiveDialog.volumeLabel}
+      <DeleteVolumeDialog
+        onClose={() => setIsDeleteDialogOpen(false)}
+        open={isDeleteDialogOpen}
+        volume={selectedVolume}
       />
     </div>
   );
-});
+};
 
 const StyledNewWrapperGrid = styled(Grid, { label: 'StyledNewWrapperGrid' })(
   ({ theme }) => ({
diff --git a/packages/manager/src/features/Volumes/VolumeAttachmentDrawer.tsx b/packages/manager/src/features/Volumes/AttachVolumeDrawer.tsx
similarity index 78%
rename from packages/manager/src/features/Volumes/VolumeAttachmentDrawer.tsx
rename to packages/manager/src/features/Volumes/AttachVolumeDrawer.tsx
index 211b68a6c24..b081420b528 100644
--- a/packages/manager/src/features/Volumes/VolumeAttachmentDrawer.tsx
+++ b/packages/manager/src/features/Volumes/AttachVolumeDrawer.tsx
@@ -1,5 +1,6 @@
-import { Grant } from '@linode/api-v4/lib/account';
+import { Volume } from '@linode/api-v4';
 import { useFormik } from 'formik';
+import { useSnackbar } from 'notistack';
 import * as React from 'react';
 import { number, object } from 'yup';
 
@@ -12,17 +13,14 @@ import { Notice } from 'src/components/Notice/Notice';
 import { resetEventsPolling } from 'src/eventsPolling';
 import { LinodeSelect } from 'src/features/Linodes/LinodeSelect/LinodeSelect';
 import { useAllLinodeConfigsQuery } from 'src/queries/linodes/configs';
-import { useGrants, useProfile } from 'src/queries/profile';
+import { useGrants } from 'src/queries/profile';
 import { useAttachVolumeMutation } from 'src/queries/volumes';
 import getAPIErrorsFor from 'src/utilities/getAPIErrorFor';
 
 interface Props {
-  disabled?: boolean;
-  linodeRegion: string;
   onClose: () => void;
   open: boolean;
-  volumeId: number;
-  volumeLabel: string;
+  volume: Volume | undefined;
 }
 
 const AttachVolumeValidationSchema = object({
@@ -34,10 +32,11 @@ const AttachVolumeValidationSchema = object({
     .required('Linode is required.'),
 });
 
-export const VolumeAttachmentDrawer = React.memo((props: Props) => {
-  const { disabled, linodeRegion, open, volumeId, volumeLabel } = props;
+export const AttachVolumeDrawer = React.memo((props: Props) => {
+  const { open, volume } = props;
+
+  const { enqueueSnackbar } = useSnackbar();
 
-  const { data: profile } = useProfile();
   const { data: grants } = useGrants();
 
   const { error, mutateAsync: attachVolume } = useAttachVolumeMutation();
@@ -46,11 +45,14 @@ export const VolumeAttachmentDrawer = React.memo((props: Props) => {
     initialValues: { config_id: -1, linode_id: -1 },
     async onSubmit(values) {
       await attachVolume({
-        volumeId,
+        volumeId: volume?.id ?? -1,
         ...values,
-      }).then((_) => {
+      }).then(() => {
         resetEventsPolling();
         handleClose();
+        enqueueSnackbar(`Volume attachment started`, {
+          variant: 'info',
+        });
       });
     },
     validateOnBlur: false,
@@ -89,15 +91,10 @@ export const VolumeAttachmentDrawer = React.memo((props: Props) => {
     overwrite: 'Overwrite',
   };
 
-  const volumesPermissions = grants?.volume;
-  const volumePermissions = volumesPermissions?.find(
-    (v: Grant) => v.id === volumeId
-  );
-
-  const readOnly =
-    Boolean(profile?.restricted) &&
-    volumePermissions &&
-    volumePermissions.permissions === 'read_only';
+  const isReadOnly =
+    grants !== undefined &&
+    grants.volume.find((grant) => grant.id === volume?.id)?.permissions ===
+      'read_only';
 
   const hasErrorFor = getAPIErrorsFor(
     errorResources,
@@ -111,13 +108,12 @@ export const VolumeAttachmentDrawer = React.memo((props: Props) => {
     <Drawer
       onClose={handleClose}
       open={open}
-      title={`Attach Volume ${volumeLabel}`}
+      title={`Attach Volume ${volume?.label}`}
     >
       <form onSubmit={formik.handleSubmit}>
-        {readOnly && (
+        {isReadOnly && (
           <Notice
-            important
-            text={`You don't have permissions to edit ${volumeLabel}. Please contact an account administrator for details.`}
+            text="You don't have permission to edit this volume."
             variant="error"
           />
         )}
@@ -129,9 +125,10 @@ export const VolumeAttachmentDrawer = React.memo((props: Props) => {
             }
           }}
           clearable={false}
-          disabled={disabled || readOnly}
+          disabled={isReadOnly}
           errorText={formik.errors.linode_id ?? linodeError}
-          optionsFilter={(linode) => linode.region === linodeRegion}
+          filter={{ region: volume?.region }}
+          noMarginTop
           value={formik.values.linode_id}
         />
         {!linodeError && (
@@ -148,13 +145,14 @@ export const VolumeAttachmentDrawer = React.memo((props: Props) => {
             value={configChoices.find(
               (item) => item.value === String(formik.values.config_id)
             )}
-            disabled={disabled || readOnly || formik.values.linode_id === -1}
+            disabled={isReadOnly || formik.values.linode_id === -1}
             errorText={formik.errors.config_id ?? configError}
             id="config_id"
             isClearable={false}
             isLoading={configsLoading}
             label="Config"
             name="config_id"
+            noMarginTop
             options={configChoices}
             placeholder="Select a Config"
           />
@@ -162,7 +160,7 @@ export const VolumeAttachmentDrawer = React.memo((props: Props) => {
         <ActionsPanel
           primaryButtonProps={{
             'data-testid': 'submit',
-            disabled: disabled || readOnly,
+            disabled: isReadOnly,
             label: 'Attach',
             loading: formik.isSubmitting,
             type: 'submit',
diff --git a/packages/manager/src/features/Volumes/CloneVolumeDrawer.tsx b/packages/manager/src/features/Volumes/CloneVolumeDrawer.tsx
new file mode 100644
index 00000000000..1c653956e58
--- /dev/null
+++ b/packages/manager/src/features/Volumes/CloneVolumeDrawer.tsx
@@ -0,0 +1,123 @@
+import { Volume } from '@linode/api-v4';
+import { CloneVolumeSchema } from '@linode/validation/lib/volumes.schema';
+import { useFormik } from 'formik';
+import * as React from 'react';
+
+import { ActionsPanel } from 'src/components/ActionsPanel/ActionsPanel';
+import { Drawer } from 'src/components/Drawer';
+import { Notice } from 'src/components/Notice/Notice';
+import { TextField } from 'src/components/TextField';
+import { Typography } from 'src/components/Typography';
+import { resetEventsPolling } from 'src/eventsPolling';
+import { useGrants } from 'src/queries/profile';
+import { useCloneVolumeMutation } from 'src/queries/volumes';
+import {
+  handleFieldErrors,
+  handleGeneralErrors,
+} from 'src/utilities/formikErrorUtils';
+
+import { PricePanel } from './VolumeDrawer/PricePanel';
+
+interface Props {
+  onClose: () => void;
+  open: boolean;
+  volume: Volume | undefined;
+}
+
+const initialValues = { label: '' };
+
+export const CloneVolumeDrawer = (props: Props) => {
+  const { onClose: _onClose, open, volume } = props;
+
+  const { mutateAsync: cloneVolume } = useCloneVolumeMutation();
+
+  const { data: grants } = useGrants();
+
+  // Even if a restricted user has the ability to create Volumes, they
+  // can't clone a Volume they only have read only permission on.
+  const isReadOnly =
+    grants !== undefined &&
+    grants.volume.find((grant) => grant.id === volume?.id)?.permissions ===
+      'read_only';
+
+  const {
+    errors,
+    handleBlur,
+    handleChange,
+    handleSubmit,
+    isSubmitting,
+    resetForm,
+    status: error,
+    touched,
+    values,
+  } = useFormik({
+    initialValues,
+    async onSubmit(values, { setErrors, setStatus }) {
+      try {
+        await cloneVolume({ label: values.label, volumeId: volume?.id ?? -1 });
+        onClose();
+        resetEventsPolling();
+      } catch (error) {
+        handleFieldErrors(setErrors, error);
+        handleGeneralErrors(
+          setStatus,
+          error,
+          `Unable to clone this volume at this time. Please try again later.`
+        );
+      }
+    },
+    validationSchema: CloneVolumeSchema,
+  });
+
+  const onClose = () => {
+    _onClose();
+    resetForm();
+  };
+
+  return (
+    <Drawer onClose={onClose} open={open} title="Clone Volume">
+      <form onSubmit={handleSubmit}>
+        {isReadOnly && (
+          <Notice
+            spacingBottom={12}
+            text="You don't have permission to clone this volume."
+            variant="error"
+          />
+        )}
+        {error && <Notice text={error} variant="error" />}
+        <Typography variant="body1">
+          The newly created volume will be an exact clone of{' '}
+          <b>{volume?.label}</b>. It will have a size of {volume?.size} GB and
+          be available in {volume?.region}.
+        </Typography>
+        <TextField
+          disabled={isReadOnly}
+          errorText={touched.label ? errors.label : undefined}
+          label="Label"
+          name="label"
+          onBlur={handleBlur}
+          onChange={handleChange}
+          required
+          value={values.label}
+        />
+        <PricePanel
+          currentSize={volume?.size ?? -1}
+          regionId={volume?.region ?? ''}
+          value={volume?.size ?? -1}
+        />
+        <ActionsPanel
+          primaryButtonProps={{
+            disabled: isReadOnly,
+            label: 'Clone Volume',
+            loading: isSubmitting,
+            type: 'submit',
+          }}
+          secondaryButtonProps={{
+            label: 'Cancel',
+            onClick: onClose,
+          }}
+        />
+      </form>
+    </Drawer>
+  );
+};
diff --git a/packages/manager/src/features/Volumes/DeleteVolumeDialog.tsx b/packages/manager/src/features/Volumes/DeleteVolumeDialog.tsx
new file mode 100644
index 00000000000..dfe66eafe19
--- /dev/null
+++ b/packages/manager/src/features/Volumes/DeleteVolumeDialog.tsx
@@ -0,0 +1,50 @@
+import { Volume } from '@linode/api-v4';
+import * as React from 'react';
+
+import { Notice } from 'src/components/Notice/Notice';
+import { TypeToConfirmDialog } from 'src/components/TypeToConfirmDialog/TypeToConfirmDialog';
+import { resetEventsPolling } from 'src/eventsPolling';
+import { useDeleteVolumeMutation } from 'src/queries/volumes';
+
+interface Props {
+  onClose: () => void;
+  open: boolean;
+  volume: Volume | undefined;
+}
+
+export const DeleteVolumeDialog = (props: Props) => {
+  const { onClose, open, volume } = props;
+
+  const {
+    error,
+    isLoading,
+    mutateAsync: deleteVolume,
+  } = useDeleteVolumeMutation();
+
+  const onDelete = () => {
+    deleteVolume({ id: volume?.id ?? -1 }).then(() => {
+      onClose();
+      resetEventsPolling();
+    });
+  };
+
+  return (
+    <TypeToConfirmDialog
+      entity={{
+        action: 'deletion',
+        name: volume?.label,
+        primaryBtnText: 'Delete',
+        type: 'Volume',
+      }}
+      label="Volume Label"
+      loading={isLoading}
+      onClick={onDelete}
+      onClose={onClose}
+      open={open}
+      title={`Delete Volume ${volume?.label}?`}
+      typographyStyle={{ marginTop: '10px' }}
+    >
+      {error && <Notice text={error?.[0]?.reason} variant="error" />}
+    </TypeToConfirmDialog>
+  );
+};
diff --git a/packages/manager/src/features/Volumes/DestructiveVolumeDialog.tsx b/packages/manager/src/features/Volumes/DestructiveVolumeDialog.tsx
deleted file mode 100644
index 9e908c9963e..00000000000
--- a/packages/manager/src/features/Volumes/DestructiveVolumeDialog.tsx
+++ /dev/null
@@ -1,128 +0,0 @@
-import { Theme } from '@mui/material/styles';
-import { makeStyles } from '@mui/styles';
-import { useSnackbar } from 'notistack';
-import * as React from 'react';
-
-import { Notice } from 'src/components/Notice/Notice';
-import { TypeToConfirmDialog } from 'src/components/TypeToConfirmDialog/TypeToConfirmDialog';
-import { Typography } from 'src/components/Typography';
-import { resetEventsPolling } from 'src/eventsPolling';
-import { useLinodeQuery } from 'src/queries/linodes/linodes';
-import {
-  useDeleteVolumeMutation,
-  useDetachVolumeMutation,
-} from 'src/queries/volumes';
-import { getAPIErrorOrDefault } from 'src/utilities/errorUtils';
-
-const useStyles = makeStyles((theme: Theme) => ({
-  warningCopy: {
-    color: theme.color.red,
-    marginBottom: theme.spacing(2),
-  },
-}));
-
-interface Props {
-  linodeId?: number;
-  linodeLabel?: string;
-  mode: 'delete' | 'detach';
-  onClose: () => void;
-  open: boolean;
-  volumeId: number;
-  volumeLabel: string;
-}
-
-export const DestructiveVolumeDialog = (props: Props) => {
-  const classes = useStyles();
-
-  const { linodeId, mode, onClose, open, volumeId, volumeLabel: label } = props;
-
-  const { enqueueSnackbar } = useSnackbar();
-
-  const { data: linode } = useLinodeQuery(
-    linodeId ?? -1,
-    linodeId !== undefined
-  );
-
-  const {
-    error: detachError,
-    isLoading: detachLoading,
-    mutateAsync: detachVolume,
-  } = useDetachVolumeMutation();
-
-  const {
-    error: deleteError,
-    isLoading: deleteLoading,
-    mutateAsync: deleteVolume,
-  } = useDeleteVolumeMutation();
-
-  const onDetach = () => {
-    detachVolume({ id: volumeId }).then(() => {
-      onClose();
-      resetEventsPolling();
-      enqueueSnackbar(`Volume detachment started`, {
-        variant: 'info',
-      });
-    });
-  };
-
-  const onDelete = () => {
-    deleteVolume({ id: volumeId }).then(() => {
-      onClose();
-      resetEventsPolling();
-    });
-  };
-
-  const poweredOff = linode?.status === 'offline';
-
-  const method = {
-    delete: onDelete,
-    detach: onDetach,
-  }[props.mode];
-
-  const loading = {
-    delete: deleteLoading,
-    detach: detachLoading,
-  }[props.mode];
-
-  const selectedError = {
-    delete: deleteError,
-    detach: detachError,
-  }[props.mode];
-
-  const error = selectedError
-    ? getAPIErrorOrDefault(selectedError, `Unable to ${mode} volume.`)[0].reason
-    : undefined;
-
-  const title = {
-    delete: `Delete ${label ? `Volume ${label}` : 'Volume'}?`,
-    detach: `Detach ${label ? `Volume ${label}` : 'Volume'}?`,
-  }[props.mode];
-
-  return (
-    <TypeToConfirmDialog
-      entity={{
-        action: mode === 'detach' ? 'detachment' : 'deletion',
-        name: label,
-        primaryBtnText: mode === 'detach' ? 'Detach' : 'Delete',
-        type: 'Volume',
-      }}
-      label={'Volume Label'}
-      loading={loading}
-      onClick={method}
-      onClose={onClose}
-      open={open}
-      title={title}
-      typographyStyle={{ marginTop: '10px' }}
-    >
-      {error && <Notice text={error} variant="error" />}
-      {mode === 'detach' && !poweredOff && linode !== undefined && (
-        <Typography className={classes.warningCopy}>
-          <strong>Warning:</strong> This operation could cause data loss. Please
-          power off the Linode first or make sure it isn&rsquo;t currently
-          writing to the volume before continuing. If this volume is currently
-          mounted, detaching it could cause your Linode to restart.
-        </Typography>
-      )}
-    </TypeToConfirmDialog>
-  );
-};
diff --git a/packages/manager/src/features/Volumes/DetachVolumeDialog.tsx b/packages/manager/src/features/Volumes/DetachVolumeDialog.tsx
new file mode 100644
index 00000000000..2a6359eb6b5
--- /dev/null
+++ b/packages/manager/src/features/Volumes/DetachVolumeDialog.tsx
@@ -0,0 +1,78 @@
+import { Volume } from '@linode/api-v4';
+import { useSnackbar } from 'notistack';
+import * as React from 'react';
+
+import { Notice } from 'src/components/Notice/Notice';
+import { TypeToConfirmDialog } from 'src/components/TypeToConfirmDialog/TypeToConfirmDialog';
+import { Typography } from 'src/components/Typography';
+import { resetEventsPolling } from 'src/eventsPolling';
+import { useLinodeQuery } from 'src/queries/linodes/linodes';
+import { useDetachVolumeMutation } from 'src/queries/volumes';
+
+interface Props {
+  onClose: () => void;
+  open: boolean;
+  volume: Volume | undefined;
+}
+
+export const DetachVolumeDialog = (props: Props) => {
+  const { onClose, open, volume } = props;
+
+  const { enqueueSnackbar } = useSnackbar();
+
+  const { data: linode } = useLinodeQuery(
+    volume?.linode_id ?? -1,
+    volume?.linode_id !== null && volume?.linode_id !== undefined
+  );
+
+  const {
+    error,
+    isLoading,
+    mutateAsync: detachVolume,
+  } = useDetachVolumeMutation();
+
+  const onDetach = () => {
+    detachVolume({ id: volume?.id ?? -1 }).then(() => {
+      onClose();
+      resetEventsPolling();
+      enqueueSnackbar(`Volume detachment started`, {
+        variant: 'info',
+      });
+    });
+  };
+
+  const poweredOff = linode?.status === 'offline';
+
+  return (
+    <TypeToConfirmDialog
+      entity={{
+        action: 'detachment',
+        name: volume?.label,
+        primaryBtnText: 'Detach',
+        type: 'Volume',
+      }}
+      label="Volume Label"
+      loading={isLoading}
+      onClick={onDetach}
+      onClose={onClose}
+      open={open}
+      title={`Detach Volume ${volume?.label}?`}
+      typographyStyle={{ marginTop: '10px' }}
+    >
+      {error && <Notice text={error?.[0].reason} variant="error" />}
+      {!poweredOff && linode !== undefined && (
+        <Typography
+          sx={(theme) => ({
+            color: theme.color.red,
+            marginBottom: theme.spacing(2),
+          })}
+        >
+          <strong>Warning:</strong> This operation could cause data loss. Please
+          power off the Linode first or make sure it isn&rsquo;t currently
+          writing to the volume before continuing. If this volume is currently
+          mounted, detaching it could cause your Linode to restart.
+        </Typography>
+      )}
+    </TypeToConfirmDialog>
+  );
+};
diff --git a/packages/manager/src/features/Volumes/EditVolumeDrawer.tsx b/packages/manager/src/features/Volumes/EditVolumeDrawer.tsx
new file mode 100644
index 00000000000..88497be6dc7
--- /dev/null
+++ b/packages/manager/src/features/Volumes/EditVolumeDrawer.tsx
@@ -0,0 +1,132 @@
+import { Volume } from '@linode/api-v4';
+import { UpdateVolumeSchema } from '@linode/validation';
+import { useFormik } from 'formik';
+import React from 'react';
+
+import { ActionsPanel } from 'src/components/ActionsPanel/ActionsPanel';
+import { Drawer } from 'src/components/Drawer';
+import { Notice } from 'src/components/Notice/Notice';
+import { TagsInput } from 'src/components/TagsInput/TagsInput';
+import { TextField } from 'src/components/TextField';
+import { useGrants } from 'src/queries/profile';
+import { useUpdateVolumeMutation } from 'src/queries/volumes';
+import {
+  handleFieldErrors,
+  handleGeneralErrors,
+} from 'src/utilities/formikErrorUtils';
+
+interface Props {
+  onClose: () => void;
+  open: boolean;
+  volume: Volume | undefined;
+}
+
+export const EditVolumeDrawer = (props: Props) => {
+  const { onClose: _onClose, open, volume } = props;
+
+  const { data: grants } = useGrants();
+
+  const { mutateAsync: updateVolume } = useUpdateVolumeMutation();
+
+  const isReadOnly =
+    grants !== undefined &&
+    grants.volume.find((grant) => grant.id === volume?.id)?.permissions ===
+      'read_only';
+
+  const {
+    dirty,
+    errors,
+    handleBlur,
+    handleChange,
+    handleSubmit,
+    isSubmitting,
+    resetForm,
+    setFieldValue,
+    status: error,
+    touched,
+    values,
+  } = useFormik({
+    enableReinitialize: true,
+    initialValues: { label: volume?.label, tags: volume?.tags },
+    async onSubmit(values, { setErrors, setStatus }) {
+      try {
+        await updateVolume({
+          label: values.label ?? '',
+          tags: values.tags,
+          volumeId: volume?.id ?? -1,
+        });
+
+        onClose();
+      } catch (error) {
+        handleFieldErrors(setErrors, error);
+        handleGeneralErrors(
+          setStatus,
+          error,
+          `Unable to edit this Volume at this time. Please try again later.`
+        );
+      }
+    },
+    validationSchema: UpdateVolumeSchema,
+  });
+
+  const onClose = () => {
+    _onClose();
+    resetForm();
+  };
+
+  return (
+    <Drawer onClose={onClose} open={open} title="Edit Volume">
+      <form onSubmit={handleSubmit}>
+        {isReadOnly && (
+          <Notice
+            spacingBottom={0}
+            text="You don't have permission to edit this volume."
+            variant="error"
+          />
+        )}
+        {error && <Notice text={error} variant="error" />}
+        <TextField
+          disabled={isReadOnly}
+          errorText={errors.label}
+          label="Label"
+          name="label"
+          onBlur={handleBlur}
+          onChange={handleChange}
+          required
+          value={values.label}
+        />
+        <TagsInput
+          onChange={(selected) =>
+            setFieldValue(
+              'tags',
+              selected.map((item) => item.value)
+            )
+          }
+          tagError={
+            touched.tags
+              ? errors.tags
+                ? 'Unable to tag volume.'
+                : undefined
+              : undefined
+          }
+          disabled={isReadOnly}
+          label="Tags"
+          name="tags"
+          value={values.tags?.map((t) => ({ label: t, value: t })) ?? []}
+        />
+        <ActionsPanel
+          primaryButtonProps={{
+            disabled: isReadOnly || !dirty,
+            label: 'Save Changes',
+            loading: isSubmitting,
+            type: 'submit',
+          }}
+          secondaryButtonProps={{
+            label: 'Cancel',
+            onClick: onClose,
+          }}
+        />
+      </form>
+    </Drawer>
+  );
+};
diff --git a/packages/manager/src/features/Volumes/ResizeVolumeDrawer.tsx b/packages/manager/src/features/Volumes/ResizeVolumeDrawer.tsx
new file mode 100644
index 00000000000..7b587d57f6c
--- /dev/null
+++ b/packages/manager/src/features/Volumes/ResizeVolumeDrawer.tsx
@@ -0,0 +1,127 @@
+import { Volume } from '@linode/api-v4';
+import { ResizeVolumeSchema } from '@linode/validation';
+import { useFormik } from 'formik';
+import { useSnackbar } from 'notistack';
+import React from 'react';
+
+import { ActionsPanel } from 'src/components/ActionsPanel/ActionsPanel';
+import { Drawer } from 'src/components/Drawer';
+import { Notice } from 'src/components/Notice/Notice';
+import { resetEventsPolling } from 'src/eventsPolling';
+import { useGrants } from 'src/queries/profile';
+import { useResizeVolumeMutation } from 'src/queries/volumes';
+import {
+  handleFieldErrors,
+  handleGeneralErrors,
+} from 'src/utilities/formikErrorUtils';
+
+import { PricePanel } from './VolumeDrawer/PricePanel';
+import { SizeField } from './VolumeDrawer/SizeField';
+
+interface Props {
+  onClose: () => void;
+  open: boolean;
+  volume: Volume | undefined;
+}
+
+export const ResizeVolumeDrawer = (props: Props) => {
+  const { onClose: _onClose, open, volume } = props;
+
+  const { mutateAsync: resizeVolume } = useResizeVolumeMutation();
+
+  const validationSchema = ResizeVolumeSchema(volume?.size ?? -1);
+
+  const { enqueueSnackbar } = useSnackbar();
+
+  const { data: grants } = useGrants();
+
+  const isReadOnly =
+    grants !== undefined &&
+    grants.volume.find((grant) => grant.id === volume?.id)?.permissions ===
+      'read_only';
+
+  const {
+    dirty,
+    errors,
+    handleBlur,
+    handleChange,
+    handleSubmit,
+    isSubmitting,
+    resetForm,
+    status: error,
+    values,
+  } = useFormik({
+    enableReinitialize: true,
+    initialValues: { size: volume?.size },
+    onSubmit: (values, { setErrors, setStatus, setSubmitting }) => {
+      setSubmitting(true);
+
+      resizeVolume({ size: Number(values.size), volumeId: volume?.id ?? -1 })
+        .then((_) => {
+          setSubmitting(false);
+          resetEventsPolling();
+          enqueueSnackbar(`Volume scheduled to be resized.`, {
+            variant: 'success',
+          });
+          onClose();
+        })
+        .catch((errorResponse) => {
+          setSubmitting(false);
+          handleFieldErrors(setErrors, errorResponse);
+          handleGeneralErrors(
+            setStatus,
+            errorResponse,
+            `Unable to resize this volume at this time. Please try again later.`
+          );
+        });
+    },
+    validationSchema,
+  });
+
+  const onClose = () => {
+    _onClose();
+    resetForm();
+  };
+
+  return (
+    <Drawer onClose={onClose} open={open} title="Resize Volume">
+      <form onSubmit={handleSubmit}>
+        {isReadOnly && (
+          <Notice
+            spacingBottom={0}
+            text="You don't have permission to edit this volume."
+            variant="error"
+          />
+        )}
+        {error && <Notice text={error} variant="error" />}
+        <SizeField
+          disabled={isReadOnly}
+          error={errors.size}
+          name="size"
+          onBlur={handleBlur}
+          onChange={handleChange}
+          regionId={volume?.region ?? ''}
+          resize={volume?.size}
+          value={values.size ?? -1}
+        />
+        <PricePanel
+          currentSize={volume?.size ?? -1}
+          regionId={volume?.region ?? ''}
+          value={values.size ?? -1}
+        />
+        <ActionsPanel
+          primaryButtonProps={{
+            disabled: isReadOnly || !dirty,
+            label: 'Resize Volume',
+            loading: isSubmitting,
+            type: 'submit',
+          }}
+          secondaryButtonProps={{
+            label: 'Cancel',
+            onClick: onClose,
+          }}
+        />
+      </form>
+    </Drawer>
+  );
+};
diff --git a/packages/manager/src/features/Volumes/UpgradeVolumeDialog.tsx b/packages/manager/src/features/Volumes/UpgradeVolumeDialog.tsx
index 7eca24d2788..cb5d3560303 100644
--- a/packages/manager/src/features/Volumes/UpgradeVolumeDialog.tsx
+++ b/packages/manager/src/features/Volumes/UpgradeVolumeDialog.tsx
@@ -41,7 +41,7 @@ interface Props {
   open: boolean;
 }
 
-export const UpgradeVolumeDialog: React.FC<Props> = (props) => {
+export const UpgradeVolumeDialog = (props: Props) => {
   const { id, label, onClose, open } = props;
   const { enqueueSnackbar } = useSnackbar();
 
diff --git a/packages/manager/src/features/Volumes/VolumeCreate/CreateVolumeForm.tsx b/packages/manager/src/features/Volumes/VolumeCreate/CreateVolumeForm.tsx
index 5dd5866f0be..1fddd3a7a55 100644
--- a/packages/manager/src/features/Volumes/VolumeCreate/CreateVolumeForm.tsx
+++ b/packages/manager/src/features/Volumes/VolumeCreate/CreateVolumeForm.tsx
@@ -1,19 +1,18 @@
 import { Linode } from '@linode/api-v4/lib/linodes/types';
-import { Region } from '@linode/api-v4/lib/regions/types';
 import { CreateVolumeSchema } from '@linode/validation/lib/volumes.schema';
 import { Theme, useTheme } from '@mui/material/styles';
 import { makeStyles } from '@mui/styles';
-import { Form, Formik } from 'formik';
+import { useFormik } from 'formik';
+import { useSnackbar } from 'notistack';
 import * as React from 'react';
-import { connect } from 'react-redux';
-import { RouteComponentProps } from 'react-router-dom';
-import { compose } from 'recompose';
+import { useHistory } from 'react-router-dom';
 
 import { Box } from 'src/components/Box';
 import { Button } from 'src/components/Button/Button';
 import { RegionSelect } from 'src/components/EnhancedSelect/variants/RegionSelect';
 import { Notice } from 'src/components/Notice/Notice';
 import { Paper } from 'src/components/Paper';
+import { TextField } from 'src/components/TextField';
 import { TooltipIcon } from 'src/components/TooltipIcon';
 import { Typography } from 'src/components/Typography';
 import { MAX_VOLUME_SIZE } from 'src/constants';
@@ -28,10 +27,7 @@ import {
 import { useGrants, useProfile } from 'src/queries/profile';
 import { useRegionsQuery } from 'src/queries/regions';
 import { useCreateVolumeMutation } from 'src/queries/volumes';
-import { MapState } from 'src/store/types';
-import { Origin as VolumeDrawerOrigin } from 'src/store/volumeForm';
 import { sendCreateVolumeEvent } from 'src/utilities/analytics';
-import { getErrorMap } from 'src/utilities/errorUtils';
 import { isEURegion } from 'src/utilities/formatRegion';
 import {
   handleFieldErrors,
@@ -41,9 +37,7 @@ import { isNilOrEmpty } from 'src/utilities/isNilOrEmpty';
 import { maybeCastToNumber } from 'src/utilities/maybeCastToNumber';
 
 import { ConfigSelect } from '../VolumeDrawer/ConfigSelect';
-import LabelField from '../VolumeDrawer/LabelField';
-import NoticePanel from '../VolumeDrawer/NoticePanel';
-import SizeField from '../VolumeDrawer/SizeField';
+import { SizeField } from '../VolumeDrawer/SizeField';
 
 export const SIZE_FIELD_WIDTH = 160;
 
@@ -103,24 +97,12 @@ const useStyles = makeStyles((theme: Theme) => ({
   },
 }));
 
-interface Props {
-  history: RouteComponentProps['history'];
-  onSuccess: (
-    volumeLabel: string,
-    volumePath: string,
-    message?: string
-  ) => void;
-  regions: Region[];
-}
-
-type CombinedProps = Props & StateProps;
-
-const CreateVolumeForm: React.FC<CombinedProps> = (props) => {
+const CreateVolumeForm = () => {
   const theme = useTheme();
   const classes = useStyles();
   const flags = useFlags();
   const { dcSpecificPricing } = flags;
-  const { history, onSuccess, origin } = props;
+  const history = useHistory();
 
   const { data: profile } = useProfile();
   const { data: grants } = useGrants();
@@ -159,278 +141,259 @@ const CreateVolumeForm: React.FC<CombinedProps> = (props) => {
     );
   };
 
-  return (
-    <Formik
-      onSubmit={(
-        values,
-        { resetForm, setErrors, setStatus, setSubmitting }
-      ) => {
-        const { config_id, label, linode_id, region, size } = values;
-
-        setSubmitting(true);
-
-        /** Status holds our success and generalError messages. */
-        setStatus(undefined);
+  const { enqueueSnackbar } = useSnackbar();
+
+  const {
+    errors,
+    handleBlur,
+    handleChange,
+    handleSubmit,
+    isSubmitting,
+    setFieldValue,
+    status: error,
+    touched,
+    values,
+  } = useFormik({
+    onSubmit: (values, { resetForm, setErrors, setStatus, setSubmitting }) => {
+      const { config_id, label, linode_id, region, size } = values;
+
+      setSubmitting(true);
+
+      /** Status holds our success and generalError messages. */
+      setStatus(undefined);
+
+      createVolume({
+        config_id:
+          config_id === null ? undefined : maybeCastToNumber(config_id),
+        label,
+        linode_id:
+          linode_id === null ? undefined : maybeCastToNumber(linode_id),
+        region: isNilOrEmpty(region) || region === 'none' ? undefined : region,
+        size: maybeCastToNumber(size),
+      })
+        .then((volume) => {
+          if (hasSignedAgreement) {
+            updateAccountAgreements({
+              eu_model: true,
+              privacy_policy: true,
+            }).catch(reportAgreementSigningError);
+          }
 
-        createVolume({
-          config_id:
-            config_id === null ? undefined : maybeCastToNumber(config_id),
-          label,
-          linode_id:
-            linode_id === null ? undefined : maybeCastToNumber(linode_id),
-          region:
-            isNilOrEmpty(region) || region === 'none' ? undefined : region,
-          size: maybeCastToNumber(size),
+          resetForm({ values: initialValues });
+          setSubmitting(false);
+          enqueueSnackbar(`Volume scheduled for creation.`, {
+            variant: 'success',
+          });
+          history.push('/volumes', { volume });
+          // Analytics Event
+          sendCreateVolumeEvent(`Size: ${size}GB`, origin);
         })
-          .then(({ filesystem_path, label: volumeLabel }) => {
-            if (hasSignedAgreement) {
-              updateAccountAgreements({
-                eu_model: true,
-                privacy_policy: true,
-              }).catch(reportAgreementSigningError);
-            }
-
-            resetForm({ values: initialValues });
-            setStatus({ success: `Volume scheduled for creation.` });
-            setSubmitting(false);
-            onSuccess(
-              volumeLabel,
-              filesystem_path,
-              `Volume scheduled for creation.`
-            );
-            history.push('/volumes');
-            // Analytics Event
-            sendCreateVolumeEvent(`Size: ${size}GB`, origin);
-          })
-          .catch((errorResponse) => {
-            const defaultMessage = `Unable to create a volume at this time. Please try again later.`;
-            const mapErrorToStatus = () =>
-              setStatus({ generalError: getErrorMap([], errorResponse).none });
+        .catch((errorResponse) => {
+          setSubmitting(false);
+          handleFieldErrors(setErrors, errorResponse);
+          handleGeneralErrors(
+            setStatus,
+            errorResponse,
+            `Unable to create a volume at this time. Please try again later.`
+          );
+        });
+    },
+    initialValues,
+    validationSchema: CreateVolumeSchema,
+  });
 
-            setSubmitting(false);
-            handleFieldErrors(setErrors, errorResponse);
-            handleGeneralErrors(
-              mapErrorToStatus,
-              errorResponse,
-              defaultMessage
-            );
-          });
-      }}
-      initialValues={initialValues}
-      validationSchema={CreateVolumeSchema}
-    >
-      {({
-        errors,
-        handleBlur,
-        handleChange,
-        handleSubmit,
-        isSubmitting,
-        setFieldValue,
-        status,
-        touched,
-        values,
-      }) => {
-        const { config_id, linode_id } = values;
+  const { config_id, linode_id } = values;
 
-        const linodeError = touched.linode_id ? errors.linode_id : undefined;
+  const linodeError = touched.linode_id ? errors.linode_id : undefined;
 
-        const generalError = status
-          ? status.generalError
-          : config_id !== null
-          ? errors.config_id
-          : undefined;
+  const showAgreement =
+    isEURegion(values.region) &&
+    !profile?.restricted &&
+    accountAgreements?.eu_model === false;
 
-        const showAgreement =
-          isEURegion(values.region) &&
-          !profile?.restricted &&
-          accountAgreements?.eu_model === false;
+  const disabled = Boolean(
+    doesNotHavePermission || (showAgreement && !hasSignedAgreement)
+  );
 
-        const disabled = Boolean(
-          doesNotHavePermission || (showAgreement && !hasSignedAgreement)
-        );
+  const handleLinodeChange = (linode: Linode | null) => {
+    if (linode !== null) {
+      setFieldValue('linode_id', linode.id);
+      setFieldValue('region', linode.region);
+    } else {
+      setFieldValue('linode_id', null);
+      setFieldValue('config_id', null);
+    }
+  };
 
-        const handleLinodeChange = (linode: Linode | null) => {
-          if (linode !== null) {
-            setFieldValue('linode_id', linode.id);
-            setFieldValue('region', linode.region);
-          } else {
-            setFieldValue('linode_id', null);
-            setFieldValue('config_id', null);
+  return (
+    <form onSubmit={handleSubmit}>
+      {error && <Notice text={error} variant="error" />}
+      {doesNotHavePermission ? (
+        <Notice
+          text={
+            "You don't have permissions to create a new Volume. Please contact an account administrator for details."
           }
-        };
-
-        return (
-          <Form>
-            {generalError ? <NoticePanel error={generalError} /> : null}
-            {status ? <NoticePanel success={status.success} /> : null}
-            {doesNotHavePermission ? (
-              <Notice
-                text={
-                  "You don't have permissions to create a new Volume. Please contact an account administrator for details."
-                }
-                important
-                variant="error"
-              />
-            ) : null}
-            <Box display="flex" flexDirection="column">
-              <Paper>
-                <Typography
-                  className={classes.copy}
-                  data-qa-volume-size-help
-                  variant="body1"
-                >
-                  {dcSpecificPricing ? (
-                    <span>
-                      A single Volume can range from 10 to {MAX_VOLUME_SIZE} GB
-                      in size. Up to to eight Volumes can be attached to a
-                      single Linode. Select a region to see cost per GB.
-                    </span>
-                  ) : (
-                    <span>
-                      A single Volume can range from 10 to {MAX_VOLUME_SIZE} GB
-                      in size and costs $0.10/GB per month. <br />
-                      Up to eight volumes can be attached to a single Linode.
-                    </span>
-                  )}
-                </Typography>
-                <LabelField
-                  tooltipText="Use only ASCII letters, numbers,
+          important
+          variant="error"
+        />
+      ) : null}
+      <Box display="flex" flexDirection="column">
+        <Paper>
+          <Typography
+            className={classes.copy}
+            data-qa-volume-size-help
+            variant="body1"
+          >
+            {dcSpecificPricing ? (
+              <span>
+                A single Volume can range from 10 to {MAX_VOLUME_SIZE} GB in
+                size. Up to to eight Volumes can be attached to a single Linode.
+                Select a region to see cost per GB.
+              </span>
+            ) : (
+              <span>
+                A single Volume can range from 10 to {MAX_VOLUME_SIZE} GB in
+                size and costs $0.10/GB per month. <br />
+                Up to eight volumes can be attached to a single Linode.
+              </span>
+            )}
+          </Typography>
+          <TextField
+            tooltipText="Use only ASCII letters, numbers,
                   underscores, and dashes."
-                  disabled={doesNotHavePermission}
-                  error={touched.label ? errors.label : undefined}
-                  name="label"
-                  onBlur={handleBlur}
-                  onChange={handleChange}
-                  textFieldStyles={classes.select}
-                  tooltipClasses={classes.labelTooltip}
-                  tooltipPosition="right"
-                  value={values.label}
-                />
-                <Box alignItems="flex-end" display="flex">
-                  <RegionSelect
-                    handleSelection={(value) => {
-                      setFieldValue('region', value);
-                      setFieldValue('linode_id', null);
-                    }}
-                    regions={
-                      regions?.filter((eachRegion) =>
-                        eachRegion.capabilities.some((eachCape) =>
-                          eachCape.match(/block/i)
-                        )
-                      ) ?? []
-                    }
-                    disabled={doesNotHavePermission}
-                    errorText={touched.region ? errors.region : undefined}
-                    isClearable
-                    label="Region"
-                    name="region"
-                    onBlur={handleBlur}
-                    selectedID={values.region}
-                    width={320}
-                  />
-                  {renderSelectTooltip(
-                    'Volumes must be created in a region. You can choose to create a Volume in a region and attach it later to a Linode in the same region.'
-                  )}
-                </Box>
-                <Box
-                  alignItems="flex-end"
-                  className={classes.linodeConfigSelectWrapper}
-                  display="flex"
-                >
-                  <Box
-                    alignItems="flex-end"
-                    className={classes.linodeSelect}
-                    display="flex"
-                  >
-                    <LinodeSelect
-                      optionsFilter={(linode: Linode) => {
-                        const linodeRegion = linode.region;
-                        const valuesRegion = values.region;
-
-                        /** When values.region is empty, all Linodes with
-                         * block storage support will be displayed, regardless
-                         * of their region. However, if a region is selected,
-                         * only Linodes from the chosen region with block storage
-                         * support will be shown. */
-                        return isNilOrEmpty(valuesRegion)
-                          ? regionsWithBlockStorage.includes(linodeRegion)
-                          : regionsWithBlockStorage.includes(linodeRegion) &&
-                              linodeRegion === valuesRegion;
-                      }}
-                      sx={{
-                        width: '320px',
-                      }}
-                      clearable
-                      disabled={doesNotHavePermission}
-                      errorText={linodeError}
-                      onBlur={handleBlur}
-                      onSelectionChange={handleLinodeChange}
-                      value={values.linode_id}
-                    />
-                    {renderSelectTooltip(
-                      'If you select a Linode, the Volume will be automatically created in that Linode’s region and attached upon creation.'
-                    )}
-                  </Box>
-                  <ConfigSelect
-                    disabled={doesNotHavePermission}
-                    error={touched.config_id ? errors.config_id : undefined}
-                    linodeId={linode_id}
-                    name="configId"
-                    onBlur={handleBlur}
-                    onChange={(id: number) => setFieldValue('config_id', id)}
-                    value={config_id}
-                    width={320}
-                  />
-                </Box>
-                <Box alignItems="flex-end" display="flex" position="relative">
-                  <SizeField
-                    disabled={doesNotHavePermission}
-                    error={touched.size ? errors.size : undefined}
-                    flags={flags}
-                    hasSelectedRegion={!isNilOrEmpty(values.region)}
-                    name="size"
-                    onBlur={handleBlur}
-                    onChange={handleChange}
-                    regionId={values.region}
-                    textFieldStyles={classes.size}
-                    value={values.size}
-                  />
-                </Box>
-                <Box
-                  alignItems="center"
-                  className={classes.buttonGroup}
-                  display="flex"
-                  flexWrap="wrap"
-                  justifyContent={showAgreement ? 'space-between' : 'flex-end'}
-                >
-                  {showAgreement ? (
-                    <EUAgreementCheckbox
-                      centerCheckbox
-                      checked={hasSignedAgreement}
-                      className={classes.agreement}
-                      onChange={(e) => setHasSignedAgreement(e.target.checked)}
-                    />
-                  ) : null}
-                </Box>
-              </Paper>
-              <Box display="flex" justifyContent="flex-end">
-                <Button
-                  buttonType="primary"
-                  className={classes.button}
-                  data-qa-deploy-linode
-                  disabled={disabled}
-                  loading={isSubmitting}
-                  onClick={() => handleSubmit()}
-                  style={{ marginLeft: 12 }}
-                >
-                  Create Volume
-                </Button>
-              </Box>
+            className={classes.select}
+            data-qa-volume-label
+            disabled={doesNotHavePermission}
+            errorText={touched.label ? errors.label : undefined}
+            label="Label"
+            name="label"
+            onBlur={handleBlur}
+            onChange={handleChange}
+            tooltipClasses={classes.labelTooltip}
+            tooltipPosition="right"
+            value={values.label}
+          />
+          <Box alignItems="flex-end" display="flex">
+            <RegionSelect
+              handleSelection={(value) => {
+                setFieldValue('region', value);
+                setFieldValue('linode_id', null);
+              }}
+              regions={
+                regions?.filter((eachRegion) =>
+                  eachRegion.capabilities.some((eachCape) =>
+                    eachCape.match(/block/i)
+                  )
+                ) ?? []
+              }
+              disabled={doesNotHavePermission}
+              errorText={touched.region ? errors.region : undefined}
+              isClearable
+              label="Region"
+              name="region"
+              onBlur={handleBlur}
+              selectedID={values.region}
+              width={320}
+            />
+            {renderSelectTooltip(
+              'Volumes must be created in a region. You can choose to create a Volume in a region and attach it later to a Linode in the same region.'
+            )}
+          </Box>
+          <Box
+            alignItems="flex-end"
+            className={classes.linodeConfigSelectWrapper}
+            display="flex"
+          >
+            <Box
+              alignItems="flex-end"
+              className={classes.linodeSelect}
+              display="flex"
+            >
+              <LinodeSelect
+                optionsFilter={(linode: Linode) => {
+                  const linodeRegion = linode.region;
+                  const valuesRegion = values.region;
+
+                  /** When values.region is empty, all Linodes with
+                   * block storage support will be displayed, regardless
+                   * of their region. However, if a region is selected,
+                   * only Linodes from the chosen region with block storage
+                   * support will be shown. */
+                  return isNilOrEmpty(valuesRegion)
+                    ? regionsWithBlockStorage.includes(linodeRegion)
+                    : regionsWithBlockStorage.includes(linodeRegion) &&
+                        linodeRegion === valuesRegion;
+                }}
+                sx={{
+                  width: '320px',
+                }}
+                clearable
+                disabled={doesNotHavePermission}
+                errorText={linodeError}
+                onBlur={handleBlur}
+                onSelectionChange={handleLinodeChange}
+                value={values.linode_id}
+              />
+              {renderSelectTooltip(
+                'If you select a Linode, the Volume will be automatically created in that Linode’s region and attached upon creation.'
+              )}
             </Box>
-          </Form>
-        );
-      }}
-    </Formik>
+            <ConfigSelect
+              disabled={doesNotHavePermission}
+              error={touched.config_id ? errors.config_id : undefined}
+              linodeId={linode_id}
+              name="configId"
+              onBlur={handleBlur}
+              onChange={(id: number) => setFieldValue('config_id', id)}
+              value={config_id}
+              width={320}
+            />
+          </Box>
+          <Box alignItems="flex-end" display="flex" position="relative">
+            <SizeField
+              disabled={doesNotHavePermission}
+              error={touched.size ? errors.size : undefined}
+              hasSelectedRegion={!isNilOrEmpty(values.region)}
+              name="size"
+              onBlur={handleBlur}
+              onChange={handleChange}
+              regionId={values.region}
+              textFieldStyles={classes.size}
+              value={values.size}
+            />
+          </Box>
+          <Box
+            alignItems="center"
+            className={classes.buttonGroup}
+            display="flex"
+            flexWrap="wrap"
+            justifyContent={showAgreement ? 'space-between' : 'flex-end'}
+          >
+            {showAgreement ? (
+              <EUAgreementCheckbox
+                centerCheckbox
+                checked={hasSignedAgreement}
+                className={classes.agreement}
+                onChange={(e) => setHasSignedAgreement(e.target.checked)}
+              />
+            ) : null}
+          </Box>
+        </Paper>
+        <Box display="flex" justifyContent="flex-end">
+          <Button
+            buttonType="primary"
+            className={classes.button}
+            data-qa-deploy-linode
+            disabled={disabled}
+            loading={isSubmitting}
+            style={{ marginLeft: 12 }}
+            type="submit"
+          >
+            Create Volume
+          </Button>
+        </Box>
+      </Box>
+    </form>
   );
 };
 
@@ -450,16 +413,4 @@ const initialValues: FormState = {
   size: 20,
 };
 
-interface StateProps {
-  origin?: VolumeDrawerOrigin;
-}
-
-const mapStateToProps: MapState<StateProps, CombinedProps> = (state) => ({
-  origin: state.volumeDrawer.origin,
-});
-
-const connected = connect(mapStateToProps);
-
-const enhanced = compose<CombinedProps, Props>(connected)(CreateVolumeForm);
-
-export default enhanced;
+export default CreateVolumeForm;
diff --git a/packages/manager/src/features/Volumes/VolumeCreate/VolumeCreate.tsx b/packages/manager/src/features/Volumes/VolumeCreate/VolumeCreate.tsx
deleted file mode 100644
index bdf807545ed..00000000000
--- a/packages/manager/src/features/Volumes/VolumeCreate/VolumeCreate.tsx
+++ /dev/null
@@ -1,104 +0,0 @@
-import * as React from 'react';
-import { MapDispatchToProps, connect } from 'react-redux';
-import { RouteComponentProps } from 'react-router-dom';
-
-import { DocumentTitleSegment } from 'src/components/DocumentTitle';
-import { LandingHeader } from 'src/components/LandingHeader';
-import { useRegionsQuery } from 'src/queries/regions';
-import { MapState } from 'src/store/types';
-import { openForConfig, viewResizeInstructions } from 'src/store/volumeForm';
-
-import CreateVolumeForm from './CreateVolumeForm';
-
-interface StateProps {
-  linodeId?: number;
-  linodeLabel?: string;
-  linodeRegion?: string;
-  message?: string;
-  mode: string;
-  volumeId?: number;
-  volumeLabel?: string;
-  volumePath?: string;
-  volumeRegion?: string;
-  volumeSize?: number;
-  volumeTags?: string[];
-}
-
-interface DispatchProps {
-  actions: {
-    openForConfig: (
-      volumeLabel: string,
-      volumePath: string,
-      message?: string
-    ) => void;
-    openForResizeInstructions: (volumeLabel: string, message?: string) => void;
-  };
-}
-
-const mapDispatchToProps: MapDispatchToProps<DispatchProps, {}> = (
-  dispatch
-) => ({
-  actions: {
-    openForConfig: (
-      volumeLabel: string,
-      volumePath: string,
-      message?: string
-    ) => dispatch(openForConfig(volumeLabel, volumePath, message)),
-    openForResizeInstructions: (volumeLabel: string, message?: string) =>
-      dispatch(viewResizeInstructions({ message, volumeLabel })),
-  },
-});
-
-type CombinedProps = StateProps & RouteComponentProps<{}> & DispatchProps;
-
-const VolumeCreate: React.FC<CombinedProps> = (props) => {
-  const regions = useRegionsQuery().data ?? [];
-
-  const { actions, history } = props;
-
-  return (
-    <>
-      <DocumentTitleSegment segment="Create Volume" />
-      <LandingHeader title="Create" />
-      <CreateVolumeForm
-        history={history}
-        onSuccess={actions.openForConfig}
-        regions={regions}
-      />
-    </>
-  );
-};
-
-const mapStateToProps: MapState<StateProps, {}> = (state) => {
-  const {
-    linodeId,
-    linodeLabel,
-    linodeRegion,
-    message,
-    mode,
-    volumeId,
-    volumeLabel,
-    volumePath,
-    volumeRegion,
-    volumeSize,
-    volumeTags,
-  } = state.volumeDrawer;
-
-  return {
-    linode_id: linodeId,
-    linodeLabel,
-    linodeRegion,
-    message,
-    mode,
-    volumeId,
-    volumeLabel,
-    volumePath,
-    volumeRegion,
-    volumeSize,
-    volumeTags,
-  };
-};
-
-const connected = connect(mapStateToProps, mapDispatchToProps);
-
-export default connected(VolumeCreate);
diff --git a/packages/manager/src/features/Volumes/VolumeCreate/index.ts b/packages/manager/src/features/Volumes/VolumeCreate/index.ts
deleted file mode 100644
index 4e5c64f96c8..00000000000
--- a/packages/manager/src/features/Volumes/VolumeCreate/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-import VolumeCreate from './VolumeCreate';
-export default VolumeCreate;
diff --git a/packages/manager/src/features/Volumes/VolumeDetailsDrawer.tsx b/packages/manager/src/features/Volumes/VolumeDetailsDrawer.tsx
new file mode 100644
index 00000000000..b4a9bea80e1
--- /dev/null
+++ b/packages/manager/src/features/Volumes/VolumeDetailsDrawer.tsx
@@ -0,0 +1,72 @@
+import { Volume } from '@linode/api-v4';
+import Stack from '@mui/material/Stack/Stack';
+import React from 'react';
+
+import { CopyableTextField } from 'src/components/CopyableTextField/CopyableTextField';
+import { Drawer } from 'src/components/Drawer';
+import { Typography } from 'src/components/Typography';
+
+interface Props {
+  onClose: () => void;
+  open: boolean;
+  volume: Volume | undefined;
+}
+
+export const VolumeDetailsDrawer = (props: Props) => {
+  const { onClose, open, volume } = props;
+
+  return (
+    <Drawer onClose={onClose} open={open} title="Volume Configuration">
+      <Stack spacing={3}>
+        <Stack spacing={1}>
+          <Typography data-qa-config-help-msg variant="body1">
+            To get started with a new volume, you&rsquo;ll want to create a
+            filesystem on it:
+          </Typography>
+          <CopyableTextField
+            data-qa-make-filesystem
+            hideLabel
+            label="Create a Filesystem"
+            value={`mkfs.ext4 "${volume?.filesystem_path}"`}
+          />
+        </Stack>
+        <Stack spacing={1}>
+          <Typography data-qa-config-help-msg variant="body1">
+            Once the volume has a filesystem, you can create a mountpoint for
+            it:
+          </Typography>
+          <CopyableTextField
+            data-qa-mountpoint
+            hideLabel
+            label="Create a Mountpoint"
+            value={`mkdir "/mnt/${volume?.label}"`}
+          />
+        </Stack>
+        <Stack spacing={1}>
+          <Typography data-qa-config-help-msg variant="body1">
+            Then you can mount the new volume:
+          </Typography>
+          <CopyableTextField
+            data-qa-mount
+            hideLabel
+            label="Mount Volume"
+            value={`mount "${volume?.filesystem_path}" "/mnt/${volume?.label}"`}
+          />
+        </Stack>
+        <Stack spacing={1}>
+          <Typography data-qa-config-help-msg variant="body1">
+            If you want the volume to automatically mount every time your Linode
+            boots, you&rsquo;ll want to add a line like the following to your
+            /etc/fstab file:
+          </Typography>
+          <CopyableTextField
+            data-qa-boot-mount
+            hideLabel
+            label="Mount every time your Linode boots"
+            value={`${volume?.filesystem_path} /mnt/${volume?.label} ext4 defaults,noatime,nofail 0 2`}
+          />
+        </Stack>
+      </Stack>
+    </Drawer>
+  );
+};
diff --git a/packages/manager/src/features/Volumes/VolumeDrawer/AttachVolumeToLinodeForm.tsx b/packages/manager/src/features/Volumes/VolumeDrawer/AttachVolumeToLinodeForm.tsx
deleted file mode 100644
index dd24b7964f3..00000000000
--- a/packages/manager/src/features/Volumes/VolumeDrawer/AttachVolumeToLinodeForm.tsx
+++ /dev/null
@@ -1,193 +0,0 @@
-import { Grant } from '@linode/api-v4/lib/account';
-import { Form, Formik } from 'formik';
-import * as React from 'react';
-import { MapDispatchToProps, connect } from 'react-redux';
-import { compose } from 'recompose';
-import { number, object } from 'yup';
-
-import { Notice } from 'src/components/Notice/Notice';
-import { resetEventsPolling } from 'src/eventsPolling';
-import { useGrants } from 'src/queries/profile';
-import { useAttachVolumeMutation } from 'src/queries/volumes';
-import { openForCreating } from 'src/store/volumeForm';
-import { getErrorMap } from 'src/utilities/errorUtils';
-import {
-  handleFieldErrors,
-  handleGeneralErrors,
-} from 'src/utilities/formikErrorUtils';
-
-import { ConfigSelect } from './ConfigSelect';
-import { ModeSelection } from './ModeSelection';
-import NoticePanel from './NoticePanel';
-import VolumeSelect from './VolumeSelect';
-import VolumesActionsPanel from './VolumesActionsPanel';
-import { modes } from './modes';
-
-interface Props {
-  linodeId: number;
-  linodeLabel: string;
-  linodeRegion: string;
-  onClose: () => void;
-  readOnly?: boolean;
-}
-
-type CombinedProps = Props & DispatchProps;
-
-/**
- * I had to provide a separate validation schema since the linode_id (which is required by API) is
- * provided as a prop and not a user input value.
- */
-const AttachVolumeValidationSchema = object({
-  config_id: number()
-    .min(0, 'Config is required.')
-    .required('Config is required.'),
-  volume_id: number()
-    .min(0, 'Volume is required.')
-    .required('Volume is required.'),
-});
-
-const initialValues = { config_id: -1, volume_id: -1 };
-
-const AttachVolumeToLinodeForm: React.FC<CombinedProps> = (props) => {
-  const { actions, linodeId, linodeRegion, onClose, readOnly } = props;
-
-  const { data: grants } = useGrants();
-
-  const linodeGrants = grants?.linode ?? [];
-
-  const linodeGrant = linodeGrants.filter(
-    (grant: Grant) => grant.id === linodeId
-  )[0];
-
-  const disabled =
-    readOnly || (linodeGrant && linodeGrant.permissions !== 'read_write');
-
-  const { mutateAsync: attachVolume } = useAttachVolumeMutation();
-
-  return (
-    <Formik
-      onSubmit={(values, { setErrors, setStatus, setSubmitting }) => {
-        attachVolume({
-          config_id: values.config_id,
-          linode_id: linodeId,
-          volumeId: values.volume_id,
-        })
-          .then((_) => {
-            onClose();
-            resetEventsPolling();
-          })
-          .catch((errorResponse) => {
-            const defaultMessage = `Unable to attach this volume at this time. Please try again later.`;
-            const mapErrorToStatus = () =>
-              setStatus({ generalError: getErrorMap([], errorResponse).none });
-
-            setSubmitting(false);
-            handleFieldErrors(setErrors, errorResponse);
-            handleGeneralErrors(
-              mapErrorToStatus,
-              errorResponse,
-              defaultMessage
-            );
-          });
-      }}
-      initialValues={initialValues}
-      validationSchema={AttachVolumeValidationSchema}
-    >
-      {({
-        errors,
-        handleBlur,
-        handleSubmit,
-        isSubmitting,
-        resetForm,
-        setFieldValue,
-        status,
-        touched,
-        values,
-      }) => {
-        return (
-          <Form>
-            {status && !disabled && (
-              <NoticePanel
-                error={status.generalError}
-                success={status.success}
-              />
-            )}
-
-            {disabled && (
-              <Notice
-                text={
-                  "You don't have permissions to add a Volume for this Linode. Please contact an account administrator for details."
-                }
-                important
-                variant="error"
-              />
-            )}
-
-            <ModeSelection
-              mode={modes.ATTACHING}
-              onChange={actions.switchToCreating}
-            />
-
-            <VolumeSelect
-              disabled={disabled}
-              error={touched.volume_id ? errors.volume_id : undefined}
-              onBlur={handleBlur}
-              onChange={(v) => setFieldValue('volume_id', v)}
-              region={linodeRegion}
-              value={values.volume_id}
-            />
-
-            <ConfigSelect
-              disabled={disabled}
-              error={touched.config_id ? errors.config_id : undefined}
-              linodeId={linodeId}
-              name="config_id"
-              onBlur={handleBlur}
-              onChange={(id) => setFieldValue('config_id', id)}
-              value={values.config_id}
-            />
-
-            <VolumesActionsPanel
-              onCancel={() => {
-                resetForm();
-                onClose();
-              }}
-              disabled={disabled}
-              isSubmitting={isSubmitting}
-              onSubmit={handleSubmit}
-              submitText="Attach Volume"
-            />
-          </Form>
-        );
-      }}
-    </Formik>
-  );
-};
-
-interface DispatchProps {
-  actions: {
-    switchToCreating: () => void;
-  };
-}
-
-const mapDispatchToProps: MapDispatchToProps<DispatchProps, Props> = (
-  dispatch,
-  ownProps
-) => ({
-  actions: {
-    switchToCreating: () =>
-      dispatch(
-        openForCreating('Created from Linode Details', {
-          linodeId: ownProps.linodeId,
-          linodeLabel: ownProps.linodeLabel,
-          linodeRegion: ownProps.linodeRegion,
-        })
-      ),
-  },
-});
-
-const connected = connect(undefined, mapDispatchToProps);
-
-const enhanced = compose<CombinedProps, Props>(connected);
-
-export default enhanced(AttachVolumeToLinodeForm);
diff --git a/packages/manager/src/features/Volumes/VolumeDrawer/CloneVolumeForm.tsx b/packages/manager/src/features/Volumes/VolumeDrawer/CloneVolumeForm.tsx
deleted file mode 100644
index 59844506013..00000000000
--- a/packages/manager/src/features/Volumes/VolumeDrawer/CloneVolumeForm.tsx
+++ /dev/null
@@ -1,120 +0,0 @@
-import { CloneVolumeSchema } from '@linode/validation/lib/volumes.schema';
-import { Form, Formik } from 'formik';
-import * as React from 'react';
-
-import { Typography } from 'src/components/Typography';
-import { resetEventsPolling } from 'src/eventsPolling';
-import { useCloneVolumeMutation } from 'src/queries/volumes';
-import { getErrorMap } from 'src/utilities/errorUtils';
-import {
-  handleFieldErrors,
-  handleGeneralErrors,
-} from 'src/utilities/formikErrorUtils';
-
-import LabelField from './LabelField';
-import NoticePanel from './NoticePanel';
-import { PricePanel } from './PricePanel';
-import VolumesActionsPanel from './VolumesActionsPanel';
-
-import type { FlagSet } from 'src/featureFlags';
-
-interface Props {
-  flags: FlagSet;
-  onClose: () => void;
-  volumeId: number;
-  volumeLabel: string;
-  volumeRegion: string;
-  volumeSize: number;
-}
-
-const initialValues = { label: '' };
-
-export const CloneVolumeForm = (props: Props) => {
-  const {
-    flags,
-    onClose,
-    volumeId,
-    volumeLabel,
-    volumeRegion,
-    volumeSize,
-  } = props;
-
-  const { mutateAsync: cloneVolume } = useCloneVolumeMutation();
-
-  return (
-    <Formik
-      onSubmit={(values, { setErrors, setStatus, setSubmitting }) => {
-        cloneVolume({ label: values.label, volumeId })
-          .then((_) => {
-            onClose();
-            resetEventsPolling();
-          })
-          .catch((errorResponse) => {
-            const defaultMessage = `Unable to clone this volume at this time. Please try again later.`;
-            const mapErrorToStatus = () =>
-              setStatus({ generalError: getErrorMap([], errorResponse).none });
-
-            setSubmitting(false);
-            handleFieldErrors(setErrors, errorResponse);
-            handleGeneralErrors(
-              mapErrorToStatus,
-              errorResponse,
-              defaultMessage
-            );
-          });
-      }}
-      initialValues={initialValues}
-      validationSchema={CloneVolumeSchema}
-    >
-      {({
-        errors,
-        handleBlur,
-        handleChange,
-        handleSubmit,
-        isSubmitting,
-        resetForm,
-        status,
-        touched,
-        values,
-      }) => {
-        return (
-          <Form>
-            <Typography variant="body1">
-              The newly created volume will be an exact clone of{' '}
-              <b>{volumeLabel}</b>. It will have a size of {volumeSize} GB and
-              be available in {volumeRegion}.
-            </Typography>
-            {status && (
-              <NoticePanel
-                error={status.generalError}
-                success={status.success}
-              />
-            )}
-            <LabelField
-              error={touched.label ? errors.label : undefined}
-              name="label"
-              onBlur={handleBlur}
-              onChange={handleChange}
-              value={values.label}
-            />
-            <PricePanel
-              currentSize={volumeSize}
-              flags={flags}
-              regionId={volumeRegion}
-              value={volumeSize}
-            />
-            <VolumesActionsPanel
-              onCancel={() => {
-                resetForm();
-                onClose();
-              }}
-              isSubmitting={isSubmitting}
-              onSubmit={handleSubmit}
-              submitText="Clone Volume"
-            />
-          </Form>
-        );
-      }}
-    </Formik>
-  );
-};
diff --git a/packages/manager/src/features/Volumes/VolumeDrawer/CreateVolumeForLinodeForm.tsx b/packages/manager/src/features/Volumes/VolumeDrawer/CreateVolumeForLinodeForm.tsx
deleted file mode 100644
index 85c92ba014a..00000000000
--- a/packages/manager/src/features/Volumes/VolumeDrawer/CreateVolumeForLinodeForm.tsx
+++ /dev/null
@@ -1,338 +0,0 @@
-/**
- * @todo Display the volume configuration information on success.
- */
-import { APIError } from '@linode/api-v4/lib/types';
-import { CreateVolumeSchema } from '@linode/validation/lib/volumes.schema';
-import { Theme } from '@mui/material/styles';
-import { makeStyles } from '@mui/styles';
-import { Form, Formik } from 'formik';
-import * as React from 'react';
-import { MapDispatchToProps, connect } from 'react-redux';
-import { compose } from 'recompose';
-import { array, object, string } from 'yup';
-
-import { Tag, TagsInput } from 'src/components/TagsInput/TagsInput';
-import { Typography } from 'src/components/Typography';
-import { MAX_VOLUME_SIZE } from 'src/constants';
-import { resetEventsPolling } from 'src/eventsPolling';
-import { useGrants, useProfile } from 'src/queries/profile';
-import { useCreateVolumeMutation } from 'src/queries/volumes';
-import { MapState } from 'src/store/types';
-import {
-  Origin as VolumeDrawerOrigin,
-  openForAttaching,
-} from 'src/store/volumeForm';
-import { sendCreateVolumeEvent } from 'src/utilities/analytics';
-import { getErrorMap, getErrorStringOrDefault } from 'src/utilities/errorUtils';
-import {
-  handleFieldErrors,
-  handleGeneralErrors,
-} from 'src/utilities/formikErrorUtils';
-import { maybeCastToNumber } from 'src/utilities/maybeCastToNumber';
-
-import { ConfigSelect } from './ConfigSelect';
-import LabelField from './LabelField';
-import { ModeSelection } from './ModeSelection';
-import NoticePanel from './NoticePanel';
-import { PricePanel } from './PricePanel';
-import SizeField from './SizeField';
-import VolumesActionsPanel from './VolumesActionsPanel';
-import { modes } from './modes';
-
-import type { FlagSet } from 'src/featureFlags';
-
-const useStyles = makeStyles((theme: Theme) => ({
-  textWrapper: {
-    marginBottom: theme.spacing(1.25),
-  },
-}));
-
-interface Props {
-  flags: FlagSet;
-  linode_id: number;
-  linodeLabel: string;
-  linodeRegion: string;
-  onClose: () => void;
-  onSuccess: (
-    volumeLabel: string,
-    volumePath: string,
-    message?: string
-  ) => void;
-}
-
-type CombinedProps = Props & StateProps & DispatchProps;
-
-const CreateVolumeForm: React.FC<CombinedProps> = (props) => {
-  const classes = useStyles();
-  const {
-    actions,
-    flags,
-    linode_id,
-    linodeLabel,
-    linodeRegion,
-    onClose,
-    onSuccess,
-    origin,
-  } = props;
-
-  const { data: profile } = useProfile();
-  const { data: grants } = useGrants();
-  const { mutateAsync: createVolume } = useCreateVolumeMutation();
-
-  const disabled = profile?.restricted && !grants?.global.add_volumes;
-
-  // The original schema expects tags to be an array of strings, but Formik treats
-  // tags as _Tag[], so we extend the schema to transform tags before validation.
-  const extendedCreateVolumeSchema = CreateVolumeSchema.concat(
-    object({
-      tags: array()
-        .transform((tagItems: Tag[]) =>
-          tagItems.map((thisTagItem) => thisTagItem.value)
-        )
-        .of(string()),
-    })
-  );
-
-  return (
-    <Formik
-      onSubmit={(values, { setErrors, setStatus, setSubmitting }) => {
-        const { config_id, label, size, tags } = values;
-
-        setSubmitting(true);
-
-        /** Status holds our success and generalError messages. */
-        setStatus(undefined);
-
-        createVolume({
-          config_id:
-            // If the config_id still set to default value of -1, set this to undefined, so volume gets created on back-end according to the API logic
-            config_id === -1 ? undefined : maybeCastToNumber(config_id),
-          label,
-          linode_id: maybeCastToNumber(linode_id),
-          size: maybeCastToNumber(size),
-          tags: tags.map((v) => v.value),
-        })
-          .then(({ filesystem_path, label: newLabel }) => {
-            resetEventsPolling();
-            onSuccess(
-              newLabel,
-              filesystem_path,
-              `Volume scheduled for creation.`
-            );
-            // Analytics Event
-            sendCreateVolumeEvent(`Size: ${size}GB`, origin);
-          })
-          .catch((errorResponse) => {
-            const defaultMessage = `Unable to create a volume at this time. Please try again later.`;
-            const mapErrorToStatus = () =>
-              setStatus({ generalError: getErrorMap([], errorResponse).none });
-
-            setSubmitting(false);
-            handleFieldErrors(setErrors, errorResponse);
-            handleGeneralErrors(
-              mapErrorToStatus,
-              errorResponse,
-              defaultMessage
-            );
-          });
-      }}
-      initialValues={initialValues}
-      validationSchema={extendedCreateVolumeSchema}
-    >
-      {({
-        errors,
-        handleBlur,
-        handleChange,
-        handleSubmit,
-        isSubmitting,
-        resetForm,
-        setFieldValue,
-        status,
-        touched,
-        values,
-      }) => {
-        /**
-         * This form doesn't have a region select (the region is auto-populated)
-         * so if the API returns an error with field === 'region' the field mapping
-         * logic will pass over it. Explicitly use general error Notice in this case.
-         * If configs are not available, set the general error Notice to the config_id error (so that the error still shows in the UI instead of creation failing silently).
-         */
-
-        const { config_id } = values;
-
-        const generalError = status
-          ? status.generalError
-          : config_id === -1
-          ? errors.config_id
-          : errors.region;
-
-        return (
-          <Form>
-            {generalError && <NoticePanel error={generalError} />}
-            {status && <NoticePanel success={status.success} />}
-            {disabled && (
-              <NoticePanel
-                error={
-                  "You don't have permissions to create a new Volume. Please contact an account administrator for details."
-                }
-                important
-              />
-            )}
-            <ModeSelection
-              mode={modes.CREATING_FOR_LINODE}
-              onChange={actions.switchToAttaching}
-            />
-
-            <Typography
-              className={classes.textWrapper}
-              data-qa-volume-attach-help
-              style={{ marginTop: 24 }}
-              variant="body1"
-            >
-              {`This volume will be immediately scheduled for attachment to ${linodeLabel} and available to other Linodes in the ${linodeRegion} data-center.`}
-            </Typography>
-
-            <Typography
-              className={classes.textWrapper}
-              data-qa-volume-size-help
-              variant="body1"
-            >
-              {flags.dcSpecificPricing ? (
-                <span>
-                  A single Volume can range from 10 to {MAX_VOLUME_SIZE} GB in
-                  size. Up to eight Volumes can be attached to a single Linode.
-                </span>
-              ) : (
-                <span>
-                  A single Volume can range from 10 to {MAX_VOLUME_SIZE} GB in
-                  size and costs $0.10/GB per month. <br />
-                  Up to eight volumes can be attached to a single Linode.
-                </span>
-              )}
-            </Typography>
-
-            <LabelField
-              disabled={disabled}
-              error={touched.label ? errors.label : undefined}
-              name="label"
-              onBlur={handleBlur}
-              onChange={handleChange}
-              value={values.label}
-            />
-
-            <SizeField
-              disabled={disabled}
-              error={touched.size ? errors.size : undefined}
-              flags={flags}
-              isFromLinode
-              name="size"
-              onBlur={handleBlur}
-              onChange={handleChange}
-              regionId={linodeRegion}
-              value={values.size}
-            />
-
-            <ConfigSelect
-              disabled={disabled}
-              error={touched.config_id ? errors.config_id : undefined}
-              linodeId={linode_id}
-              name="configId"
-              onBlur={handleBlur}
-              onChange={(id: number) => setFieldValue('config_id', id)}
-              value={values.config_id}
-            />
-
-            <TagsInput
-              tagError={
-                touched.tags
-                  ? errors.tags
-                    ? getErrorStringOrDefault(
-                        errors.tags as APIError[],
-                        'Unable to tag volume.'
-                      )
-                    : undefined
-                  : undefined
-              }
-              disabled={disabled}
-              label="Tags"
-              name="tags"
-              onChange={(selected) => setFieldValue('tags', selected)}
-              value={values.tags}
-            />
-
-            <PricePanel
-              currentSize={10}
-              flags={flags}
-              regionId={linodeRegion}
-              value={values.size}
-            />
-
-            <VolumesActionsPanel
-              onCancel={() => {
-                resetForm();
-                onClose();
-              }}
-              disabled={disabled}
-              isSubmitting={isSubmitting}
-              onSubmit={handleSubmit}
-              submitText="Create Volume"
-            />
-          </Form>
-        );
-      }}
-    </Formik>
-  );
-};
-interface FormState {
-  config_id: number;
-  label: string;
-  linode_id: number;
-  region: string;
-  size: number;
-  tags: Tag[];
-}
-
-const initialValues: FormState = {
-  config_id: -1,
-  label: '',
-  linode_id: -1,
-  region: 'none',
-  size: 20,
-  tags: [],
-};
-
-interface DispatchProps {
-  actions: {
-    switchToAttaching: () => void;
-  };
-}
-
-const mapDispatchToProps: MapDispatchToProps<DispatchProps, Props> = (
-  dispatch,
-  ownProps
-) => ({
-  actions: {
-    switchToAttaching: () =>
-      dispatch(
-        openForAttaching(
-          ownProps.linode_id,
-          ownProps.linodeRegion,
-          ownProps.linodeLabel
-        )
-      ),
-  },
-});
-
-interface StateProps {
-  origin?: VolumeDrawerOrigin;
-}
-
-const mapStateToProps: MapState<StateProps, CombinedProps> = (state) => ({
-  origin: state.volumeDrawer.origin,
-});
-
-const connected = connect(mapStateToProps, mapDispatchToProps);
-
-const enhanced = compose<CombinedProps, Props>(connected)(CreateVolumeForm);
-
-export default enhanced;
diff --git a/packages/manager/src/features/Volumes/VolumeDrawer/EditVolumeForm.tsx b/packages/manager/src/features/Volumes/VolumeDrawer/EditVolumeForm.tsx
deleted file mode 100644
index 1e95e312c4b..00000000000
--- a/packages/manager/src/features/Volumes/VolumeDrawer/EditVolumeForm.tsx
+++ /dev/null
@@ -1,121 +0,0 @@
-import { UpdateVolumeSchema } from '@linode/validation/lib/volumes.schema';
-import { useFormik } from 'formik';
-import * as React from 'react';
-
-import { Notice } from 'src/components/Notice/Notice';
-import { Tag, TagsInput } from 'src/components/TagsInput/TagsInput';
-import { useUpdateVolumeMutation } from 'src/queries/volumes';
-import {
-  handleFieldErrors,
-  handleGeneralErrors,
-} from 'src/utilities/formikErrorUtils';
-
-import LabelField from './LabelField';
-import NoticePanel from './NoticePanel';
-import VolumesActionsPanel from './VolumesActionsPanel';
-
-interface Props {
-  onClose: () => void;
-  readOnly?: boolean;
-  volumeId: number;
-  volumeLabel: string;
-  volumeTags: Tag[];
-}
-
-export const EditVolumeForm = (props: Props) => {
-  const { onClose, readOnly, volumeId, volumeLabel, volumeTags } = props;
-
-  const {
-    dirty,
-    errors,
-    handleBlur,
-    handleChange,
-    handleSubmit,
-    isSubmitting,
-    resetForm,
-    setFieldValue,
-    status,
-    touched,
-    values,
-  } = useFormik({
-    enableReinitialize: true,
-    initialValues: { label: volumeLabel, tags: volumeTags },
-    onSubmit: (values, { resetForm, setErrors, setStatus, setSubmitting }) => {
-      const { label, tags } = values;
-
-      setSubmitting(true);
-
-      updateVolume({
-        label,
-        tags: tags.map((v) => v.value),
-        volumeId,
-      })
-        .then((_) => {
-          resetForm();
-          onClose();
-        })
-        .catch((errorResponse) => {
-          const defaultMessage = `Unable to edit this Volume at this time. Please try again later.`;
-          const mapErrorToStatus = (generalError: string) =>
-            setStatus({ generalError });
-
-          setSubmitting(false);
-          handleFieldErrors(setErrors, errorResponse);
-          handleGeneralErrors(mapErrorToStatus, errorResponse, defaultMessage);
-        });
-    },
-    validationSchema: UpdateVolumeSchema,
-  });
-
-  const { mutateAsync: updateVolume } = useUpdateVolumeMutation();
-
-  return (
-    <form onSubmit={handleSubmit}>
-      {status && (
-        <NoticePanel error={status.generalError} success={status.success} />
-      )}
-      {readOnly && (
-        <Notice
-          important
-          text={`You don't have permissions to edit ${volumeLabel}. Please contact an account administrator for details.`}
-          variant="error"
-        />
-      )}
-
-      <LabelField
-        disabled={readOnly}
-        error={errors.label}
-        name="label"
-        onBlur={handleBlur}
-        onChange={handleChange}
-        value={values.label}
-      />
-
-      <TagsInput
-        tagError={
-          touched.tags
-            ? errors.tags
-              ? 'Unable to tag volume.'
-              : undefined
-            : undefined
-        }
-        disabled={readOnly}
-        label="Tags"
-        name="tags"
-        onChange={(selected) => setFieldValue('tags', selected)}
-        value={values.tags}
-      />
-
-      <VolumesActionsPanel
-        onCancel={() => {
-          resetForm();
-          onClose();
-        }}
-        disabled={readOnly || !dirty}
-        isSubmitting={isSubmitting}
-        onSubmit={handleSubmit}
-        submitText="Save Changes"
-      />
-    </form>
-  );
-};
diff --git a/packages/manager/src/features/Volumes/VolumeDrawer/LabelField.tsx b/packages/manager/src/features/Volumes/VolumeDrawer/LabelField.tsx
deleted file mode 100644
index 752395ef0f7..00000000000
--- a/packages/manager/src/features/Volumes/VolumeDrawer/LabelField.tsx
+++ /dev/null
@@ -1,46 +0,0 @@
-import * as React from 'react';
-
-import { TextField } from 'src/components/TextField';
-import { TooltipProps } from 'src/components/Tooltip';
-
-interface Props {
-  disabled?: boolean;
-  error?: string;
-  name: string;
-  onBlur: (e: any) => void;
-  onChange: (e: React.ChangeEvent<any>) => void;
-  textFieldStyles?: string;
-  tooltipClasses?: string;
-  tooltipPosition?: TooltipProps['placement'];
-  tooltipText?: JSX.Element | string;
-  value: string;
-}
-
-type CombinedProps = Props;
-
-const LabelField: React.FC<CombinedProps> = ({
-  error,
-  name,
-  onBlur,
-  onChange,
-  textFieldStyles,
-  value,
-  ...rest
-}) => {
-  return (
-    <TextField
-      className={textFieldStyles}
-      data-qa-volume-label
-      errorText={error}
-      label="Label"
-      name={name}
-      onBlur={onBlur}
-      onChange={onChange}
-      required
-      value={value}
-      {...rest}
-    />
-  );
-};
-
-export default LabelField;
diff --git a/packages/manager/src/features/Volumes/VolumeDrawer/LinodeVolumeAddDrawer.tsx b/packages/manager/src/features/Volumes/VolumeDrawer/LinodeVolumeAddDrawer.tsx
new file mode 100644
index 00000000000..328d0ce91b9
--- /dev/null
+++ b/packages/manager/src/features/Volumes/VolumeDrawer/LinodeVolumeAddDrawer.tsx
@@ -0,0 +1,44 @@
+import { Linode, Volume } from '@linode/api-v4';
+import * as React from 'react';
+
+import { Drawer } from 'src/components/Drawer';
+
+import { LinodeVolumeAttachForm } from './LinodeVolumeAttachForm';
+import { LinodeVolumeCreateForm } from './LinodeVolumeCreateForm';
+import { ModeSelection } from './ModeSelection';
+
+interface Props {
+  linode: Linode;
+  onClose: () => void;
+  open: boolean;
+  openDetails: (volume: Volume) => void;
+}
+
+export const LinodeVolumeAddDrawer = (props: Props) => {
+  const { linode, onClose, open, openDetails } = props;
+
+  const [mode, setMode] = React.useState<'attach' | 'create'>('create');
+
+  return (
+    <Drawer
+      title={
+        mode === 'attach'
+          ? `Attach Volume to ${linode.label}`
+          : `Create Volume for ${linode.label}`
+      }
+      onClose={onClose}
+      open={open}
+    >
+      <ModeSelection mode={mode} onChange={setMode} />
+      {mode === 'attach' ? (
+        <LinodeVolumeAttachForm linode={linode} onClose={onClose} />
+      ) : (
+        <LinodeVolumeCreateForm
+          linode={linode}
+          onClose={onClose}
+          openDetails={openDetails}
+        />
+      )}
+    </Drawer>
+  );
+};
diff --git a/packages/manager/src/features/Volumes/VolumeDrawer/LinodeVolumeAttachForm.tsx b/packages/manager/src/features/Volumes/VolumeDrawer/LinodeVolumeAttachForm.tsx
new file mode 100644
index 00000000000..1a7b3df774e
--- /dev/null
+++ b/packages/manager/src/features/Volumes/VolumeDrawer/LinodeVolumeAttachForm.tsx
@@ -0,0 +1,140 @@
+import { Linode } from '@linode/api-v4';
+import { Grant } from '@linode/api-v4/lib/account';
+import { useFormik } from 'formik';
+import { useSnackbar } from 'notistack';
+import * as React from 'react';
+import { number, object } from 'yup';
+
+import { ActionsPanel } from 'src/components/ActionsPanel/ActionsPanel';
+import { Notice } from 'src/components/Notice/Notice';
+import { resetEventsPolling } from 'src/eventsPolling';
+import { useGrants } from 'src/queries/profile';
+import { useAttachVolumeMutation } from 'src/queries/volumes';
+import {
+  handleFieldErrors,
+  handleGeneralErrors,
+} from 'src/utilities/formikErrorUtils';
+
+import { ConfigSelect } from './ConfigSelect';
+import { VolumeSelect } from './VolumeSelect';
+
+interface Props {
+  linode: Linode;
+  onClose: () => void;
+  readOnly?: boolean;
+}
+
+/**
+ * I had to provide a separate validation schema since the linode_id (which is required by API) is
+ * provided as a prop and not a user input value.
+ */
+const AttachVolumeValidationSchema = object({
+  config_id: number()
+    .min(0, 'Config is required.')
+    .required('Config is required.'),
+  volume_id: number()
+    .min(0, 'Volume is required.')
+    .required('Volume is required.'),
+});
+
+const initialValues = { config_id: -1, volume_id: -1 };
+
+export const LinodeVolumeAttachForm = (props: Props) => {
+  const { linode, onClose } = props;
+
+  const { data: grants } = useGrants();
+
+  const { enqueueSnackbar } = useSnackbar();
+
+  const linodeGrant = grants?.linode.find(
+    (grant: Grant) => grant.id === linode.id
+  );
+
+  const isReadOnly = linodeGrant?.permissions === 'read_only';
+
+  const { mutateAsync: attachVolume } = useAttachVolumeMutation();
+
+  const {
+    errors,
+    handleBlur,
+    handleSubmit,
+    isSubmitting,
+    resetForm,
+    setFieldValue,
+    status: error,
+    touched,
+    values,
+  } = useFormik({
+    initialValues,
+    async onSubmit(values, { setErrors, setStatus, setSubmitting }) {
+      try {
+        await attachVolume({
+          config_id: values.config_id,
+          linode_id: linode.id,
+          volumeId: values.volume_id,
+        });
+        onClose();
+        resetEventsPolling();
+        enqueueSnackbar(`Volume attachment started`, {
+          variant: 'info',
+        });
+      } catch (error) {
+        setSubmitting(false);
+        handleFieldErrors(setErrors, error);
+        handleGeneralErrors(
+          setStatus,
+          error,
+          `Unable to attach this volume at this time. Please try again later.`
+        );
+      }
+    },
+    validationSchema: AttachVolumeValidationSchema,
+  });
+
+  return (
+    <form onSubmit={handleSubmit}>
+      {isReadOnly && (
+        <Notice
+          text={
+            "You don't have permissions to add a Volume for this Linode. Please contact an account administrator for details."
+          }
+          important
+          variant="error"
+        />
+      )}
+      {error && <Notice text={error} variant="error" />}
+      <VolumeSelect
+        disabled={isReadOnly}
+        error={touched.volume_id ? errors.volume_id : undefined}
+        onBlur={handleBlur}
+        onChange={(v) => setFieldValue('volume_id', v)}
+        region={linode.region}
+        value={values.volume_id}
+      />
+      <ConfigSelect
+        disabled={isReadOnly}
+        error={touched.config_id ? errors.config_id : undefined}
+        linodeId={linode.id}
+        name="config_id"
+        onBlur={handleBlur}
+        onChange={(id) => setFieldValue('config_id', id)}
+        value={values.config_id}
+      />
+      <ActionsPanel
+        primaryButtonProps={{
+          disabled: isReadOnly,
+          label: 'Attach Volume',
+          loading: isSubmitting,
+          type: 'submit',
+        }}
+        secondaryButtonProps={{
+          label: 'Cancel',
+          onClick: () => {
+            resetForm();
+            onClose();
+          },
+        }}
+      />
+    </form>
+  );
+};
diff --git a/packages/manager/src/features/Volumes/VolumeDrawer/LinodeVolumeCreateForm.tsx b/packages/manager/src/features/Volumes/VolumeDrawer/LinodeVolumeCreateForm.tsx
new file mode 100644
index 00000000000..bd53c4736aa
--- /dev/null
+++ b/packages/manager/src/features/Volumes/VolumeDrawer/LinodeVolumeCreateForm.tsx
@@ -0,0 +1,229 @@
+import { APIError, Linode, Volume } from '@linode/api-v4';
+import { CreateVolumeSchema } from '@linode/validation/lib/volumes.schema';
+import { useFormik } from 'formik';
+import { useSnackbar } from 'notistack';
+import * as React from 'react';
+
+import { ActionsPanel } from 'src/components/ActionsPanel/ActionsPanel';
+import { Notice } from 'src/components/Notice/Notice';
+import { TagsInput } from 'src/components/TagsInput/TagsInput';
+import { TextField } from 'src/components/TextField';
+import { Typography } from 'src/components/Typography';
+import { MAX_VOLUME_SIZE } from 'src/constants';
+import { resetEventsPolling } from 'src/eventsPolling';
+import { useFlags } from 'src/hooks/useFlags';
+import { useGrants, useProfile } from 'src/queries/profile';
+import { useCreateVolumeMutation } from 'src/queries/volumes';
+import { sendCreateVolumeEvent } from 'src/utilities/analytics';
+import { getErrorStringOrDefault } from 'src/utilities/errorUtils';
+import {
+  handleFieldErrors,
+  handleGeneralErrors,
+} from 'src/utilities/formikErrorUtils';
+import { maybeCastToNumber } from 'src/utilities/maybeCastToNumber';
+
+import { ConfigSelect } from './ConfigSelect';
+import { PricePanel } from './PricePanel';
+import { SizeField } from './SizeField';
+
+interface Props {
+  linode: Linode;
+  onClose: () => void;
+  openDetails: (volume: Volume) => void;
+}
+
+interface FormState {
+  config_id: number;
+  label: string;
+  linode_id: number;
+  region: string;
+  size: number;
+  tags: string[];
+}
+
+const initialValues: FormState = {
+  config_id: -1,
+  label: '',
+  linode_id: -1,
+  region: 'none',
+  size: 20,
+  tags: [],
+};
+
+export const LinodeVolumeCreateForm = (props: Props) => {
+  const { linode, onClose, openDetails } = props;
+  const { enqueueSnackbar } = useSnackbar();
+
+  const flags = useFlags();
+
+  const { data: profile } = useProfile();
+  const { data: grants } = useGrants();
+  const { mutateAsync: createVolume } = useCreateVolumeMutation();
+
+  const disabled = profile?.restricted && !grants?.global.add_volumes;
+
+  const {
+    errors,
+    handleBlur,
+    handleChange,
+    handleSubmit,
+    isSubmitting,
+    resetForm,
+    setFieldValue,
+    status: error,
+    touched,
+    values,
+  } = useFormik({
+    initialValues,
+    async onSubmit(values, { setErrors, setStatus }) {
+      const { config_id, label, size, tags } = values;
+
+      /** Status holds our a general error message */
+      setStatus(undefined);
+
+      try {
+        const volume = await createVolume({
+          config_id:
+            // If the config_id still set to default value of -1, set this to undefined, so volume gets created on back-end according to the API logic
+            config_id === -1 ? undefined : maybeCastToNumber(config_id),
+          label,
+          linode_id: maybeCastToNumber(linode.id),
+          size: maybeCastToNumber(size),
+          tags,
+        });
+        resetEventsPolling();
+        enqueueSnackbar(`Volume scheduled for creation.`, {
+          variant: 'success',
+        });
+        onClose();
+        openDetails(volume);
+        // Analytics Event
+        sendCreateVolumeEvent(`Size: ${size}GB`, origin);
+      } catch (error) {
+        handleFieldErrors(setErrors, error);
+        handleGeneralErrors(
+          setStatus,
+          error,
+          `Unable to create a volume at this time. Please try again later.`
+        );
+      }
+    },
+    validationSchema: CreateVolumeSchema,
+  });
+
+  return (
+    <form onSubmit={handleSubmit}>
+      {disabled && (
+        <Notice
+          text={
+            "You don't have permissions to create a new Volume. Please contact an account administrator for details."
+          }
+          important
+        />
+      )}
+      {error && <Notice text={error} variant="error" />}
+      <Typography
+        sx={(theme) => ({
+          marginBottom: theme.spacing(1.25),
+        })}
+        data-qa-volume-attach-help
+        style={{ marginTop: 24 }}
+        variant="body1"
+      >
+        {`This volume will be immediately scheduled for attachment to ${linode.label} and available to other Linodes in the ${linode.region} data-center.`}
+      </Typography>
+      <Typography
+        sx={(theme) => ({
+          marginBottom: theme.spacing(1.25),
+        })}
+        data-qa-volume-size-help
+        variant="body1"
+      >
+        {flags.dcSpecificPricing ? (
+          <span>
+            A single Volume can range from 10 to {MAX_VOLUME_SIZE} GB in size.
+            Up to eight Volumes can be attached to a single Linode.
+          </span>
+        ) : (
+          <span>
+            A single Volume can range from 10 to {MAX_VOLUME_SIZE} GB in size
+            and costs $0.10/GB per month. <br />
+            Up to eight volumes can be attached to a single Linode.
+          </span>
+        )}
+      </Typography>
+      <TextField
+        data-qa-volume-label
+        disabled={disabled}
+        errorText={touched.label ? errors.label : undefined}
+        label="Label"
+        name="label"
+        onBlur={handleBlur}
+        onChange={handleChange}
+        required
+        value={values.label}
+      />
+      <SizeField
+        disabled={disabled}
+        error={touched.size ? errors.size : undefined}
+        isFromLinode
+        name="size"
+        onBlur={handleBlur}
+        onChange={handleChange}
+        regionId={linode.region}
+        value={values.size}
+      />
+      <ConfigSelect
+        disabled={disabled}
+        error={touched.config_id ? errors.config_id : undefined}
+        linodeId={linode.id}
+        name="configId"
+        onBlur={handleBlur}
+        onChange={(id: number) => setFieldValue('config_id', id)}
+        value={values.config_id}
+      />
+      <TagsInput
+        onChange={(items) =>
+          setFieldValue(
+            'tags',
+            items.map((t) => t.value)
+          )
+        }
+        tagError={
+          touched.tags
+            ? errors.tags
+              ? getErrorStringOrDefault(
+                  (errors.tags as unknown) as APIError[],
+                  'Unable to tag volume.'
+                )
+              : undefined
+            : undefined
+        }
+        disabled={disabled}
+        label="Tags"
+        name="tags"
+        value={values.tags.map((tag) => ({ label: tag, value: tag }))}
+      />
+      <PricePanel
+        currentSize={10}
+        regionId={linode.region}
+        value={values.size}
+      />
+      <ActionsPanel
+        primaryButtonProps={{
+          disabled,
+          label: 'Create Volume',
+          loading: isSubmitting,
+          type: 'submit',
+        }}
+        secondaryButtonProps={{
+          label: 'Cancel',
+          onClick: () => {
+            resetForm();
+            onClose();
+          },
+        }}
+      />
+    </form>
+  );
+};
diff --git a/packages/manager/src/features/Volumes/VolumeDrawer/ModeSelection.tsx b/packages/manager/src/features/Volumes/VolumeDrawer/ModeSelection.tsx
index 1dfda9d84cd..9b36c48239d 100644
--- a/packages/manager/src/features/Volumes/VolumeDrawer/ModeSelection.tsx
+++ b/packages/manager/src/features/Volumes/VolumeDrawer/ModeSelection.tsx
@@ -1,46 +1,35 @@
-import { makeStyles } from '@mui/styles';
 import * as React from 'react';
 
 import { FormControlLabel } from 'src/components/FormControlLabel';
 import { Radio } from 'src/components/Radio/Radio';
 import { RadioGroup } from 'src/components/RadioGroup';
 
-const useStyles = makeStyles({
-  label: {
-    '& span': {
-      fontSize: '1rem',
-    },
-  },
-});
+type Mode = 'attach' | 'create';
 
 interface Props {
-  mode: string;
-  onChange: () => void;
+  mode: Mode;
+  onChange: (value: Mode) => void;
 }
 
 export const ModeSelection = ({ mode, onChange }: Props) => {
-  const classes = useStyles();
   return (
     <RadioGroup
       aria-label="mode"
-      data-qa-mode-radio-group
       name="mode"
-      onChange={onChange}
+      onChange={(_, value) => onChange(value as Mode)}
       value={mode}
     >
       <FormControlLabel
-        className={classes.label}
         control={<Radio />}
         data-qa-radio="Create and Attach Volume"
         label="Create and Attach Volume"
-        value="creating_for_linode"
+        value="create"
       />
       <FormControlLabel
-        className={classes.label}
         control={<Radio />}
         data-qa-radio="Attach Existing Volume"
         label="Attach Existing Volume"
-        value="attaching"
+        value="attach"
       />
     </RadioGroup>
   );
diff --git a/packages/manager/src/features/Volumes/VolumeDrawer/NoticePanel.tsx b/packages/manager/src/features/Volumes/VolumeDrawer/NoticePanel.tsx
deleted file mode 100644
index 5899054b004..00000000000
--- a/packages/manager/src/features/Volumes/VolumeDrawer/NoticePanel.tsx
+++ /dev/null
@@ -1,45 +0,0 @@
-import * as React from 'react';
-
-import { Notice } from 'src/components/Notice/Notice';
-
-interface Props {
-  error?: string;
-  important?: boolean;
-  success?: string;
-}
-
-type CombinedProps = Props;
-
-const NoticePanel: React.FC<CombinedProps> = ({
-  error,
-  important,
-  success,
-}) => {
-  return (
-    <>
-      {success && (
-        <Notice
-          important={important}
-          spacingBottom={24}
-          spacingTop={16}
-          variant="success"
-        >
-          {success}
-        </Notice>
-      )}
-
-      {error && (
-        <Notice
-          important={important}
-          spacingBottom={24}
-          spacingTop={16}
-          variant="error"
-        >
-          {error}
-        </Notice>
-      )}
-    </>
-  );
-};
-
-export default NoticePanel;
diff --git a/packages/manager/src/features/Volumes/VolumeDrawer/PricePanel.tsx b/packages/manager/src/features/Volumes/VolumeDrawer/PricePanel.tsx
index a4e76cfbb31..2d53cd6fe73 100644
--- a/packages/manager/src/features/Volumes/VolumeDrawer/PricePanel.tsx
+++ b/packages/manager/src/features/Volumes/VolumeDrawer/PricePanel.tsx
@@ -3,18 +3,17 @@ import * as React from 'react';
 import { Box } from 'src/components/Box';
 import { DisplayPrice } from 'src/components/DisplayPrice';
 import { MAX_VOLUME_SIZE } from 'src/constants';
+import { useFlags } from 'src/hooks/useFlags';
 import { getDynamicVolumePrice } from 'src/utilities/pricing/dynamicVolumePrice';
 
-import type { FlagSet } from 'src/featureFlags';
-
 interface Props {
   currentSize: number;
-  flags: FlagSet;
   regionId: string;
   value: number;
 }
 
-export const PricePanel = ({ currentSize, flags, regionId, value }: Props) => {
+export const PricePanel = ({ currentSize, regionId, value }: Props) => {
+  const flags = useFlags();
   const getPrice = (size: number) => {
     return getDynamicVolumePrice({
       flags,
diff --git a/packages/manager/src/features/Volumes/VolumeDrawer/ResizeVolumeForm.tsx b/packages/manager/src/features/Volumes/VolumeDrawer/ResizeVolumeForm.tsx
deleted file mode 100644
index d6d17bc4cd8..00000000000
--- a/packages/manager/src/features/Volumes/VolumeDrawer/ResizeVolumeForm.tsx
+++ /dev/null
@@ -1,139 +0,0 @@
-import { ResizeVolumeSchema } from '@linode/validation/lib/volumes.schema';
-import { Form, Formik } from 'formik';
-import * as React from 'react';
-
-import { Notice } from 'src/components/Notice/Notice';
-import { resetEventsPolling } from 'src/eventsPolling';
-import { useResizeVolumeMutation } from 'src/queries/volumes';
-import {
-  handleFieldErrors,
-  handleGeneralErrors,
-} from 'src/utilities/formikErrorUtils';
-
-import NoticePanel from './NoticePanel';
-import { PricePanel } from './PricePanel';
-import SizeField from './SizeField';
-import VolumesActionsPanel from './VolumesActionsPanel';
-
-import type { FlagSet } from 'src/featureFlags';
-
-interface Props {
-  flags: FlagSet;
-  onClose: () => void;
-  onSuccess: (volumeLabel: string, message?: string) => void;
-  readOnly?: boolean;
-  volumeId: number;
-  volumeLabel: string;
-  volumeRegion: string;
-  volumeSize: number;
-}
-
-export const ResizeVolumeForm = (props: Props) => {
-  const {
-    flags,
-    onClose,
-    onSuccess,
-    readOnly,
-    volumeId,
-    volumeLabel,
-    volumeRegion,
-    volumeSize,
-  } = props;
-
-  const { mutateAsync: resizeVolume } = useResizeVolumeMutation();
-
-  const initialValues = { size: volumeSize };
-  const validationSchema = ResizeVolumeSchema(volumeSize);
-
-  return (
-    <Formik
-      onSubmit={(
-        values,
-        { resetForm, setErrors, setStatus, setSubmitting }
-      ) => {
-        setSubmitting(true);
-
-        resizeVolume({ size: Number(values.size), volumeId })
-          .then((_) => {
-            resetForm({ values: initialValues });
-            setSubmitting(false);
-            resetEventsPolling();
-            onSuccess(volumeLabel, `Volume scheduled to be resized.`);
-          })
-          .catch((errorResponse) => {
-            const defaultMessage = `Unable to resize this volume at this time. Please try again later.`;
-            const mapErrorToStatus = (generalError: string) =>
-              setStatus({ generalError });
-
-            setSubmitting(false);
-            handleFieldErrors(setErrors, errorResponse);
-            handleGeneralErrors(
-              mapErrorToStatus,
-              errorResponse,
-              defaultMessage
-            );
-          });
-      }}
-      initialValues={initialValues}
-      validationSchema={validationSchema}
-    >
-      {({
-        errors,
-        handleBlur,
-        handleChange,
-        handleSubmit,
-        isSubmitting,
-        resetForm,
-        status,
-        values,
-      }) => {
-        return (
-          <Form>
-            {status && (
-              <NoticePanel
-                error={status.generalError}
-                success={status.success}
-              />
-            )}
-            {readOnly && (
-              <Notice
-                important
-                text={`You don't have permissions to edit ${volumeLabel}. Please contact an account administrator for details.`}
-                variant="error"
-              />
-            )}
-
-            <SizeField
-              disabled={readOnly}
-              error={errors.size}
-              flags={flags}
-              name="size"
-              onBlur={handleBlur}
-              onChange={handleChange}
-              regionId={volumeRegion}
-              resize={volumeSize}
-              value={values.size}
-            />
-
-            <PricePanel
-              currentSize={volumeSize}
-              flags={flags}
-              regionId={volumeRegion}
-              value={values.size}
-            />
-            <VolumesActionsPanel
-              onCancel={() => {
-                resetForm();
-                onClose();
-              }}
-              disabled={readOnly}
-              isSubmitting={isSubmitting}
-              onSubmit={handleSubmit}
-              submitText="Resize Volume"
-            />
-          </Form>
-        );
-      }}
-    </Formik>
-  );
-};
diff --git a/packages/manager/src/features/Volumes/VolumeDrawer/ResizeVolumesInstruction.tsx b/packages/manager/src/features/Volumes/VolumeDrawer/ResizeVolumesInstruction.tsx
deleted file mode 100644
index 718c26560fd..00000000000
--- a/packages/manager/src/features/Volumes/VolumeDrawer/ResizeVolumesInstruction.tsx
+++ /dev/null
@@ -1,97 +0,0 @@
-import { Theme } from '@mui/material/styles';
-import { WithStyles, createStyles, withStyles } from '@mui/styles';
-import * as React from 'react';
-
-import { ActionsPanel } from 'src/components/ActionsPanel/ActionsPanel';
-import { CopyableTextField } from 'src/components/CopyableTextField/CopyableTextField';
-import { Typography } from 'src/components/Typography';
-
-import NoticePanel from './NoticePanel';
-
-type ClassNames = 'copyField' | 'copySection' | 'root';
-
-const styles = (theme: Theme) =>
-  createStyles({
-    copyField: {
-      marginTop: theme.spacing(1),
-    },
-    copySection: {
-      marginTop: theme.spacing(2),
-    },
-    root: {},
-  });
-
-interface Props {
-  message?: string;
-  onClose: () => void;
-  volumeLabel: string;
-}
-
-type CombinedProps = Props & WithStyles<ClassNames>;
-
-const ResizeVolumeInstructions: React.FC<CombinedProps> = (props) => {
-  const { classes, message, onClose, volumeLabel } = props;
-
-  return (
-    <React.Fragment>
-      {message && <NoticePanel success={message} />}
-
-      <div className={classes.copySection}>
-        <Typography variant="body1">
-          After the volume resize is complete, you'll need to restart your
-          Linode for the changes to take effect.
-        </Typography>
-        <Typography variant="body1">
-          Once your Linode has restarted, make sure the volume is unmounted for
-          safety:
-        </Typography>
-        <CopyableTextField
-          className={classes.copyField}
-          data-qa-umount
-          hideLabel
-          label="Make sure the volume is unmounted for safety"
-          value={`umount /dev/disk/by-id/scsi-0Linode_Volume_${volumeLabel}`}
-        />
-      </div>
-
-      <div className={classes.copySection}>
-        <Typography variant="body1">
-          Assuming you have an ext2, ext3, or ext4 partition, first run a file
-          system check, then resize it to fill the new volume size:
-        </Typography>
-        <CopyableTextField
-          className={classes.copyField}
-          data-qa-check-filesystem
-          hideLabel
-          label="Run a file system check"
-          value={`e2fsck -f /dev/disk/by-id/scsi-0Linode_Volume_${volumeLabel}`}
-        />
-        <CopyableTextField
-          className={classes.copyField}
-          data-qa-resize-filesystem
-          hideLabel
-          label="Resize file system to fill the new volume"
-          value={`resize2fs /dev/disk/by-id/scsi-0Linode_Volume_${volumeLabel}`}
-        />
-      </div>
-
-      <div className={classes.copySection}>
-        <Typography variant="body1">
-          Now mount it back onto the filesystem:
-        </Typography>
-        <CopyableTextField
-          className={classes.copyField}
-          data-qa-mount
-          hideLabel
-          label="Mount back onto the filesystem"
-          value={`mount /dev/disk/by-id/scsi-0Linode_Volume_${volumeLabel} /mnt/${volumeLabel}`}
-        />
-      </div>
-      <ActionsPanel primaryButtonProps={{ label: 'Close', onClick: onClose }} />
-    </React.Fragment>
-  );
-};
-
-const styled = withStyles(styles);
-
-export default styled(ResizeVolumeInstructions);
diff --git a/packages/manager/src/features/Volumes/VolumeDrawer/SizeField.tsx b/packages/manager/src/features/Volumes/VolumeDrawer/SizeField.tsx
index 74c8b321534..95df841dd1a 100644
--- a/packages/manager/src/features/Volumes/VolumeDrawer/SizeField.tsx
+++ b/packages/manager/src/features/Volumes/VolumeDrawer/SizeField.tsx
@@ -1,5 +1,4 @@
 import { Theme } from '@mui/material/styles';
-import { makeStyles } from '@mui/styles';
 import * as React from 'react';
 
 import { Box } from 'src/components/Box';
@@ -8,11 +7,24 @@ import { InputAdornment } from 'src/components/InputAdornment';
 import { TextField } from 'src/components/TextField';
 import { Typography } from 'src/components/Typography';
 import { MAX_VOLUME_SIZE } from 'src/constants';
+import { useFlags } from 'src/hooks/useFlags';
 import { getDynamicVolumePrice } from 'src/utilities/pricing/dynamicVolumePrice';
-
 import { SIZE_FIELD_WIDTH } from '../VolumeCreate/CreateVolumeForm';
+import { makeStyles } from '@mui/styles';
 
-import type { FlagSet } from 'src/featureFlags';
+interface Props {
+  disabled?: boolean;
+  error?: string;
+  hasSelectedRegion?: boolean;
+  isFromLinode?: boolean;
+  name: string;
+  onBlur: (e: any) => void;
+  onChange: (e: React.ChangeEvent<any>) => void;
+  regionId: string;
+  resize?: number;
+  textFieldStyles?: string;
+  value: number;
+}
 
 const useStyles = makeStyles((theme: Theme) => ({
   createVolumeText: {
@@ -31,29 +43,12 @@ const useStyles = makeStyles((theme: Theme) => ({
   },
 }));
 
-interface Props {
-  disabled?: boolean;
-  error?: string;
-  flags: FlagSet;
-  hasSelectedRegion?: boolean;
-  isFromLinode?: boolean;
-  name: string;
-  onBlur: (e: any) => void;
-  onChange: (e: React.ChangeEvent<any>) => void;
-  regionId: string;
-  resize?: number;
-  textFieldStyles?: string;
-  value: number;
-}
-
-type CombinedProps = Props;
-
-const SizeField: React.FC<CombinedProps> = (props) => {
+export const SizeField = (props: Props) => {
   const classes = useStyles();
+  const flags = useFlags();
 
   const {
     error,
-    flags,
     hasSelectedRegion,
     isFromLinode,
     name,
@@ -120,5 +115,3 @@ const SizeField: React.FC<CombinedProps> = (props) => {
     </>
   );
 };
-
-export default SizeField;
diff --git a/packages/manager/src/features/Volumes/VolumeDrawer/VolumeConfigForm.tsx b/packages/manager/src/features/Volumes/VolumeDrawer/VolumeConfigForm.tsx
deleted file mode 100644
index 5248a07731f..00000000000
--- a/packages/manager/src/features/Volumes/VolumeDrawer/VolumeConfigForm.tsx
+++ /dev/null
@@ -1,99 +0,0 @@
-import { Theme } from '@mui/material/styles';
-import { WithStyles, createStyles, withStyles } from '@mui/styles';
-import * as React from 'react';
-
-import { CopyableTextField } from 'src/components/CopyableTextField/CopyableTextField';
-import { Typography } from 'src/components/Typography';
-
-import NoticePanel from './NoticePanel';
-
-type ClassNames = 'copyField' | 'copySection' | 'root';
-
-const styles = (theme: Theme) =>
-  createStyles({
-    copyField: {
-      marginTop: theme.spacing(0.5),
-    },
-    copySection: {
-      marginTop: theme.spacing(3),
-    },
-    root: {},
-  });
-
-interface Props {
-  message?: string;
-  onClose: () => void;
-  volumeLabel: string;
-  volumePath: string;
-}
-
-type CombinedProps = Props & WithStyles<ClassNames>;
-
-const VolumeConfigDrawer: React.FC<CombinedProps> = (props) => {
-  const { classes, message } = props;
-
-  return (
-    <React.Fragment>
-      {message && <NoticePanel success={message} />}
-
-      <div className={classes.copySection}>
-        <Typography data-qa-config-help-msg variant="body1">
-          To get started with a new volume, you&rsquo;ll want to create a
-          filesystem on it:
-        </Typography>
-        <CopyableTextField
-          className={classes.copyField}
-          data-qa-make-filesystem
-          hideLabel
-          label="Create a Filesystem"
-          value={`mkfs.ext4 "${props.volumePath}"`}
-        />
-      </div>
-
-      <div className={classes.copySection}>
-        <Typography data-qa-config-help-msg variant="body1">
-          Once the volume has a filesystem, you can create a mountpoint for it:
-        </Typography>
-        <CopyableTextField
-          className={classes.copyField}
-          data-qa-mountpoint
-          hideLabel
-          label="Create a Mountpoint"
-          value={`mkdir "/mnt/${props.volumeLabel}"`}
-        />
-      </div>
-
-      <div className={classes.copySection}>
-        <Typography data-qa-config-help-msg variant="body1">
-          Then you can mount the new volume:
-        </Typography>
-        <CopyableTextField
-          className={classes.copyField}
-          data-qa-mount
-          hideLabel
-          label="Mount Volume"
-          value={`mount "${props.volumePath}" "/mnt/${props.volumeLabel}"`}
-        />
-      </div>
-
-      <div className={classes.copySection}>
-        <Typography data-qa-config-help-msg variant="body1">
-          If you want the volume to automatically mount every time your Linode
-          boots, you&rsquo;ll want to add a line like the following to your
-          /etc/fstab file:
-        </Typography>
-        <CopyableTextField
-          className={classes.copyField}
-          data-qa-boot-mount
-          hideLabel
-          label="Mount every time your Linode boots"
-          value={`${props.volumePath} /mnt/${props.volumeLabel} ext4 defaults,noatime,nofail 0 2`}
-        />
-      </div>
-    </React.Fragment>
-  );
-};
-
-const styled = withStyles(styles);
-
-export default styled(VolumeConfigDrawer);
diff --git a/packages/manager/src/features/Volumes/VolumeDrawer/VolumeDrawer.tsx b/packages/manager/src/features/Volumes/VolumeDrawer/VolumeDrawer.tsx
deleted file mode 100644
index 0e663aa978c..00000000000
--- a/packages/manager/src/features/Volumes/VolumeDrawer/VolumeDrawer.tsx
+++ /dev/null
@@ -1,258 +0,0 @@
-import { Grant } from '@linode/api-v4/lib/account';
-import * as React from 'react';
-import { MapDispatchToProps, connect } from 'react-redux';
-
-import { Drawer } from 'src/components/Drawer';
-import {
-  WithProfileProps,
-  withProfile,
-} from 'src/containers/profile.container';
-import { useFlags } from 'src/hooks/useFlags';
-import { ApplicationState } from 'src/store';
-import { MapState } from 'src/store/types';
-import {
-  close,
-  openForConfig,
-  viewResizeInstructions,
-} from 'src/store/volumeForm';
-
-import AttachVolumeToLinodeForm from './AttachVolumeToLinodeForm';
-import { CloneVolumeForm } from './CloneVolumeForm';
-import CreateVolumeForLinodeForm from './CreateVolumeForLinodeForm';
-import { EditVolumeForm } from './EditVolumeForm';
-import { ResizeVolumeForm } from './ResizeVolumeForm';
-import ResizeVolumesInstruction from './ResizeVolumesInstruction';
-import VolumeConfigForm from './VolumeConfigForm';
-import { modes } from './modes';
-
-type CombinedProps = StateProps & DispatchProps & WithProfileProps;
-
-const VolumeDrawer = (props: CombinedProps) => {
-  const {
-    actions,
-    drawerTitle,
-    grants,
-    isOpen,
-    linodeId,
-    linodeLabel,
-    linodeRegion,
-    message,
-    mode,
-    profile,
-    volumeId,
-    volumeLabel,
-    volumePath,
-    volumeRegion,
-    volumeSize,
-    volumeTags,
-  } = props;
-
-  const flags = useFlags();
-  const volumesPermissions = grants.data?.volume;
-  const volumePermissions = volumesPermissions?.find(
-    (v: Grant) => v.id === volumeId
-  );
-  const readOnly =
-    Boolean(profile.data?.restricted) &&
-    volumePermissions &&
-    volumePermissions.permissions === 'read_only';
-
-  return (
-    <Drawer onClose={actions.closeDrawer} open={isOpen} title={drawerTitle}>
-      {mode === modes.EDITING &&
-        volumeId !== undefined &&
-        volumeLabel !== undefined &&
-        volumeTags !== undefined && (
-          <EditVolumeForm
-            onClose={actions.closeDrawer}
-            readOnly={readOnly}
-            volumeId={volumeId}
-            volumeLabel={volumeLabel}
-            volumeTags={volumeTags.map((v) => ({ label: v, value: v }))}
-          />
-        )}
-      {mode === modes.RESIZING &&
-        volumeId !== undefined &&
-        volumeRegion !== undefined &&
-        volumeSize !== undefined &&
-        volumeLabel !== undefined && (
-          <ResizeVolumeForm
-            flags={flags}
-            onClose={actions.closeDrawer}
-            onSuccess={actions.openForResizeInstructions}
-            readOnly={readOnly}
-            volumeId={volumeId}
-            volumeLabel={volumeLabel}
-            volumeRegion={volumeRegion}
-            volumeSize={volumeSize}
-          />
-        )}
-      {mode === modes.CLONING &&
-        volumeId !== undefined &&
-        volumeLabel !== undefined &&
-        volumeRegion !== undefined &&
-        volumeSize !== undefined && (
-          <CloneVolumeForm
-            flags={flags}
-            onClose={actions.closeDrawer}
-            volumeId={volumeId}
-            volumeLabel={volumeLabel}
-            volumeRegion={volumeRegion}
-            volumeSize={volumeSize}
-          />
-        )}
-      {mode === modes.CREATING_FOR_LINODE &&
-        linodeId !== undefined &&
-        linodeLabel !== undefined &&
-        linodeRegion !== undefined && (
-          <CreateVolumeForLinodeForm
-            flags={flags}
-            linode_id={linodeId}
-            linodeLabel={linodeLabel}
-            linodeRegion={linodeRegion}
-            onClose={actions.closeDrawer}
-            onSuccess={actions.openForConfig}
-          />
-        )}
-      {mode === modes.ATTACHING &&
-        linodeId !== undefined &&
-        linodeRegion !== undefined &&
-        linodeLabel !== undefined && (
-          <AttachVolumeToLinodeForm
-            linodeId={linodeId}
-            linodeLabel={linodeLabel}
-            linodeRegion={linodeRegion}
-            onClose={actions.closeDrawer}
-          />
-        )}
-      {mode === modes.VIEWING_CONFIG &&
-        volumeLabel !== undefined &&
-        volumePath !== undefined && (
-          <VolumeConfigForm
-            message={message}
-            onClose={actions.closeDrawer}
-            volumeLabel={volumeLabel}
-            volumePath={volumePath}
-          />
-        )}
-      {mode === modes.VIEW_RESIZE_INSTRUCTIONS && volumeLabel !== undefined && (
-        <ResizeVolumesInstruction
-          message={message}
-          onClose={actions.closeDrawer}
-          volumeLabel={volumeLabel}
-        />
-      )}
-    </Drawer>
-  );
-};
-
-interface DispatchProps {
-  actions: {
-    closeDrawer: () => void;
-    openForConfig: (
-      volumeLabel: string,
-      volumePath: string,
-      message?: string
-    ) => void;
-    openForResizeInstructions: (volumeLabel: string, message?: string) => void;
-  };
-}
-
-const mapDispatchToProps: MapDispatchToProps<DispatchProps, {}> = (
-  dispatch
-) => ({
-  actions: {
-    closeDrawer: () => dispatch(close()),
-    openForConfig: (
-      volumeLabel: string,
-      volumePath: string,
-      message?: string
-    ) => dispatch(openForConfig(volumeLabel, volumePath, message)),
-    openForResizeInstructions: (volumeLabel: string, message?: string) =>
-      dispatch(viewResizeInstructions({ message, volumeLabel })),
-  },
-});
-
-interface StateProps {
-  drawerTitle: string;
-  isOpen: boolean;
-  linodeId?: number;
-  linodeLabel?: string;
-  linodeRegion?: string;
-  message?: string;
-  mode: string;
-  volumeId?: number;
-  volumeLabel?: string;
-  volumePath?: string;
-  volumeRegion?: string;
-  volumeSize?: number;
-  volumeTags?: string[];
-}
-
-const mapStateToProps: MapState<StateProps, {}> = (state) => {
-  const {
-    linodeId,
-    linodeLabel,
-    linodeRegion,
-    message,
-    mode,
-    volumeId,
-    volumeLabel,
-    volumePath,
-    volumeRegion,
-    volumeSize,
-    volumeTags,
-  } = state.volumeDrawer;
-
-  return {
-    drawerTitle: titleFromState(state.volumeDrawer),
-    isOpen: mode !== modes.CLOSED,
-    linodeId,
-    linodeLabel,
-    linodeRegion,
-    message,
-    mode,
-    volumeId,
-    volumeLabel,
-    volumePath,
-    volumeRegion,
-    volumeSize,
-    volumeTags,
-  };
-};
-
-const titleFromState = (state: ApplicationState['volumeDrawer']) => {
-  const { linodeLabel, mode } = state;
-
-  switch (mode) {
-    case modes.CREATING_FOR_LINODE:
-      return `Create Volume for ${linodeLabel}`;
-
-    case modes.RESIZING:
-      return `Resize Volume`;
-
-    case modes.CLONING:
-      return `Clone Volume`;
-
-    case modes.EDITING:
-      return `Edit Volume`;
-
-    case modes.ATTACHING:
-      return `Attach Volume to ${linodeLabel}`;
-
-    case modes.VIEWING_CONFIG:
-      return `Volume Configuration`;
-
-    case modes.VIEW_RESIZE_INSTRUCTIONS:
-      return `Resizing Instructions`;
-
-    default:
-      return '';
-  }
-};
-
-const connected = connect(mapStateToProps, mapDispatchToProps);
-
-const VolumeDrawerWithHOCs = withProfile(connected(VolumeDrawer));
-
-export default VolumeDrawerWithHOCs;
diff --git a/packages/manager/src/features/Volumes/VolumeDrawer/VolumeSelect.tsx b/packages/manager/src/features/Volumes/VolumeDrawer/VolumeSelect.tsx
index 41fa10cfa8c..bbfbfcbcf4c 100644
--- a/packages/manager/src/features/Volumes/VolumeDrawer/VolumeSelect.tsx
+++ b/packages/manager/src/features/Volumes/VolumeDrawer/VolumeSelect.tsx
@@ -13,7 +13,7 @@ interface Props {
   value: number;
 }
 
-const VolumeSelect = (props: Props) => {
+export const VolumeSelect = (props: Props) => {
   const { disabled, error, onBlur, onChange, region, value } = props;
 
   const [inputValue, setInputValue] = React.useState<string>('');
@@ -60,8 +60,16 @@ const VolumeSelect = (props: Props) => {
           }
         },
       }}
-      onInputChange={(event, value) => {
-        setInputValue(value);
+      onChange={(event, value) => {
+        onChange(value?.id ?? -1);
+        setInputValue('');
+      }}
+      onInputChange={(event, value, reason) => {
+        if (reason === 'input') {
+          setInputValue(value);
+        } else {
+          setInputValue('');
+        }
       }}
       renderInput={(params) => (
         <TextField
@@ -70,21 +78,17 @@ const VolumeSelect = (props: Props) => {
           }
           errorText={error}
           label="Volume"
-          loading={isLoading}
           onBlur={onBlur}
           placeholder="Select a Volume"
           {...params}
         />
       )}
       disabled={disabled}
-      inputValue={inputValue}
+      inputValue={selectedVolume ? selectedVolume.label : inputValue}
       isOptionEqualToValue={(option) => option.id === selectedVolume?.id}
       loading={isLoading}
-      onChange={(event, value) => onChange(value?.id ?? -1)}
       options={options ?? []}
       value={selectedVolume}
     />
   );
 };
-
-export default VolumeSelect;
diff --git a/packages/manager/src/features/Volumes/VolumeDrawer/VolumesActionsPanel.tsx b/packages/manager/src/features/Volumes/VolumeDrawer/VolumesActionsPanel.tsx
deleted file mode 100644
index 07f998257c3..00000000000
--- a/packages/manager/src/features/Volumes/VolumeDrawer/VolumesActionsPanel.tsx
+++ /dev/null
@@ -1,49 +0,0 @@
-import * as React from 'react';
-
-import { ActionsPanel } from 'src/components/ActionsPanel/ActionsPanel';
-
-interface Props {
-  disabled?: boolean;
-  isSubmitting: boolean;
-  onCancel?: () => void;
-  onSubmit?: () => void;
-  submitText?: string;
-}
-
-type CombinedProps = Props;
-
-const VolumesActionsPanel: React.FC<CombinedProps> = ({
-  disabled,
-  isSubmitting,
-  onCancel,
-  onSubmit,
-  submitText,
-}) => {
-  return (
-    // We could remove this with ActionsPanel component.
-    <ActionsPanel
-      primaryButtonProps={
-        onSubmit
-          ? {
-              'data-testid': 'submit',
-              disabled,
-              label: submitText ?? 'Submit',
-              loading: isSubmitting,
-              onClick: onSubmit,
-            }
-          : undefined
-      }
-      secondaryButtonProps={
-        onCancel
-          ? {
-              'data-testid': 'cancel',
-              label: 'Cancel',
-              onClick: onCancel,
-            }
-          : undefined
-      }
-    />
-  );
-};
-
-export default VolumesActionsPanel;
diff --git a/packages/manager/src/features/Volumes/VolumeDrawer/index.ts b/packages/manager/src/features/Volumes/VolumeDrawer/index.ts
deleted file mode 100644
index 9ee2251921f..00000000000
--- a/packages/manager/src/features/Volumes/VolumeDrawer/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import VolumeDrawer from './VolumeDrawer';
-import { modes as _modes } from './modes';
-export const modes = _modes;
-export default VolumeDrawer;
diff --git a/packages/manager/src/features/Volumes/VolumeDrawer/modes.ts b/packages/manager/src/features/Volumes/VolumeDrawer/modes.ts
deleted file mode 100644
index 2db777cd604..00000000000
--- a/packages/manager/src/features/Volumes/VolumeDrawer/modes.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-export const modes = {
-  ATTACHING: 'attaching',
-  CLONING: 'cloning',
-  CLOSED: 'closed',
-  CREATING_FOR_LINODE: 'creating_for_linode',
-  EDITING: 'editing',
-  RESIZING: 'resizing',
-  VIEW_RESIZE_INSTRUCTIONS: 'viewing_resize_instructions',
-  VIEWING_CONFIG: 'viewing_config',
-};
diff --git a/packages/manager/src/features/Volumes/VolumeTableRow.test.tsx b/packages/manager/src/features/Volumes/VolumeTableRow.test.tsx
index cf0b59c7277..6a98c3a4ff7 100644
--- a/packages/manager/src/features/Volumes/VolumeTableRow.test.tsx
+++ b/packages/manager/src/features/Volumes/VolumeTableRow.test.tsx
@@ -1,10 +1,11 @@
+import userEvent from '@testing-library/user-event';
 import * as React from 'react';
 
 import { volumeFactory } from 'src/factories';
 import { renderWithTheme, wrapWithTableBody } from 'src/utilities/testHelpers';
 
 import { VolumeTableRow } from './VolumeTableRow';
-import userEvent from '@testing-library/user-event';
+import { ActionHandlers } from './VolumesActionMenu';
 
 const attachedVolume = volumeFactory.build({
   linode_id: 0,
@@ -17,20 +18,22 @@ const unattachedVolume = volumeFactory.build({
   linode_label: null,
 });
 
-const handlers = {
+const handlers: ActionHandlers = {
   handleAttach: jest.fn(),
+  handleClone: jest.fn(),
   handleDelete: jest.fn(),
   handleDetach: jest.fn(),
-  openForClone: jest.fn(),
-  openForConfig: jest.fn(),
-  openForEdit: jest.fn(),
-  openForResize: jest.fn(),
+  handleDetails: jest.fn(),
+  handleEdit: jest.fn(),
+  handleResize: jest.fn(),
 };
 
 describe('Volume table row', () => {
   it("should show the attached Linode's label if present", () => {
-    const { getByTestId, getByText, getByLabelText } = renderWithTheme(
-      wrapWithTableBody(<VolumeTableRow {...handlers} {...attachedVolume} />)
+    const { getByLabelText, getByTestId, getByText } = renderWithTheme(
+      wrapWithTableBody(
+        <VolumeTableRow handlers={handlers} volume={attachedVolume} />
+      )
     );
 
     // Check row for basic values
@@ -46,8 +49,10 @@ describe('Volume table row', () => {
   });
 
   it('should show Unattached if the Volume is not attached to a Linode', () => {
-    const { getByText, getByLabelText } = renderWithTheme(
-      wrapWithTableBody(<VolumeTableRow {...handlers} {...unattachedVolume} />)
+    const { getByLabelText, getByText } = renderWithTheme(
+      wrapWithTableBody(
+        <VolumeTableRow handlers={handlers} volume={unattachedVolume} />
+      )
     );
     expect(getByText('Unattached'));
 
@@ -67,7 +72,11 @@ describe('Volume table row - for linodes detail page', () => {
       queryByText,
     } = renderWithTheme(
       wrapWithTableBody(
-        <VolumeTableRow {...handlers} {...attachedVolume} isDetailsPageRow />
+        <VolumeTableRow
+          handlers={handlers}
+          isDetailsPageRow
+          volume={attachedVolume}
+        />
       )
     );
 
diff --git a/packages/manager/src/features/Volumes/VolumeTableRow.tsx b/packages/manager/src/features/Volumes/VolumeTableRow.tsx
index 3d2aaf99f30..a6efc1184b5 100644
--- a/packages/manager/src/features/Volumes/VolumeTableRow.tsx
+++ b/packages/manager/src/features/Volumes/VolumeTableRow.tsx
@@ -1,19 +1,19 @@
 import { Event } from '@linode/api-v4/lib/account';
 import { Volume } from '@linode/api-v4/lib/volumes/types';
-import { Box } from 'src/components/Box';
 import { makeStyles } from '@mui/styles';
 import * as React from 'react';
 import { Link } from 'react-router-dom';
 
+import { Box } from 'src/components/Box';
 import { Hidden } from 'src/components/Hidden';
-import { Status } from 'src/components/StatusIcon/StatusIcon';
 import { StatusIcon } from 'src/components/StatusIcon/StatusIcon';
+import { Status } from 'src/components/StatusIcon/StatusIcon';
 import { TableCell } from 'src/components/TableCell';
 import { TableRow } from 'src/components/TableRow';
 import { Typography } from 'src/components/Typography';
 import { useRegionsQuery } from 'src/queries/regions';
 
-import VolumesActionMenu, { ActionHandlers } from './VolumesActionMenu';
+import { ActionHandlers, VolumesActionMenu } from './VolumesActionMenu';
 // import useEvents from 'src/hooks/useEvents';
 
 export const useStyles = makeStyles({
@@ -27,11 +27,11 @@ export const useStyles = makeStyles({
 });
 
 interface Props {
+  handlers: ActionHandlers;
   isDetailsPageRow?: boolean;
+  volume: Volume;
 }
 
-export type CombinedProps = Props & Volume & ActionHandlers;
-
 export const progressFromEvent = (e?: Event) => {
   if (!e) {
     return undefined;
@@ -64,32 +64,16 @@ export const volumeStatusIconMap: Record<Volume['status'], Status> = {
   resizing: 'other',
 };
 
-export const VolumeTableRow = React.memo((props: CombinedProps) => {
+export const VolumeTableRow = React.memo((props: Props) => {
   const classes = useStyles();
   const { data: regions } = useRegionsQuery();
-  const {
-    filesystem_path: filesystemPath,
-    handleAttach,
-    handleDelete,
-    handleDetach,
-    id,
-    isDetailsPageRow,
-    label,
-    linode_id: linodeId,
-    linode_label,
-    openForClone,
-    openForConfig,
-    openForEdit,
-    openForResize,
-    region,
-    size,
-    status,
-    tags,
-  } = props;
+  const { handlers, isDetailsPageRow, volume } = props;
 
   const isVolumesLanding = !isDetailsPageRow;
 
-  const regionLabel = regions?.find((r) => r.id === region)?.label ?? region;
+  const regionLabel =
+    regions?.find((r) => r.id === volume.region)?.label ?? volume.region;
+
   // const { events } = useEvents();
 
   // const recentEvent = events.find((event) => event.entity?.id === id);
@@ -99,8 +83,8 @@ export const VolumeTableRow = React.memo((props: CombinedProps) => {
   // const progress = progressFromEvent(recentEvent);
 
   return (
-    <TableRow data-qa-volume-cell={id} key={`volume-row-${id}`}>
-      <TableCell data-qa-volume-cell-label={label}>
+    <TableRow data-qa-volume-cell={volume.id} key={`volume-row-${volume.id}`}>
+      <TableCell data-qa-volume-cell-label={volume.label}>
         <Box
           sx={{
             alignItems: 'center',
@@ -109,34 +93,34 @@ export const VolumeTableRow = React.memo((props: CombinedProps) => {
             wrap: 'nowrap',
           }}
         >
-          {label}
+          {volume.label}
         </Box>
       </TableCell>
       <TableCell statusCell>
-        <StatusIcon status={volumeStatusIconMap[status]} />
-        {status.replace('_', ' ')}
+        <StatusIcon status={volumeStatusIconMap[volume.status]} />
+        {volume.status.replace('_', ' ')}
       </TableCell>
-      {isVolumesLanding && region ? (
+      {isVolumesLanding && volume.region ? (
         <TableCell data-qa-volume-region data-testid="region" noWrap>
           {regionLabel}
         </TableCell>
       ) : null}
-      <TableCell data-qa-volume-size>{size} GB</TableCell>
+      <TableCell data-qa-volume-size>{volume.size} GB</TableCell>
       {!isVolumesLanding ? (
         <Hidden smDown>
           <TableCell className={classes.volumePath} data-qa-fs-path>
-            {filesystemPath}
+            {volume.filesystem_path}
           </TableCell>
         </Hidden>
       ) : null}
       {isVolumesLanding && (
-        <TableCell data-qa-volume-cell-attachment={linode_label}>
-          {linodeId !== null ? (
+        <TableCell data-qa-volume-cell-attachment={volume.linode_label}>
+          {volume.linode_id !== null ? (
             <Link
               className="link secondaryLink"
-              to={`/linodes/${linodeId}/storage`}
+              to={`/linodes/${volume.linode_id}/storage`}
             >
-              {linode_label}
+              {volume.linode_label}
             </Link>
           ) : (
             <Typography data-qa-unattached>Unattached</Typography>
@@ -145,31 +129,9 @@ export const VolumeTableRow = React.memo((props: CombinedProps) => {
       )}
       <TableCell actionCell>
         <VolumesActionMenu
-          /**
-           * This is a safer check than linode_id (see logic in addAttachedLinodeInfoToVolume() from VolumesLanding)
-           * as it actually checks to see if the Linode exists before adding linodeLabel and linodeStatus.
-           * This avoids a bug (M3-2534) where a Volume attached to a just-deleted Linode
-           * could sometimes get tagged as "attached" here.
-           */
-          attached={Boolean(linode_label)}
-          filesystemPath={filesystemPath}
-          handleAttach={handleAttach}
-          handleDelete={handleDelete}
-          handleDetach={handleDetach}
+          handlers={handlers}
           isVolumesLanding={isVolumesLanding} // Passing this down to govern logic re: showing Attach or Detach in action menu.
-          label={label}
-          linodeId={linodeId ?? 0}
-          linodeLabel={linode_label || ''}
-          openForClone={openForClone}
-          openForConfig={openForConfig}
-          openForEdit={openForEdit}
-          openForResize={openForResize}
-          regionID={region}
-          size={size}
-          volumeId={id}
-          volumeLabel={label}
-          volumeRegion={region}
-          volumeTags={tags}
+          volume={volume}
         />
       </TableCell>
     </TableRow>
diff --git a/packages/manager/src/features/Volumes/Volumes.tsx b/packages/manager/src/features/Volumes/Volumes.tsx
index 8357ae2f4d7..22ef07ef42e 100644
--- a/packages/manager/src/features/Volumes/Volumes.tsx
+++ b/packages/manager/src/features/Volumes/Volumes.tsx
@@ -4,7 +4,9 @@ import { Redirect, Route, Switch, useRouteMatch } from 'react-router-dom';
 import { ProductInformationBanner } from 'src/components/ProductInformationBanner/ProductInformationBanner';
 
 const VolumesLanding = React.lazy(() => import('./VolumesLanding'));
-const VolumeCreate = React.lazy(() => import('./VolumeCreate/VolumeCreate'));
+const VolumeCreate = React.lazy(
+  () => import('./VolumeCreate/CreateVolumeForm')
+);
 
 const Volumes = () => {
   const { path } = useRouteMatch();
@@ -13,12 +15,7 @@ const Volumes = () => {
     <>
       <ProductInformationBanner bannerLocation="Volumes" />
       <Switch>
-        <Route
-          exact
-          path={path}
-          render={() => <VolumesLanding isVolumesLanding removeBreadCrumb />}
-          strict
-        />
+        <Route component={VolumesLanding} exact path={path} strict />
         <Route component={VolumeCreate} exact path={`${path}/create`} strict />
         <Redirect to={path} />
       </Switch>
diff --git a/packages/manager/src/features/Volumes/VolumesActionMenu.test.tsx b/packages/manager/src/features/Volumes/VolumesActionMenu.test.tsx
index da1e482f527..169c960c3aa 100644
--- a/packages/manager/src/features/Volumes/VolumesActionMenu.test.tsx
+++ b/packages/manager/src/features/Volumes/VolumesActionMenu.test.tsx
@@ -1,29 +1,22 @@
 import * as React from 'react';
 
+import { volumeFactory } from 'src/factories';
 import { includesActions, renderWithTheme } from 'src/utilities/testHelpers';
 
 import { Props, VolumesActionMenu } from './VolumesActionMenu';
 
 const props: Props = {
-  attached: false,
-  filesystemPath: '',
-  handleAttach: jest.fn(),
-  handleDelete: jest.fn(),
-  handleDetach: jest.fn(),
-  isVolumesLanding: false,
-  label: '',
-  linodeId: 0,
-  linodeLabel: '',
-  openForClone: jest.fn(),
-  openForConfig: jest.fn(),
-  openForEdit: jest.fn(),
-  openForResize: jest.fn(),
-  regionID: '',
-  size: 50,
-  volumeId: 12345,
-  volumeLabel: '',
-  volumeRegion: 'east-us',
-  volumeTags: ['abc', 'def'],
+  handlers: {
+    handleAttach: jest.fn(),
+    handleClone: jest.fn(),
+    handleDelete: jest.fn(),
+    handleDetach: jest.fn(),
+    handleDetails: jest.fn(),
+    handleEdit: jest.fn(),
+    handleResize: jest.fn(),
+  },
+  isVolumesLanding: true,
+  volume: volumeFactory.build({ linode_id: null, linode_label: null }),
 };
 
 describe('Volume action menu', () => {
@@ -42,16 +35,20 @@ describe('Volume action menu', () => {
 
   it('should include Detach if the Volume is attached', () => {
     const { queryByText } = renderWithTheme(
-      <VolumesActionMenu {...props} attached={true} />
+      <VolumesActionMenu
+        {...props}
+        volume={volumeFactory.build({
+          linode_id: 2,
+          linode_label: 'linode-2',
+        })}
+      />
     );
     includesActions(['Detach'], queryByText);
     expect(queryByText('Attach')).toBeNull();
   });
 
   it('should include Delete', () => {
-    const { queryByText } = renderWithTheme(
-      <VolumesActionMenu {...props} attached={false} />
-    );
+    const { queryByText } = renderWithTheme(<VolumesActionMenu {...props} />);
     includesActions(['Delete'], queryByText);
   });
 });
diff --git a/packages/manager/src/features/Volumes/VolumesActionMenu.tsx b/packages/manager/src/features/Volumes/VolumesActionMenu.tsx
index 125b841d1c8..8956265be33 100644
--- a/packages/manager/src/features/Volumes/VolumesActionMenu.tsx
+++ b/packages/manager/src/features/Volumes/VolumesActionMenu.tsx
@@ -1,3 +1,4 @@
+import { Volume } from '@linode/api-v4';
 import { Theme } from '@mui/material/styles';
 import useMediaQuery from '@mui/material/useMediaQuery';
 import { useTheme } from '@mui/styles';
@@ -8,145 +9,63 @@ import { Action, ActionMenu } from 'src/components/ActionMenu';
 import { InlineMenuAction } from 'src/components/InlineMenuAction/InlineMenuAction';
 
 export interface ActionHandlers {
-  handleAttach: (volumeId: number, label: string, linodeRegion: string) => void;
-  handleDelete: (volumeId: number, volumeLabel: string) => void;
-  handleDetach: (
-    volumeId: number,
-    volumeLabel: string,
-    linodeLabel: string,
-    linodeId: number
-  ) => void;
-  handleUpgrade?: (volumeId: number, label: string) => void;
-  openForClone: (
-    volumeId: number,
-    label: string,
-    size: number,
-    regionID: string
-  ) => void;
-  openForConfig: (volumeLabel: string, volumePath: string) => void;
-  openForEdit: (
-    volumeId: number,
-    volumeLabel: string,
-    volumeTags: string[]
-  ) => void;
-  openForResize: (
-    volumeId: number,
-    volumeSize: number,
-    volumeLabel: string,
-    volumeRegion: string
-  ) => void;
+  handleAttach: () => void;
+  handleClone: () => void;
+  handleDelete: () => void;
+  handleDetach: () => void;
+  handleDetails: () => void;
+  handleEdit: () => void;
+  handleResize: () => void;
 }
 
-export interface Props extends ActionHandlers {
-  attached: boolean;
-  filesystemPath: string;
+export interface Props {
+  handlers: ActionHandlers;
   isVolumesLanding: boolean;
-  label: string;
-  linodeId: number;
-  linodeLabel: string;
-  regionID: string;
-  size: number;
-  volumeId: number;
-  volumeLabel: string;
-  volumeRegion: string;
-  volumeTags: string[];
+  volume: Volume;
 }
 
 export const VolumesActionMenu = (props: Props) => {
-  const { attached, isVolumesLanding } = props;
+  const { handlers, isVolumesLanding, volume } = props;
+
+  const attached = volume.linode_id !== null;
 
   const theme = useTheme<Theme>();
   const matchesSmDown = useMediaQuery(theme.breakpoints.down('md'));
 
-  const handleShowConfig = () => {
-    const { filesystemPath, label, openForConfig } = props;
-    openForConfig(label, filesystemPath);
-  };
-
-  const handleOpenEdit = () => {
-    const { label, openForEdit, volumeId, volumeTags } = props;
-    openForEdit(volumeId, label, volumeTags);
-  };
-
-  const handleResize = () => {
-    const { label, openForResize, size, volumeId, volumeRegion } = props;
-    openForResize(volumeId, size, label, volumeRegion);
-  };
-
-  const handleClone = () => {
-    const { label, openForClone, regionID, size, volumeId } = props;
-    openForClone(volumeId, label, size, regionID);
-  };
-
-  const handleAttach = () => {
-    const { handleAttach, label, regionID, volumeId } = props;
-    handleAttach(volumeId, label, regionID);
-  };
-
-  const handleDetach = () => {
-    const {
-      handleDetach,
-      linodeId,
-      linodeLabel,
-      volumeId,
-      volumeLabel,
-    } = props;
-    handleDetach(volumeId, volumeLabel, linodeLabel, linodeId);
-  };
-
-  const handleDelete = () => {
-    const { handleDelete, volumeId, volumeLabel } = props;
-    handleDelete(volumeId, volumeLabel);
-  };
-
   const actions: Action[] = [
     {
-      onClick: () => {
-        handleShowConfig();
-      },
+      onClick: handlers.handleDetails,
       title: 'Show Config',
     },
     {
-      onClick: () => {
-        handleOpenEdit();
-      },
+      onClick: handlers.handleEdit,
       title: 'Edit',
     },
     {
-      onClick: () => {
-        handleResize();
-      },
+      onClick: handlers.handleResize,
       title: 'Resize',
     },
     {
-      onClick: () => {
-        handleClone();
-      },
+      onClick: handlers.handleClone,
       title: 'Clone',
     },
   ];
 
   if (!attached && isVolumesLanding) {
     actions.push({
-      onClick: () => {
-        handleAttach();
-      },
+      onClick: handlers.handleAttach,
       title: 'Attach',
     });
   } else {
     actions.push({
-      onClick: () => {
-        handleDetach();
-      },
+      onClick: handlers.handleDetach,
       title: 'Detach',
     });
   }
 
   actions.push({
     disabled: attached,
-    onClick: () => {
-      handleDelete();
-    },
+    onClick: handlers.handleDelete,
     title: 'Delete',
     tooltip: attached
       ? 'Your volume must be detached before it can be deleted.'
@@ -170,10 +89,8 @@ export const VolumesActionMenu = (props: Props) => {
         })}
       <ActionMenu
         actionsList={menuActions}
-        ariaLabel={`Action menu for Volume ${props.volumeLabel}`}
+        ariaLabel={`Action menu for Volume ${volume.label}`}
       />
     </>
   );
 };
-
-export default VolumesActionMenu;
diff --git a/packages/manager/src/features/Volumes/VolumesLanding.tsx b/packages/manager/src/features/Volumes/VolumesLanding.tsx
index d5de5236636..afb576a03b1 100644
--- a/packages/manager/src/features/Volumes/VolumesLanding.tsx
+++ b/packages/manager/src/features/Volumes/VolumesLanding.tsx
@@ -1,10 +1,5 @@
-import { Event } from '@linode/api-v4/lib/account';
-import { Config } from '@linode/api-v4/lib/linodes';
 import * as React from 'react';
-import { connect } from 'react-redux';
-import { useHistory } from 'react-router-dom';
-import { compose } from 'recompose';
-import { Dispatch, bindActionCreators } from 'redux';
+import { useHistory, useLocation } from 'react-router-dom';
 
 import { DocumentTitleSegment } from 'src/components/DocumentTitle';
 import { ErrorState } from 'src/components/ErrorState/ErrorState';
@@ -20,67 +15,27 @@ import { TableSortCell } from 'src/components/TableSortCell';
 import { useOrder } from 'src/hooks/useOrder';
 import { usePagination } from 'src/hooks/usePagination';
 import { useVolumesQuery } from 'src/queries/volumes';
-import {
-  LinodeOptions,
-  Origin as VolumeDrawerOrigin,
-  openForClone,
-  openForConfig,
-  openForCreating,
-  openForEdit,
-  openForResize,
-} from 'src/store/volumeForm';
 import { getAPIErrorOrDefault } from 'src/utilities/errorUtils';
 
-import { DestructiveVolumeDialog } from './DestructiveVolumeDialog';
-import { UpgradeVolumeDialog } from './UpgradeVolumeDialog';
-import { VolumeAttachmentDrawer } from './VolumeAttachmentDrawer';
+import { AttachVolumeDrawer } from './AttachVolumeDrawer';
+import { CloneVolumeDrawer } from './CloneVolumeDrawer';
+import { DeleteVolumeDialog } from './DeleteVolumeDialog';
+import { DetachVolumeDialog } from './DetachVolumeDialog';
+import { EditVolumeDrawer } from './EditVolumeDrawer';
+import { ResizeVolumeDrawer } from './ResizeVolumeDrawer';
+import { VolumeDetailsDrawer } from './VolumeDetailsDrawer';
 import { VolumeTableRow } from './VolumeTableRow';
-import { ActionHandlers as VolumeHandlers } from './VolumesActionMenu';
 import { VolumesLandingEmptyState } from './VolumesLandingEmptyState';
 
-interface Props {
-  fromLinodes?: boolean;
-  isVolumesLanding?: boolean;
-  linodeConfigs?: Config[];
-  linodeId?: number;
-  linodeLabel?: string;
-  linodeRegion?: string;
-  readOnly?: boolean;
-  recentEvent?: Event;
-  removeBreadCrumb?: boolean;
-}
-
-interface DispatchProps {
-  openForClone: (
-    volumeId: number,
-    volumeLabel: string,
-    volumeSize: number,
-    volumeRegion: string
-  ) => void;
-  openForConfig: (volumeLabel: string, volumePath: string) => void;
-  openForCreating: (
-    origin: VolumeDrawerOrigin,
-    linodeOptions?: LinodeOptions
-  ) => void;
-  openForEdit: (
-    volumeId: number,
-    volumeLabel: string,
-    volumeTags: string[]
-  ) => void;
-  openForResize: (
-    volumeId: number,
-    volumeSize: number,
-    volumeLabel: string
-  ) => void;
-}
-
-type CombinedProps = Props & DispatchProps;
+import type { Volume } from '@linode/api-v4';
 
 const preferenceKey = 'volumes';
 
-export const VolumesLanding = (props: CombinedProps) => {
+export const VolumesLanding = () => {
   const history = useHistory();
 
+  const location = useLocation<{ volume: Volume | undefined }>();
+
   const pagination = usePagination(1, preferenceKey);
 
   const { handleOrderChange, order, orderBy } = useOrder(
@@ -104,100 +59,52 @@ export const VolumesLanding = (props: CombinedProps) => {
     filter
   );
 
-  const { openForClone, openForConfig, openForEdit, openForResize } = props;
-
-  const [upgradeVolumeDialog, setUpgradeVolumeDialog] = React.useState({
-    open: false,
-    volumeId: 0,
-    volumeLabel: '',
-  });
-
-  const [attachmentDrawer, setAttachmentDrawer] = React.useState({
-    linodeRegion: '',
-    open: false,
-    volumeId: 0,
-    volumeLabel: '',
-  });
-
-  const [destructiveDialog, setDestructiveDialog] = React.useState<{
-    linodeId?: number;
-    linodeLabel?: string;
-    mode: 'delete' | 'detach';
-    open: boolean;
-    volumeId?: number;
-    volumeLabel: string;
-  }>({
-    linodeId: undefined,
-    linodeLabel: undefined,
-    mode: 'detach',
-    open: false,
-    volumeId: 0,
-    volumeLabel: '',
-  });
-
-  const handleCloseAttachDrawer = () => {
-    setAttachmentDrawer((attachmentDrawer) => ({
-      ...attachmentDrawer,
-      open: false,
-    }));
+  const [selectedVolumeId, setSelectedVolumeId] = React.useState<number>();
+  const [isDetailsDrawerOpen, setIsDetailsDrawerOpen] = React.useState(
+    Boolean(location.state?.volume)
+  );
+  const [isEditDrawerOpen, setIsEditDrawerOpen] = React.useState(false);
+  const [isResizeDrawerOpen, setIsResizeDrawerOpen] = React.useState(false);
+  const [isCloneDrawerOpen, setIsCloneDrawerOpen] = React.useState(false);
+  const [isAttachDrawerOpen, setIsAttachDrawerOpen] = React.useState(false);
+  const [isDetachDialogOpen, setIsDetachDialogOpen] = React.useState(false);
+  const [isDeleteDialogOpen, setIsDeleteDialogOpen] = React.useState(false);
+
+  const selectedVolume = volumes?.data.find((v) => v.id === selectedVolumeId);
+
+  const handleDetach = (volume: Volume) => {
+    setSelectedVolumeId(volume.id);
+    setIsDetachDialogOpen(true);
   };
 
-  const handleUpgrade = (volumeId: number, label: string) => {
-    setUpgradeVolumeDialog({ open: true, volumeId, volumeLabel: label });
+  const handleDelete = (volume: Volume) => {
+    setSelectedVolumeId(volume.id);
+    setIsDeleteDialogOpen(true);
   };
 
-  const handleAttach = (volumeId: number, label: string, regionID: string) => {
-    setAttachmentDrawer((attachmentDrawer) => ({
-      ...attachmentDrawer,
-      linodeRegion: regionID,
-      open: true,
-      volumeId,
-      volumeLabel: label,
-    }));
+  const handleDetails = (volume: Volume) => {
+    setSelectedVolumeId(volume.id);
+    setIsDetailsDrawerOpen(true);
   };
 
-  const handleDetach = (
-    volumeId: number,
-    volumeLabel: string,
-    linodeLabel: string,
-    linodeId: number
-  ) => {
-    setDestructiveDialog((destructiveDialog) => ({
-      ...destructiveDialog,
-      error: '',
-      linodeId,
-      linodeLabel,
-      mode: 'detach',
-      open: true,
-      volumeId,
-      volumeLabel,
-    }));
+  const handleEdit = (volume: Volume) => {
+    setSelectedVolumeId(volume.id);
+    setIsEditDrawerOpen(true);
   };
 
-  const handleDelete = (volumeId: number, volumeLabel: string) => {
-    setDestructiveDialog((destructiveDialog) => ({
-      ...destructiveDialog,
-      error: '',
-      linodeLabel: '',
-      mode: 'delete',
-      open: true,
-      volumeId,
-      volumeLabel,
-    }));
+  const handleResize = (volume: Volume) => {
+    setSelectedVolumeId(volume.id);
+    setIsResizeDrawerOpen(true);
   };
 
-  const closeDestructiveDialog = () => {
-    setDestructiveDialog((destructiveDialog) => ({
-      ...destructiveDialog,
-      open: false,
-    }));
+  const handleClone = (volume: Volume) => {
+    setSelectedVolumeId(volume.id);
+    setIsCloneDrawerOpen(true);
   };
 
-  const closeUpgradeVolumeDialog = () => {
-    setUpgradeVolumeDialog((values) => ({
-      ...values,
-      open: false,
-    }));
+  const handleAttach = (volume: Volume) => {
+    setSelectedVolumeId(volume.id);
+    setIsAttachDrawerOpen(true);
   };
 
   if (isLoading) {
@@ -218,17 +125,6 @@ export const VolumesLanding = (props: CombinedProps) => {
     return <VolumesLandingEmptyState />;
   }
 
-  const handlers: VolumeHandlers = {
-    handleAttach,
-    handleDelete,
-    handleDetach,
-    handleUpgrade,
-    openForClone,
-    openForConfig,
-    openForEdit,
-    openForResize,
-  };
-
   return (
     <>
       <DocumentTitleSegment segment="Volumes" />
@@ -272,7 +168,19 @@ export const VolumesLanding = (props: CombinedProps) => {
         </TableHead>
         <TableBody>
           {volumes?.data.map((volume) => (
-            <VolumeTableRow key={volume.id} {...volume} {...handlers} />
+            <VolumeTableRow
+              handlers={{
+                handleAttach: () => handleAttach(volume),
+                handleClone: () => handleClone(volume),
+                handleDelete: () => handleDelete(volume),
+                handleDetach: () => handleDetach(volume),
+                handleDetails: () => handleDetails(volume),
+                handleEdit: () => handleEdit(volume),
+                handleResize: () => handleResize(volume),
+              }}
+              key={volume.id}
+              volume={volume}
+            />
           ))}
         </TableBody>
       </Table>
@@ -284,44 +192,48 @@ export const VolumesLanding = (props: CombinedProps) => {
         page={pagination.page}
         pageSize={pagination.pageSize}
       />
-      <UpgradeVolumeDialog
-        id={upgradeVolumeDialog.volumeId}
-        label={upgradeVolumeDialog.volumeLabel}
-        onClose={closeUpgradeVolumeDialog}
-        open={upgradeVolumeDialog.open}
+      <AttachVolumeDrawer
+        onClose={() => setIsAttachDrawerOpen(false)}
+        open={isAttachDrawerOpen}
+        volume={selectedVolume}
       />
-      <VolumeAttachmentDrawer
-        linodeRegion={attachmentDrawer.linodeRegion || ''}
-        onClose={handleCloseAttachDrawer}
-        open={attachmentDrawer.open}
-        volumeId={attachmentDrawer.volumeId || 0}
-        volumeLabel={attachmentDrawer.volumeLabel || ''}
+      <VolumeDetailsDrawer
+        onClose={() => {
+          setIsDetailsDrawerOpen(false);
+          if (location.state?.volume) {
+            window.history.replaceState(null, '');
+          }
+        }}
+        open={isDetailsDrawerOpen}
+        volume={selectedVolume ?? location.state?.volume}
       />
-      <DestructiveVolumeDialog
-        linodeId={destructiveDialog.linodeId}
-        linodeLabel={destructiveDialog.linodeLabel}
-        mode={destructiveDialog.mode}
-        onClose={closeDestructiveDialog}
-        open={destructiveDialog.open}
-        volumeId={destructiveDialog.volumeId ?? 0}
-        volumeLabel={destructiveDialog.volumeLabel}
+      <EditVolumeDrawer
+        onClose={() => setIsEditDrawerOpen(false)}
+        open={isEditDrawerOpen}
+        volume={selectedVolume}
+      />
+      <ResizeVolumeDrawer
+        onClose={() => setIsResizeDrawerOpen(false)}
+        open={isResizeDrawerOpen}
+        volume={selectedVolume}
+      />
+      <CloneVolumeDrawer
+        onClose={() => setIsCloneDrawerOpen(false)}
+        open={isCloneDrawerOpen}
+        volume={selectedVolume}
+      />
+      <DetachVolumeDialog
+        onClose={() => setIsDetachDialogOpen(false)}
+        open={isDetachDialogOpen}
+        volume={selectedVolume}
+      />
+      <DeleteVolumeDialog
+        onClose={() => setIsDeleteDialogOpen(false)}
+        open={isDeleteDialogOpen}
+        volume={selectedVolume}
       />
     </>
   );
 };
 
-const mapDispatchToProps = (dispatch: Dispatch) =>
-  bindActionCreators(
-    {
-      openForClone,
-      openForConfig,
-      openForCreating,
-      openForEdit,
-      openForResize,
-    },
-    dispatch
-  );
-
-const connected = connect(undefined, mapDispatchToProps);
-
-export default compose<CombinedProps, Props>(connected)(VolumesLanding);
+export default VolumesLanding;
diff --git a/packages/manager/src/store/index.ts b/packages/manager/src/store/index.ts
index 1f90bbc0d7a..50d1ec45f37 100644
--- a/packages/manager/src/store/index.ts
+++ b/packages/manager/src/store/index.ts
@@ -37,10 +37,6 @@ import stackScriptDialog, {
   State as StackScriptDialogState,
   defaultState as stackScriptDialogDefaultState,
 } from 'src/store/stackScriptDialog';
-import volumeDrawer, {
-  State as VolumeDrawerState,
-  defaultState as volumeDrawerDefaultState,
-} from 'src/store/volumeForm';
 
 import featureFlagsLoad, {
   State as FeatureFlagsLoadState,
@@ -74,7 +70,6 @@ export interface ApplicationState {
   mockFeatureFlags: MockFeatureFlagState;
   pendingUpload: PendingUploadState;
   stackScriptDialog: StackScriptDialogState;
-  volumeDrawer: VolumeDrawerState;
 }
 
 export const defaultState: ApplicationState = {
@@ -89,7 +84,6 @@ export const defaultState: ApplicationState = {
   mockFeatureFlags: defaultMockFeatureFlagState,
   pendingUpload: pendingUploadState,
   stackScriptDialog: stackScriptDialogDefaultState,
-  volumeDrawer: volumeDrawerDefaultState,
 };
 
 /**
@@ -107,7 +101,6 @@ const reducers = combineReducers<ApplicationState>({
   mockFeatureFlags,
   pendingUpload,
   stackScriptDialog,
-  volumeDrawer,
 });
 
 const enhancersFactory = (queryClient: QueryClient) =>
diff --git a/packages/manager/src/store/volumeForm/index.ts b/packages/manager/src/store/volumeForm/index.ts
deleted file mode 100644
index 3d413a6ea08..00000000000
--- a/packages/manager/src/store/volumeForm/index.ts
+++ /dev/null
@@ -1,326 +0,0 @@
-import { Action, AnyAction, Reducer } from 'redux';
-import actionCreatorFactory, { isType } from 'typescript-fsa';
-
-import { modes } from 'src/features/Volumes/VolumeDrawer/modes';
-
-export interface State {
-  linodeId?: number;
-  linodeLabel?: string;
-  linodeRegion?: string;
-  message?: string;
-  mode: string;
-  origin?: Origin;
-  volumeId?: number;
-  volumeLabel?: string;
-  volumePath?: string;
-  volumeRegion?: string;
-  volumeSize?: number;
-  volumeTags?: string[];
-}
-
-const actionCreator = actionCreatorFactory(`@@manager/volumesDrawer`);
-
-const CLOSE = '@@manager/volumeDrawer/CLOSE';
-const CREATING = '@@manager/volumeDrawer/CREATING';
-const CREATING_FOR_LINODE = '@@manager/volumeDrawer/CREATING_FOR_LINODE';
-const EDITING = '@@manager/volumeDrawer/EDITING';
-const RESIZING = '@@manager/volumeDrawer/RESIZING';
-const CLONING = '@@manager/volumeDrawer/CLONING';
-const ATTACHING = '@@manager/volumeDrawer/ATTACHING';
-const VIEWING_CONFIG = '@@manager/volumeDrawer/VIEWING_CONFIG';
-
-interface Close extends Action {
-  type: typeof CLOSE;
-}
-
-export const close = (): Close => ({
-  type: CLOSE,
-});
-
-interface Creating extends Action {
-  type: typeof CREATING;
-}
-
-interface CreatingForLinode extends Action {
-  linodeId: number;
-  linodeLabel: string;
-  linodeRegion: string;
-  type: typeof CREATING_FOR_LINODE;
-}
-
-export type Origin =
-  | 'Created from Add New Menu'
-  | 'Created from Linode Details'
-  | 'Created from Volumes Landing';
-
-export interface LinodeOptions {
-  linodeId: number;
-  linodeLabel: string;
-  linodeRegion: string;
-}
-export const openForCreating = (
-  origin: Origin,
-  linodeOptions?: LinodeOptions
-) => {
-  if (linodeOptions) {
-    const { linodeId, linodeLabel, linodeRegion } = linodeOptions;
-    return createVolumeForLinode({ linodeId, linodeLabel, linodeRegion });
-  }
-
-  return createVolume({ origin });
-};
-
-interface CreateVolumePayload {
-  origin: Origin;
-}
-
-const createVolume = actionCreator<CreateVolumePayload>(`CREATE_VOLUME`, {
-  mode: 'creating',
-});
-
-interface CreateVolumeForLinodePayload {
-  linodeId: number;
-  linodeLabel: string;
-  linodeRegion: string;
-}
-
-const createVolumeForLinode = actionCreator<CreateVolumeForLinodePayload>(
-  `CREATE_VOLUME_FOR_LINODE`,
-  { mode: modes.CREATING_FOR_LINODE }
-);
-
-interface ViewResizeInstructionsPayload {
-  message?: string;
-  volumeLabel: string;
-}
-
-export const viewResizeInstructions = actionCreator<ViewResizeInstructionsPayload>(
-  `VIEW_RESIZE_INSTRUCTIONS`,
-  { mode: modes.VIEW_RESIZE_INSTRUCTIONS }
-);
-
-interface Editing extends Action {
-  type: typeof EDITING;
-  volumeId: number;
-  volumeLabel: string;
-  volumeTags: string[];
-}
-
-export const openForEdit = (
-  volumeId: number,
-  volumeLabel: string,
-  volumeTags: string[]
-): Editing => ({ type: EDITING, volumeId, volumeLabel, volumeTags });
-
-interface Resizing extends Action {
-  type: typeof RESIZING;
-  volumeId: number;
-  volumeLabel: string;
-  volumeRegion: string;
-  volumeSize: number;
-}
-
-export const openForResize = (
-  volumeId: number,
-  volumeSize: number,
-  volumeLabel: string,
-  volumeRegion: string
-): Resizing => ({
-  type: RESIZING,
-  volumeId,
-  volumeLabel,
-  volumeRegion,
-  volumeSize,
-});
-
-interface Cloning extends Action {
-  type: typeof CLONING;
-  volumeId: number;
-  volumeLabel: string;
-  volumeRegion: string;
-  volumeSize: number;
-}
-
-export const openForClone = (
-  volumeId: number,
-  volumeLabel: string,
-  volumeSize: number,
-  volumeRegion: string
-): Cloning => {
-  return {
-    type: CLONING,
-    volumeId,
-    volumeLabel,
-    volumeRegion,
-    volumeSize,
-  };
-};
-interface Attaching extends Action {
-  linodeId: number;
-  linodeLabel: string;
-  linodeRegion: string;
-  type: typeof ATTACHING;
-}
-
-export const openForAttaching = (
-  linodeId: number,
-  linodeRegion: string,
-  linodeLabel: string
-): Attaching => {
-  return {
-    linodeId,
-    linodeLabel,
-    linodeRegion,
-    type: ATTACHING,
-  };
-};
-
-interface ViewingConfig extends Action {
-  message?: string;
-  type: typeof VIEWING_CONFIG;
-  volumeLabel: string;
-  volumePath: string;
-}
-
-export const openForConfig = (
-  volumeLabel: string,
-  volumePath: string,
-  message?: string
-): ViewingConfig => {
-  return {
-    message,
-    type: VIEWING_CONFIG,
-    volumeLabel,
-    volumePath,
-  };
-};
-
-export const defaultState: State = {
-  mode: modes.CLOSED,
-  volumeId: undefined,
-  volumeLabel: undefined,
-  volumeRegion: undefined,
-  volumeSize: undefined,
-};
-
-type ActionTypes =
-  | Attaching
-  | Cloning
-  | Close
-  | Creating
-  | CreatingForLinode
-  | Editing
-  | Resizing
-  | ViewingConfig;
-
-const getMode = (action: AnyAction) => action.meta && action.meta.mode;
-
-export const volumeForm: Reducer<State> = (
-  state = defaultState,
-  action: ActionTypes
-) => {
-  if (isType(action, createVolume)) {
-    return {
-      ...state,
-      mode: getMode(action),
-      origin: action.payload.origin,
-    };
-  }
-
-  if (isType(action, createVolumeForLinode)) {
-    const {
-      payload: { linodeId, linodeLabel, linodeRegion },
-    } = action;
-
-    return {
-      ...state,
-      linodeId,
-      linodeLabel,
-      linodeRegion,
-      mode: getMode(action),
-      origin: 'Created from Linode Details',
-    };
-  }
-
-  if (isType(action, viewResizeInstructions)) {
-    const {
-      payload: { message, volumeLabel },
-    } = action;
-    return {
-      ...state,
-      message,
-      mode: getMode(action),
-      volumeLabel,
-    };
-  }
-
-  switch (action.type) {
-    case CLOSE:
-      return {
-        ...state,
-        mode: modes.CLOSED,
-        origin: undefined,
-      };
-
-    case CREATING_FOR_LINODE:
-      return {
-        ...defaultState,
-        linodeId: action.linodeId,
-        linodeLabel: action.linodeLabel,
-        linodeRegion: action.linodeRegion,
-        mode: modes.CREATING_FOR_LINODE,
-      };
-
-    case EDITING:
-      return {
-        ...defaultState,
-        mode: modes.EDITING,
-        volumeId: action.volumeId,
-        volumeLabel: action.volumeLabel,
-        volumeTags: action.volumeTags,
-      };
-
-    case RESIZING:
-      return {
-        ...defaultState,
-        mode: modes.RESIZING,
-        volumeId: action.volumeId,
-        volumeLabel: action.volumeLabel,
-        volumeRegion: action.volumeRegion,
-        volumeSize: action.volumeSize,
-      };
-
-    case CLONING:
-      return {
-        ...defaultState,
-        mode: modes.CLONING,
-        volumeId: action.volumeId,
-        volumeLabel: action.volumeLabel,
-        volumeRegion: action.volumeRegion,
-        volumeSize: action.volumeSize,
-      };
-
-    case ATTACHING:
-      return {
-        ...defaultState,
-        linodeId: action.linodeId,
-        linodeLabel: action.linodeLabel,
-        linodeRegion: action.linodeRegion,
-        mode: modes.ATTACHING,
-      };
-
-    case VIEWING_CONFIG:
-      return {
-        ...defaultState,
-        message: action.message,
-        mode: modes.VIEWING_CONFIG,
-        volumeLabel: action.volumeLabel,
-        volumePath: action.volumePath,
-      };
-
-    default:
-      return state;
-  }
-};
-
-export default volumeForm;