diff --git a/src/client/components/graphics/Icon/index.js b/src/client/components/graphics/Icon/index.js
index a04d571b0f..b73c19db4b 100644
--- a/src/client/components/graphics/Icon/index.js
+++ b/src/client/components/graphics/Icon/index.js
@@ -1,29 +1,29 @@
 import React from 'react';
-import customComponents from '../../customComponents';
+import RenderCustomComponent from '../../utilities/RenderCustomComponent';
 
-const PayloadIcon = () => {
-  return (
-    <svg
-      width="25"
-      height="25"
-      viewBox="0 0 25 25"
-      xmlns="http://www.w3.org/2000/svg"
-    >
-      <path
-        d="M11.5293 0L23 6.90096V19.9978L14.3608 25V11.9032L2.88452 5.00777L11.5293 0Z"
-        fill="#333333"
-      />
-      <path
-        d="M10.6559 24.2727V14.0518L2 19.0651L10.6559 24.2727Z"
-        fill="#333333"
-      />
-    </svg>
-  );
-};
+const PayloadIcon = () => (
+  <svg
+    width="25"
+    height="25"
+    viewBox="0 0 25 25"
+    xmlns="http://www.w3.org/2000/svg"
+  >
+    <path
+      d="M11.5293 0L23 6.90096V19.9978L14.3608 25V11.9032L2.88452 5.00777L11.5293 0Z"
+      fill="#333333"
+    />
+    <path
+      d="M10.6559 24.2727V14.0518L2 19.0651L10.6559 24.2727Z"
+      fill="#333333"
+    />
+  </svg>
+);
 
-const Icon = () => {
-  const IconToRender = customComponents?.graphics?.Icon || PayloadIcon;
-  return <IconToRender />;
-};
+const Icon = () => (
+  <RenderCustomComponent
+    path="graphics.Icon"
+    DefaultComponent={PayloadIcon}
+  />
+);
 
 export default Icon;
diff --git a/src/client/components/views/collections/Edit/index.scss b/src/client/components/views/collections/Edit/index.scss
index 81e44d531e..b278598196 100644
--- a/src/client/components/views/collections/Edit/index.scss
+++ b/src/client/components/views/collections/Edit/index.scss
@@ -45,6 +45,10 @@
     min-width: 0;
   }
 
+  &__sidebar-sticky {
+    min-height: 100%;
+  }
+
   &__collection-actions,
   &__document-actions,
   &__meta,