diff --git a/src/app/(sidebar)/network-limits/page.tsx b/src/app/(sidebar)/network-limits/page.tsx
index ecc185c14..5d630219b 100644
--- a/src/app/(sidebar)/network-limits/page.tsx
+++ b/src/app/(sidebar)/network-limits/page.tsx
@@ -12,7 +12,6 @@ import { SdsLink } from "@/components/SdsLink";
 import { LabelHeading } from "@/components/LabelHeading";
 import { SwitchNetworkButtons } from "@/components/SwitchNetworkButtons";
 import { Tabs } from "@/components/Tabs";
-import { CopyJsonPayloadButton } from "@/components/CopyJsonPayloadButton";
 import { CodeEditor } from "@/components/CodeEditor";
 
 import {
@@ -48,18 +47,7 @@ export default function NetworkLimits() {
 
   return (
     <div className="NetworkLimits">
-      <PageCard
-        heading="Network limits"
-        rightElement={
-          network.id !== "custom" ? (
-            <Tabs
-              tabs={VIEW_TABS}
-              activeTabId={activeTab}
-              onChange={setActiveTab}
-            />
-          ) : undefined
-        }
-      >
+      <PageCard heading="Network limits">
         {network.id === "custom" ? (
           <Alert
             placement="inline"
@@ -94,6 +82,13 @@ export default function NetworkLimits() {
                 </SdsLink>
               </Text>
             </Box>
+
+            <Tabs
+              tabs={VIEW_TABS}
+              activeTabId={activeTab}
+              onChange={setActiveTab}
+            />
+
             {activeTab === "table" ? (
               <>
                 <Box gap="sm">
@@ -110,27 +105,15 @@ export default function NetworkLimits() {
                 <ResourceFeesSection limits={limits} />
               </>
             ) : (
-              <Box gap="sm">
-                {limitsJsonString && (
-                  <>
-                    <div className="NetworkLimits__json-container">
-                      <CodeEditor
-                        heightInRem="30"
-                        value={limitsJsonString}
-                        selectedLanguage="json"
-                      />
-                    </div>
-                    <Box
-                      gap="md"
-                      direction="row"
-                      justify="right"
-                      align="center"
-                    >
-                      <CopyJsonPayloadButton jsonString={limitsJsonString} />
-                    </Box>
-                  </>
-                )}
-              </Box>
+              <div className="NetworkLimits__json-container">
+                <CodeEditor
+                  title="JSON response"
+                  heightInRem="30"
+                  value={limitsJsonString}
+                  selectedLanguage="json"
+                  fileName="network-limits"
+                />
+              </div>
             )}
           </>
         )}
diff --git a/src/components/CodeEditor/index.tsx b/src/components/CodeEditor/index.tsx
index a582b596a..35e35405b 100644
--- a/src/components/CodeEditor/index.tsx
+++ b/src/components/CodeEditor/index.tsx
@@ -136,86 +136,85 @@ export const CodeEditor = ({
     >
       {title ? (
         <div className="CodeEditor__header" ref={headerEl}>
-          {/* Title */}
           <div className="CodeEditor__header__title">{renderTitle()}</div>
+        </div>
+      ) : null}
+
+      {/* Content / editor */}
+      <div
+        className="CodeEditor__content"
+        // Container must have set height
+        style={{ height: title ? `calc(100% - ${headerHeight}px)` : "100%" }}
+      >
+        {/* Actions floating over the editor */}
+        <Box
+          gap="xs"
+          direction="row"
+          align="center"
+          justify="end"
+          addlClassName="CodeEditor__actions"
+        >
+          {customEl ?? null}
+          {languages && onLanguageChange ? (
+            <Select
+              id="code-editor-languages"
+              fieldSize="sm"
+              onChange={(e) =>
+                onLanguageChange(e.target.value as SupportedLanguage)
+              }
+              value={selectedLanguage}
+            >
+              {languages.map((l) => (
+                <option value={l} key={`ce-lang-${l}`}>
+                  {l.toUpperCase()}
+                </option>
+              ))}
+            </Select>
+          ) : null}
+
+          {fileName ? (
+            <Button
+              variant="tertiary"
+              size="sm"
+              icon={<Icon.Download01 />}
+              title="Download"
+              onClick={(e) => {
+                e.preventDefault();
 
-          {/* Actions */}
-          <Box
-            gap="xs"
-            direction="row"
-            align="center"
-            justify="end"
-            addlClassName="CodeEditor__actions"
-          >
-            {customEl ?? null}
-            {languages && onLanguageChange ? (
-              <Select
-                id="code-editor-languages"
-                fieldSize="sm"
-                onChange={(e) =>
-                  onLanguageChange(e.target.value as SupportedLanguage)
-                }
-                value={selectedLanguage}
-              >
-                {languages.map((l) => (
-                  <option value={l} key={`ce-lang-${l}`}>
-                    {l.toUpperCase()}
-                  </option>
-                ))}
-              </Select>
-            ) : null}
-
-            {fileName ? (
-              <Button
-                variant="tertiary"
-                size="sm"
-                icon={<Icon.Download01 />}
-                title="Download"
-                onClick={(e) => {
-                  e.preventDefault();
-
-                  downloadFile({
-                    value,
-                    fileType: "application/json",
-                    fileName,
-                    fileExtension: getFileExtension(),
-                  });
-                }}
-              ></Button>
-            ) : null}
-
-            <CopyText textToCopy={value}>
-              <Button
-                variant="tertiary"
-                size="sm"
-                icon={<Icon.Copy01 />}
-                title="Copy"
-                onClick={(e) => {
-                  e.preventDefault();
-                }}
-              ></Button>
-            </CopyText>
+                downloadFile({
+                  value,
+                  fileType: "application/json",
+                  fileName,
+                  fileExtension: getFileExtension(),
+                });
+              }}
+            ></Button>
+          ) : null}
 
+          <CopyText textToCopy={value}>
             <Button
               variant="tertiary"
               size="sm"
-              icon={isExpanded ? <Icon.X /> : <Icon.Expand06 />}
-              title={isExpanded ? "Close" : "Expand"}
+              icon={<Icon.Copy01 />}
+              title="Copy"
               onClick={(e) => {
                 e.preventDefault();
-                setIsExpanded(!isExpanded);
               }}
             ></Button>
-          </Box>
-        </div>
-      ) : null}
+          </CopyText>
+
+          <Button
+            variant="tertiary"
+            size="sm"
+            icon={isExpanded ? <Icon.X /> : <Icon.Expand06 />}
+            title={isExpanded ? "Close" : "Expand"}
+            onClick={(e) => {
+              e.preventDefault();
+              setIsExpanded(!isExpanded);
+            }}
+          ></Button>
+        </Box>
 
-      {/* Content / editor */}
-      <div
-        className="CodeEditor__content"
-        // Container must have set height
-        style={{ height: title ? `calc(100% - ${headerHeight}px)` : "100%" }}
-      >
         <MonacoEditor
           defaultLanguage="javascript"
           defaultValue=""
diff --git a/src/components/CodeEditor/styles.scss b/src/components/CodeEditor/styles.scss
index 0ee9b23c5..1cac6a471 100644
--- a/src/components/CodeEditor/styles.scss
+++ b/src/components/CodeEditor/styles.scss
@@ -63,9 +63,15 @@
   &__content {
     width: 100%;
     background-color: var(--sds-clr-gray-02);
+    position: relative;
   }
 
   &__actions {
+    position: absolute;
+    top: pxToRem(8px);
+    right: pxToRem(16px);
+    z-index: 1;
+
     & > .Select {
       width: pxToRem(120px);
     }
diff --git a/src/constants/networkLimits.ts b/src/constants/networkLimits.ts
index 984f09bfd..ddcd00a5c 100644
--- a/src/constants/networkLimits.ts
+++ b/src/constants/networkLimits.ts
@@ -83,36 +83,36 @@ export const MAINNET_LIMITS: NetworkLimits = {
   "persistent_rent_rate_denominator": "1215",
   "temp_rent_rate_denominator": "2430",
   "live_soroban_state_size_window": [
-    "982537629",
-    "982949877",
-    "982796433",
-    "982913125",
-    "983191261",
-    "983342949",
-    "983802709",
-    "983807465",
-    "983848745",
-    "984038857",
-    "984177737",
-    "984573853",
-    "984752001",
-    "984815357",
-    "984984213",
-    "985051177",
-    "985428873",
-    "985587493",
-    "985740829",
-    "986009041",
-    "986139489",
-    "986444525",
-    "986732345",
-    "986897109",
-    "987129605",
-    "987249885",
-    "987374517",
-    "987787917",
-    "988236889",
-    "988792857"
+    "853370379",
+    "854373107",
+    "855134567",
+    "855241879",
+    "855738175",
+    "855963831",
+    "857061863",
+    "857988323",
+    "858394695",
+    "858972283",
+    "859329935",
+    "860093843",
+    "860946023",
+    "861117427",
+    "861482179",
+    "861798307",
+    "862696991",
+    "863647335",
+    "864136747",
+    "864698615",
+    "865138159",
+    "865952947",
+    "867058303",
+    "867821087",
+    "868364459",
+    "868734591",
+    "869476303",
+    "870443887",
+    "871340371",
+    "872459947"
   ],
   "state_target_size_bytes": "3000000000",
   "rent_fee_1kb_state_size_low": "-17000",
@@ -151,36 +151,36 @@ export const TESTNET_LIMITS: NetworkLimits = {
   "persistent_rent_rate_denominator": "1215",
   "temp_rent_rate_denominator": "2430",
   "live_soroban_state_size_window": [
-    "798589250",
-    "798593018",
-    "798630026",
-    "798657074",
-    "798687574",
-    "798676902",
-    "798685390",
-    "798723114",
-    "798246179",
-    "796127338",
-    "796142374",
-    "796172106",
-    "796183850",
-    "796274371",
-    "796457671",
-    "796462247",
-    "796472419",
-    "796489175",
-    "796672679",
-    "796677091",
-    "796663195",
-    "796660155",
-    "796641891",
-    "796028240",
-    "794306233",
-    "794316125",
-    "794541200",
-    "794558008",
-    "794575848",
-    "794654840"
+    "847139333",
+    "847273481",
+    "847046109",
+    "847081249",
+    "847101749",
+    "847109945",
+    "847111325",
+    "847945132",
+    "847923494",
+    "847910066",
+    "848052948",
+    "848046756",
+    "848050024",
+    "848066836",
+    "848094724",
+    "848098856",
+    "848108156",
+    "848111940",
+    "848110876",
+    "848114900",
+    "848123372",
+    "848149900",
+    "851659787",
+    "851667547",
+    "851674891",
+    "851608707",
+    "851612027",
+    "851549795",
+    "851347177",
+    "851364381"
   ],
   "state_target_size_bytes": "3000000000",
   "rent_fee_1kb_state_size_low": "-17000",
@@ -219,36 +219,36 @@ export const FUTURENET_LIMITS: NetworkLimits = {
   "persistent_rent_rate_denominator": "1215",
   "temp_rent_rate_denominator": "2430",
   "live_soroban_state_size_window": [
-    "60624147",
-    "60624147",
-    "60624147",
-    "60624147",
-    "60624147",
-    "60624147",
-    "60624147",
-    "60624147",
-    "60624147",
-    "60624147",
-    "60624147",
-    "60624147",
-    "60624147",
-    "60624147",
-    "60624147",
-    "60624147",
-    "60624147",
-    "60624147",
-    "60624147",
-    "60624147",
-    "60624147",
-    "60624147",
-    "60624147",
-    "60624147",
-    "60624147",
-    "60624147",
-    "60624147",
-    "60624147",
-    "60624147",
-    "60624147"
+    "65487329",
+    "65487329",
+    "65232099",
+    "65232099",
+    "65232099",
+    "65232099",
+    "65232099",
+    "65232099",
+    "65232099",
+    "65232099",
+    "65232099",
+    "65232099",
+    "65232099",
+    "65232099",
+    "65232099",
+    "65232099",
+    "65232099",
+    "65232099",
+    "65232099",
+    "65232099",
+    "65232099",
+    "65231755",
+    "65231755",
+    "65231411",
+    "65230091",
+    "65230091",
+    "65230091",
+    "65229059",
+    "65228715",
+    "65228715"
   ],
   "state_target_size_bytes": "3000000000",
   "rent_fee_1kb_state_size_low": "-17000",
diff --git a/tests/e2e/networkLimitsPage.test.ts b/tests/e2e/networkLimitsPage.test.ts
index c5d12e582..28bc57f6a 100644
--- a/tests/e2e/networkLimitsPage.test.ts
+++ b/tests/e2e/networkLimitsPage.test.ts
@@ -260,9 +260,6 @@ test.describe("Network Limits page on Mainnet", () => {
     await expect(editorContent).toBeVisible();
     await expect(editorContent).toContainText("updated_entry");
     await expect(editorContent).toContainText("contract_max_size_bytes");
-
-    // Copy JSON button should be visible
-    await expect(page.locator("button:has-text('Copy JSON')")).toBeVisible();
   });
 
   test("Switches back to Table tab from JSON tab", async ({ page }) => {