diff --git a/packages/slice-machine/lib/builders/SliceBuilder/FieldZones/index.tsx b/packages/slice-machine/lib/builders/SliceBuilder/FieldZones/index.tsx
index 98165959f7..1fb204e5bd 100644
--- a/packages/slice-machine/lib/builders/SliceBuilder/FieldZones/index.tsx
+++ b/packages/slice-machine/lib/builders/SliceBuilder/FieldZones/index.tsx
@@ -1,5 +1,3 @@
-import { Box } from "theme-ui";
-
 import { ensureDnDDestination } from "@lib/utils";
 import { transformKeyAccessor } from "@utils/str";
 
@@ -10,6 +8,7 @@ import * as Widgets from "@lib/models/common/widgets";
 import sliceBuilderWidgetsArray from "@lib/models/common/widgets/sliceBuilderArray";
 
 import { DropResult } from "react-beautiful-dnd";
+import { List } from "@src/components/List";
 import useSliceMachineActions from "@src/modules/useSliceMachineActions";
 import { VariationSM, WidgetsArea } from "@lib/models/common/Slice";
 
@@ -118,7 +117,7 @@ const FieldZones: React.FunctionComponent<FieldZonesProps> = ({
   };
 
   return (
-    <>
+    <List>
       <Zone
         zoneType="slice"
         tabId={undefined}
@@ -145,7 +144,6 @@ const FieldZones: React.FunctionComponent<FieldZonesProps> = ({
         dataCy="slice-non-repeatable-zone"
         isRepeatableCustomType={undefined}
       />
-      <Box mt={4} />
       <Zone
         zoneType="slice"
         tabId={undefined}
@@ -171,7 +169,7 @@ const FieldZones: React.FunctionComponent<FieldZonesProps> = ({
         dataCy="slice-repeatable-zone"
         isRepeatableCustomType={undefined}
       />
-    </>
+    </List>
   );
 };
 
diff --git a/packages/slice-machine/lib/builders/SliceBuilder/Header/index.tsx b/packages/slice-machine/lib/builders/SliceBuilder/Header/index.tsx
index 1203c6ff99..f5e7926a04 100644
--- a/packages/slice-machine/lib/builders/SliceBuilder/Header/index.tsx
+++ b/packages/slice-machine/lib/builders/SliceBuilder/Header/index.tsx
@@ -7,13 +7,10 @@ import VariationPopover from "./VariationsPopover";
 import useSliceMachineActions from "@src/modules/useSliceMachineActions";
 import { VariationSM } from "@lib/models/common/Slice";
 import { ComponentUI } from "@lib/models/common/ComponentUI";
-import { ModelStatus } from "@lib/models/common/ModelStatus";
 
 const Header: React.FC<{
   component: ComponentUI;
-  status: ModelStatus;
   variation: VariationSM;
-  imageLoading?: boolean;
 }> = ({ component, variation }) => {
   const router = useRouter();
   const [showVariationModal, setShowVariationModal] = useState(false);
diff --git a/packages/slice-machine/lib/builders/SliceBuilder/index.tsx b/packages/slice-machine/lib/builders/SliceBuilder/index.tsx
index 4fa5466809..f714e5da5e 100644
--- a/packages/slice-machine/lib/builders/SliceBuilder/index.tsx
+++ b/packages/slice-machine/lib/builders/SliceBuilder/index.tsx
@@ -22,34 +22,22 @@ import {
   AppLayoutHeader,
 } from "@components/AppLayout";
 import SimulatorButton from "@lib/builders/SliceBuilder/Header/SimulatorButton";
-import { SliceSM, VariationSM } from "@lib/models/common/Slice";
+import { VariationSM } from "@lib/models/common/Slice";
 import { ComponentUI } from "@lib/models/common/ComponentUI";
 
 import { FloatingBackButton } from "@src/features/slices/sliceBuilder/FloatingBackButton";
 import { selectIsSimulatorAvailableForFramework } from "@src/modules/environment";
 import { isSelectedSliceTouched } from "@src/modules/selectedSlice/selectors";
-import { getRemoteSlice } from "@src/modules/slices";
-import { useModelStatus } from "@src/hooks/useModelStatus";
 import { ComponentWithSliceProps } from "@src/layouts/WithSlice";
-import {
-  LocalAndRemoteSlice,
-  LocalOnlySlice,
-} from "@lib/models/common/ModelData";
 
 export type SliceBuilderState = {
-  imageLoading: boolean;
   loading: boolean;
   done: boolean;
-  error: null | string;
-  status: number | null;
 };
 
 export const initialState: SliceBuilderState = {
-  imageLoading: false,
   loading: false,
   done: false,
-  error: null,
-  status: null,
 };
 
 const SliceBuilder: ComponentWithSliceProps = ({ slice, variation }) => {
@@ -58,7 +46,7 @@ const SliceBuilder: ComponentWithSliceProps = ({ slice, variation }) => {
     (store: SliceMachineStoreType) => ({
       isTouched: isSelectedSliceTouched(store, slice.from, slice.model.id),
       remoteSlice: getRemoteSlice(store, slice.model.id),
-    }),
+    })
   );
 
   // We need to move this state to somewhere global to update the UI if any action from anywhere save or update to the filesystem I'd guess
@@ -88,7 +76,6 @@ const SliceBuilder: ComponentWithSliceProps = ({ slice, variation }) => {
         updateSlice={updateSlice.bind(null, slice, setData)}
         slice={slice}
         variation={variation}
-        remoteSlice={remoteSlice}
         isTouched={isTouched}
         data={data}
       />
@@ -99,7 +86,6 @@ type SliceBuilderForVariationProps = {
   updateSlice: () => void;
   slice: ComponentUI;
   variation: VariationSM;
-  remoteSlice: SliceSM | undefined;
   isTouched: boolean;
   data: SliceBuilderState;
 };
@@ -107,7 +93,6 @@ const SliceBuilderForVariation: React.FC<SliceBuilderForVariationProps> = ({
   updateSlice,
   slice,
   variation,
-  remoteSlice,
   isTouched,
   data,
 }) => {
@@ -115,16 +100,9 @@ const SliceBuilderForVariation: React.FC<SliceBuilderForVariationProps> = ({
     (state: SliceMachineStoreType) => ({
       isSimulatorAvailableForFramework:
         selectIsSimulatorAvailableForFramework(state),
-    }),
+    })
   );
 
-  const sliceModel: LocalAndRemoteSlice | LocalOnlySlice = {
-    local: slice.model,
-    localScreenshots: slice.screenshots,
-    ...(remoteSlice ? { remote: remoteSlice } : {}),
-  };
-  const { modelsStatuses } = useModelStatus({ slices: [sliceModel] });
-
   return (
     <AppLayout>
       <AppLayoutHeader>
@@ -147,12 +125,7 @@ const SliceBuilderForVariation: React.FC<SliceBuilderForVariationProps> = ({
       </AppLayoutHeader>
       <AppLayoutContent>
         <BaseStyles>
-          <Header
-            component={slice}
-            status={modelsStatuses.slices[slice.model.id]}
-            variation={variation}
-            imageLoading={data.imageLoading}
-          />
+          <Header component={slice} variation={variation} />
           <Grid columns="1fr 320px" gap="16px" sx={{ pt: 4 }}>
             <Box>
               <FieldZones variation={variation} />
diff --git a/packages/slice-machine/lib/builders/common/Zone/Card/index.jsx b/packages/slice-machine/lib/builders/common/Zone/Card/index.jsx
index 4a47905377..5a7dc1ed59 100644
--- a/packages/slice-machine/lib/builders/common/Zone/Card/index.jsx
+++ b/packages/slice-machine/lib/builders/common/Zone/Card/index.jsx
@@ -23,7 +23,6 @@ const FieldZone = ({
   isRepeatable,
   dataCy,
   isRepeatableCustomType,
-  sx,
 }) => {
   return (
     <DragDropContext
@@ -41,8 +40,7 @@ const FieldZone = ({
             {...provided.droppableProps}
             // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
             data-cy={dataCy}
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-            sx={sx}
+            sx={{ paddingInline: "16px !important" }}
           >
             {
               // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call
diff --git a/packages/slice-machine/lib/builders/common/Zone/components/ZoneHeader/index.tsx b/packages/slice-machine/lib/builders/common/Zone/components/ZoneHeader/index.tsx
deleted file mode 100644
index 408d642c63..0000000000
--- a/packages/slice-machine/lib/builders/common/Zone/components/ZoneHeader/index.tsx
+++ /dev/null
@@ -1,30 +0,0 @@
-import { Flex } from "theme-ui";
-
-interface ZoneHeaderProps {
-  Heading: JSX.Element;
-  Actions: JSX.Element;
-}
-
-const ZoneHeader: React.FunctionComponent<ZoneHeaderProps> = ({
-  Heading,
-  Actions,
-}) => (
-  <Flex
-    bg="grey02"
-    sx={{
-      pl: 3,
-      pr: 2,
-      py: 2,
-      mb: 2,
-      borderRadius: "6px",
-      alignItems: "center",
-      minHeight: "51px",
-      justifyContent: "space-between",
-    }}
-  >
-    <Flex sx={{ alignItems: "center" }}>{Heading}</Flex>
-    <Flex sx={{ alignItems: "center" }}>{Actions}</Flex>
-  </Flex>
-);
-
-export default ZoneHeader;
diff --git a/packages/slice-machine/lib/builders/common/Zone/index.jsx b/packages/slice-machine/lib/builders/common/Zone/index.jsx
index 441c8706f7..92251aac91 100644
--- a/packages/slice-machine/lib/builders/common/Zone/index.jsx
+++ b/packages/slice-machine/lib/builders/common/Zone/index.jsx
@@ -1,7 +1,7 @@
-import { Button, ButtonGroup, Switch, Text } from "@prismicio/editor-ui";
+import { Button, Switch, Text } from "@prismicio/editor-ui";
 import { array, arrayOf, bool, func, object, shape, string } from "prop-types";
 import { useState } from "react";
-import { BaseStyles, Heading } from "theme-ui";
+import { BaseStyles } from "theme-ui";
 
 import { ListHeader } from "@src/components/List";
 
@@ -9,7 +9,6 @@ import SelectFieldTypeModal from "../SelectFieldTypeModal";
 import NewField from "./Card/components/NewField";
 import Card from "./Card";
 import EmptyState from "./components/EmptyState";
-import ZoneHeader from "./components/ZoneHeader";
 
 const Zone = ({
   zoneType /* type of the zone: customType or slice */,
@@ -30,8 +29,6 @@ const Zone = ({
   dataCy,
   isRepeatableCustomType,
 }) => {
-  const isCustomType = zoneType === "customType";
-
   // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
   const widgetsArrayWithCondUid = (() => {
     // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-argument
@@ -74,68 +71,36 @@ const Zone = ({
 
   return (
     <>
-      {isCustomType ? (
-        <ListHeader
-          actions={
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-            fields.length > 0 ? (
-              <>
-                <Text color="grey11" component="span">
-                  Show code snippets?
-                </Text>
-                <Switch
-                  checked={showHints}
-                  onCheckedChange={setShowHints}
-                  size="small"
-                />
-                <Button
-                  data-cy={`add-${
-                    // eslint-disable-next-line @typescript-eslint/strict-boolean-expressions
-                    isRepeatable ? "Repeatable" : "Static"
-                  }-field`}
-                  onClick={enterSelectMode}
-                  startIcon="add"
-                  variant="secondary"
-                >
-                  Add a new field
-                </Button>
-              </>
-            ) : undefined
-          }
-        >
-          {title}
-        </ListHeader>
-      ) : (
-        <BaseStyles>
-          <ZoneHeader
-            Heading={<Heading as="h6">{title}</Heading>}
-            Actions={
-              // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-              fields.length > 0 ? (
-                <ButtonGroup size="medium" variant="secondary">
-                  <Button
-                    variant="secondary"
-                    onClick={() => setShowHints(!showHints)}
-                  >
-                    {showHints ? "Hide" : "Show"} code snippets
-                  </Button>
-                  <Button
-                    variant="secondary"
-                    onClick={() => enterSelectMode()}
-                    data-cy={`add-${
-                      // eslint-disable-next-line @typescript-eslint/strict-boolean-expressions
-                      isRepeatable ? "Repeatable" : "Static"
-                    }-field`}
-                    startIcon="add"
-                  >
-                    Add a new field
-                  </Button>
-                </ButtonGroup>
-              ) : null
-            }
-          />
-        </BaseStyles>
-      )}
+      <ListHeader
+        actions={
+          // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+          fields.length > 0 ? (
+            <>
+              <Text color="grey11" component="span">
+                Show code snippets?
+              </Text>
+              <Switch
+                checked={showHints}
+                onCheckedChange={setShowHints}
+                size="small"
+              />
+              <Button
+                data-cy={`add-${
+                  // eslint-disable-next-line @typescript-eslint/strict-boolean-expressions
+                  isRepeatable ? "Repeatable" : "Static"
+                }-field`}
+                onClick={enterSelectMode}
+                startIcon="add"
+                variant="secondary"
+              >
+                Add a new field
+              </Button>
+            </>
+          ) : undefined
+        }
+      >
+        {title}
+      </ListHeader>
       {
         // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/strict-boolean-expressions
         fields.length === 0 && !newFieldData ? (
@@ -191,7 +156,6 @@ const Zone = ({
                   />
                 )
               }
-              sx={isCustomType ? { paddingInline: "16px !important" } : {}}
             />
           </BaseStyles>
         ) : undefined