diff --git a/web/src/layout/common/CodeEditor.module.css b/web/src/layout/common/CodeEditor.module.css
index 9332a02f..43eea1d7 100644
--- a/web/src/layout/common/CodeEditor.module.css
+++ b/web/src/layout/common/CodeEditor.module.css
@@ -7,13 +7,10 @@
   opacity: 0.75;
 }
 
-.disabled > div::before {
-  content: '';
-  position: absolute;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  background-color: var(--color-black-15);
-  z-index: 1;
+:global(.cm-s-material-darker.CodeMirror) {
+  background-color: var(--extra-light-gray);
+}
+
+.disabled :global(.cm-s-material-darker.CodeMirror) {
+  background-color: var(--light-gray);
 }
diff --git a/web/src/layout/common/CodeEditor.tsx b/web/src/layout/common/CodeEditor.tsx
index c4d7dffd..6a996db6 100644
--- a/web/src/layout/common/CodeEditor.tsx
+++ b/web/src/layout/common/CodeEditor.tsx
@@ -28,7 +28,7 @@ const CodeEditor: React.ElementType = (props: Props) => {
 
   return (
     <CodeMirror
-      className={classnames('border position-relative', styles.code, { [styles.disabled]: isDisabled })}
+      className={classnames('border position-relative h-100', styles.code, { [styles.disabled]: isDisabled })}
       value={props.value}
       options={{
         mode: {
diff --git a/web/src/layout/common/RepositoryIconLabel.module.css b/web/src/layout/common/RepositoryIconLabel.module.css
index 9fcb7388..3174096e 100644
--- a/web/src/layout/common/RepositoryIconLabel.module.css
+++ b/web/src/layout/common/RepositoryIconLabel.module.css
@@ -12,5 +12,4 @@
 .icon {
   height: 12px;
   width: 12px;
-  top: -1px;
 }
diff --git a/web/src/layout/common/RepositoryIconLabel.tsx b/web/src/layout/common/RepositoryIconLabel.tsx
index bce8a0f4..1cabdd17 100644
--- a/web/src/layout/common/RepositoryIconLabel.tsx
+++ b/web/src/layout/common/RepositoryIconLabel.tsx
@@ -35,7 +35,7 @@ const RepositoryIconLabel = (props: Props) => {
       )}
     >
       <div className="d-flex flex-row align-items-center">
-        <div className={`position-relative ${styles.icon} ${props.iconClassName}`} aria-hidden="true">
+        <div className={`${styles.icon} ${props.iconClassName}`} aria-hidden="true">
           {repo.icon}
         </div>
         <div className="ml-1">{props.isPlural ? repo.plural : repo.singular}</div>
diff --git a/web/src/layout/common/__snapshots__/PackageCard.test.tsx.snap b/web/src/layout/common/__snapshots__/PackageCard.test.tsx.snap
index 6e67cca1..03923085 100644
--- a/web/src/layout/common/__snapshots__/PackageCard.test.tsx.snap
+++ b/web/src/layout/common/__snapshots__/PackageCard.test.tsx.snap
@@ -481,7 +481,7 @@ exports[`PackageCard creates snapshot 1`] = `
                       >
                         <div
                           aria-hidden="true"
-                          class="position-relative icon undefined"
+                          class="icon undefined"
                         >
                           <img
                             alt="Icon"
@@ -554,7 +554,7 @@ exports[`PackageCard creates snapshot 1`] = `
                     >
                       <div
                         aria-hidden="true"
-                        class="position-relative icon undefined"
+                        class="icon undefined"
                       >
                         <img
                           alt="Icon"
diff --git a/web/src/layout/common/__snapshots__/PackageInfo.test.tsx.snap b/web/src/layout/common/__snapshots__/PackageInfo.test.tsx.snap
index 1b07d4b7..0c535148 100644
--- a/web/src/layout/common/__snapshots__/PackageInfo.test.tsx.snap
+++ b/web/src/layout/common/__snapshots__/PackageInfo.test.tsx.snap
@@ -467,7 +467,7 @@ exports[`PackageInfo creates snapshot 1`] = `
               >
                 <div
                   aria-hidden="true"
-                  class="position-relative icon undefined"
+                  class="icon undefined"
                 >
                   <img
                     alt="Icon"
@@ -540,7 +540,7 @@ exports[`PackageInfo creates snapshot 1`] = `
             >
               <div
                 aria-hidden="true"
-                class="position-relative icon undefined"
+                class="icon undefined"
               >
                 <img
                   alt="Icon"
diff --git a/web/src/layout/common/__snapshots__/RepositoryIconLabel.test.tsx.snap b/web/src/layout/common/__snapshots__/RepositoryIconLabel.test.tsx.snap
index 2b39a6d6..b011f888 100644
--- a/web/src/layout/common/__snapshots__/RepositoryIconLabel.test.tsx.snap
+++ b/web/src/layout/common/__snapshots__/RepositoryIconLabel.test.tsx.snap
@@ -10,7 +10,7 @@ exports[`RepositoryIconLabel creates snapshot 1`] = `
     >
       <div
         aria-hidden="true"
-        class="position-relative icon undefined"
+        class="icon undefined"
       >
         <img
           alt="Icon"
diff --git a/web/src/layout/controlPanel/repositories/__snapshots__/Card.test.tsx.snap b/web/src/layout/controlPanel/repositories/__snapshots__/Card.test.tsx.snap
index 29331d31..0398d5a8 100644
--- a/web/src/layout/controlPanel/repositories/__snapshots__/Card.test.tsx.snap
+++ b/web/src/layout/controlPanel/repositories/__snapshots__/Card.test.tsx.snap
@@ -31,7 +31,7 @@ exports[`Repository Card - packages section creates snapshot 1`] = `
               >
                 <div
                   aria-hidden="true"
-                  class="position-relative icon undefined"
+                  class="icon undefined"
                 >
                   <img
                     alt="Icon"
diff --git a/web/src/layout/home/__snapshots__/PackageCard.test.tsx.snap b/web/src/layout/home/__snapshots__/PackageCard.test.tsx.snap
index 03d48620..136bd7e4 100644
--- a/web/src/layout/home/__snapshots__/PackageCard.test.tsx.snap
+++ b/web/src/layout/home/__snapshots__/PackageCard.test.tsx.snap
@@ -481,7 +481,7 @@ exports[`PackageCard renders correctly 1`] = `
                       >
                         <div
                           aria-hidden="true"
-                          class="position-relative icon undefined"
+                          class="icon undefined"
                         >
                           <img
                             alt="Icon"
@@ -554,7 +554,7 @@ exports[`PackageCard renders correctly 1`] = `
                     >
                       <div
                         aria-hidden="true"
-                        class="position-relative icon undefined"
+                        class="icon undefined"
                       >
                         <img
                           alt="Icon"
diff --git a/web/src/layout/package/RecommendedPackages/__snapshots__/Card.test.tsx.snap b/web/src/layout/package/RecommendedPackages/__snapshots__/Card.test.tsx.snap
index 05f7dfd3..f3530735 100644
--- a/web/src/layout/package/RecommendedPackages/__snapshots__/Card.test.tsx.snap
+++ b/web/src/layout/package/RecommendedPackages/__snapshots__/Card.test.tsx.snap
@@ -21,7 +21,7 @@ exports[`RecommendedPackageCard creates snapshot 1`] = `
           >
             <div
               aria-hidden="true"
-              class="position-relative icon undefined"
+              class="icon undefined"
             >
               <img
                 alt="Icon"
diff --git a/web/src/layout/package/RecommendedPackages/__snapshots__/index.test.tsx.snap b/web/src/layout/package/RecommendedPackages/__snapshots__/index.test.tsx.snap
index f93e0ae1..d889c1d2 100644
--- a/web/src/layout/package/RecommendedPackages/__snapshots__/index.test.tsx.snap
+++ b/web/src/layout/package/RecommendedPackages/__snapshots__/index.test.tsx.snap
@@ -39,7 +39,7 @@ exports[`RecommendedPackages creates snapshot 1`] = `
                 >
                   <div
                     aria-hidden="true"
-                    class="position-relative icon undefined"
+                    class="icon undefined"
                   >
                     <img
                       alt="Icon"
@@ -99,7 +99,7 @@ exports[`RecommendedPackages creates snapshot 1`] = `
                 >
                   <div
                     aria-hidden="true"
-                    class="position-relative icon undefined"
+                    class="icon undefined"
                   >
                     <img
                       alt="Icon"
diff --git a/web/src/layout/package/__snapshots__/RelatedPackageCard.test.tsx.snap b/web/src/layout/package/__snapshots__/RelatedPackageCard.test.tsx.snap
index 0e0843d4..fd9e09bd 100644
--- a/web/src/layout/package/__snapshots__/RelatedPackageCard.test.tsx.snap
+++ b/web/src/layout/package/__snapshots__/RelatedPackageCard.test.tsx.snap
@@ -51,7 +51,7 @@ exports[`RelatedPackageCard creates snapshot 1`] = `
                       >
                         <div
                           aria-hidden="true"
-                          class="position-relative icon badgeIcon"
+                          class="icon badgeIcon"
                         >
                           <img
                             alt="Icon"
diff --git a/web/src/layout/package/__snapshots__/RelatedPackages.test.tsx.snap b/web/src/layout/package/__snapshots__/RelatedPackages.test.tsx.snap
index cdb6d875..849001cf 100644
--- a/web/src/layout/package/__snapshots__/RelatedPackages.test.tsx.snap
+++ b/web/src/layout/package/__snapshots__/RelatedPackages.test.tsx.snap
@@ -79,7 +79,7 @@ exports[`RelatedPackages renders correctly 1`] = `
                             >
                               <div
                                 aria-hidden="true"
-                                class="position-relative icon badgeIcon"
+                                class="icon badgeIcon"
                               >
                                 <img
                                   alt="Icon"
@@ -184,7 +184,7 @@ exports[`RelatedPackages renders correctly 1`] = `
                             >
                               <div
                                 aria-hidden="true"
-                                class="position-relative icon badgeIcon"
+                                class="icon badgeIcon"
                               >
                                 <img
                                   alt="Icon"
@@ -290,7 +290,7 @@ exports[`RelatedPackages renders correctly 1`] = `
                             >
                               <div
                                 aria-hidden="true"
-                                class="position-relative icon badgeIcon"
+                                class="icon badgeIcon"
                               >
                                 <img
                                   alt="Icon"
@@ -396,7 +396,7 @@ exports[`RelatedPackages renders correctly 1`] = `
                             >
                               <div
                                 aria-hidden="true"
-                                class="position-relative icon badgeIcon"
+                                class="icon badgeIcon"
                               >
                                 <img
                                   alt="Icon"
@@ -502,7 +502,7 @@ exports[`RelatedPackages renders correctly 1`] = `
                             >
                               <div
                                 aria-hidden="true"
-                                class="position-relative icon badgeIcon"
+                                class="icon badgeIcon"
                               >
                                 <img
                                   alt="Icon"
@@ -608,7 +608,7 @@ exports[`RelatedPackages renders correctly 1`] = `
                             >
                               <div
                                 aria-hidden="true"
-                                class="position-relative icon badgeIcon"
+                                class="icon badgeIcon"
                               >
                                 <img
                                   alt="Icon"
@@ -713,7 +713,7 @@ exports[`RelatedPackages renders correctly 1`] = `
                             >
                               <div
                                 aria-hidden="true"
-                                class="position-relative icon badgeIcon"
+                                class="icon badgeIcon"
                               >
                                 <img
                                   alt="Icon"