diff --git a/dist/css/base/gin.css b/dist/css/base/gin.css
index 9e9d23cfdd8ec61d022c9edb22f86f8d882ebc36..eae04e8298298341c05df2fb3e3ab057b7070720 100644
--- a/dist/css/base/gin.css
+++ b/dist/css/base/gin.css
@@ -520,7 +520,8 @@ body:not(.toolbar-tray-open) .layout-container {
   margin-top: 0;
 }
 
-#system-clear-cache + #system-performance-settings {
+#system-clear-cache + #system-performance-settings,
+.gin-layer-wrapper + .imageapi-optimize-default-pipeline {
   margin-top: var(--gin-spacing-l);
 }
 
@@ -1780,7 +1781,7 @@ table td.field-plugin-summary-cell {
 
 .password-confirm {
   width: 100%;
-  max-width: 520px;
+  max-width: var(--gin-max-line-length);
 }
 
 .password-strength__title {
@@ -2139,7 +2140,7 @@ fieldset:not(.fieldgroup).error {
 
 .form-item__description,
 .fieldset__description {
-  max-width: 520px;
+  max-width: var(--gin-max-line-length);
   color: var(--gin-color-text-light);
 }
 
diff --git a/dist/css/components/tabs.css b/dist/css/components/tabs.css
index a8279091153b8528beb1db4c2a93cee9a375fedd..97ad7bbd272a8450b86e64b6277bcb6119e00276 100644
--- a/dist/css/components/tabs.css
+++ b/dist/css/components/tabs.css
@@ -416,6 +416,10 @@
   margin-top: var(--gin-spacing-m);
 }
 
+.claro-details__description {
+  max-width: var(--gin-max-line-length);
+}
+
 .claro-details__summary::before,
 .claro-details[open] > .claro-details__summary::before {
   background: var(--gin-color-text);
diff --git a/dist/css/theme/dialog.css b/dist/css/theme/dialog.css
index dbf1c1107b8cd57a1fdb089310797c848465b74f..19d0f0891972ea7b8e8b03d464907f73cdf988e7 100644
--- a/dist/css/theme/dialog.css
+++ b/dist/css/theme/dialog.css
@@ -350,7 +350,7 @@
 
 .ui-dialog .password-confirm {
   width: 100%;
-  max-width: 520px;
+  max-width: var(--gin-max-line-length);
 }
 
 .ui-dialog .password-strength__title {
@@ -709,7 +709,7 @@
 
 .ui-dialog .form-item__description,
 .ui-dialog .fieldset__description {
-  max-width: 520px;
+  max-width: var(--gin-max-line-length);
   color: var(--gin-color-text-light);
 }
 
diff --git a/dist/css/theme/variables.css b/dist/css/theme/variables.css
index 192fd6c056aff403abd286b9ab63309a43cf218d..fc79be5611496dc1d7881168cdff65e6a049e210 100644
--- a/dist/css/theme/variables.css
+++ b/dist/css/theme/variables.css
@@ -97,6 +97,7 @@
   --gin-offset-x: var(--gin-toolbar-x-offset);
   --gin-offset-y: calc(var(--gin-toolbar-y-offset) + var(--gin-sticky-offset));
   --gin-link-decoration-style: dotted;
+  --gin-max-line-length: 80ch;
 }
 
 @media (min-width: 61em) {
diff --git a/styles/base/_form.scss b/styles/base/_form.scss
index 8b350bcefcfb20ea565ffb269b9f88aa5f8ef9c7..db332bcc3a67602b1ce883e2b5d6e6354f458cf0 100644
--- a/styles/base/_form.scss
+++ b/styles/base/_form.scss
@@ -1,5 +1,3 @@
-$maxWidth: 520px;
-
 .form-element {
   color: var(--gin-color-text);
   background-color: var(--gin-bg-input);
@@ -60,7 +58,7 @@ $maxWidth: 520px;
 
 .password-confirm {
   width: 100%;
-  max-width: $maxWidth;
+  max-width: var(--gin-max-line-length);
 }
 
 .password-strength {
@@ -406,7 +404,7 @@ fieldset:not(.fieldgroup) {
 
 .form-item__description,
 .fieldset__description {
-  max-width: $maxWidth;
+  max-width: var(--gin-max-line-length);
   color: var(--gin-color-text-light);
 }
 
diff --git a/styles/base/_layers.scss b/styles/base/_layers.scss
index d4ad15b6f846ea114e5f9981c9277fc37c77ab32..cc2b90d8831de0784ef0a63dd0db6e1c8d2aad55 100644
--- a/styles/base/_layers.scss
+++ b/styles/base/_layers.scss
@@ -60,7 +60,8 @@
   }
 }
 
-#system-clear-cache + #system-performance-settings {
+#system-clear-cache + #system-performance-settings,
+.gin-layer-wrapper + .imageapi-optimize-default-pipeline {
   margin-top: var(--gin-spacing-l);
 }
 
diff --git a/styles/components/tabs.scss b/styles/components/tabs.scss
index e43af0028454176c393c03629d95f05f9a37cf9e..d058d623ad775fe0ce55b45ab0e05db57372d00f 100644
--- a/styles/components/tabs.scss
+++ b/styles/components/tabs.scss
@@ -343,6 +343,10 @@
   }
 }
 
+.claro-details__description {
+  max-width: var(--gin-max-line-length);
+}
+
 // Icon
 .claro-details__summary::before,
 .claro-details[open] > .claro-details__summary::before {
diff --git a/styles/theme/variables.scss b/styles/theme/variables.scss
index 77ccb0b3e4ee450ea063828a022f52035c2714a7..652f81814b47fef817c695447586a21f89d28d4f 100644
--- a/styles/theme/variables.scss
+++ b/styles/theme/variables.scss
@@ -153,6 +153,9 @@
 
   // Links
   --gin-link-decoration-style: dotted;
+
+  // Max line length
+  --gin-max-line-length: 80ch;
 }
 
 // Density spacings