diff --git a/packages/gravity-ui-nunjucks/src/_patterns/04-templates/00-page-layouts/00-basic-page.njk b/packages/gravity-ui-nunjucks/src/_patterns/04-templates/00-page-layouts/00-basic-page.njk
index 73c303ce..2b8da3a2 100644
--- a/packages/gravity-ui-nunjucks/src/_patterns/04-templates/00-page-layouts/00-basic-page.njk
+++ b/packages/gravity-ui-nunjucks/src/_patterns/04-templates/00-page-layouts/00-basic-page.njk
@@ -1,6 +1,6 @@
 {%- include 'organisms-page-header' -%}
 {%- block pageContent %}
-<main class="grav-u-pb-xl">
+<main>
   {% block mainContent -%}
     {#
       Just some dummy example content.
diff --git a/packages/gravity-ui-web/src/sass/00-settings/_spacing.scss b/packages/gravity-ui-web/src/sass/00-settings/_spacing.scss
index b88cbe57..e813265f 100644
--- a/packages/gravity-ui-web/src/sass/00-settings/_spacing.scss
+++ b/packages/gravity-ui-web/src/sass/00-settings/_spacing.scss
@@ -34,6 +34,18 @@ $grav-sp-l: grav-sp-calc(1);
 $grav-sp-xl: grav-sp-calc(2);
 $grav-sp-xxl: grav-sp-calc(3);
 
+
+// Global map of one-dimensional space sizes, plus zero
+$grav-sp-map: (
+  'none': 0,
+  'xs': $grav-sp-xs,
+  's': $grav-sp-s,
+  'm': $grav-sp-m,
+  'l': $grav-sp-l,
+  'xl': $grav-sp-xl,
+  'xxl': $grav-sp-xl
+);
+
 // Global set of two-dimensional insets (typically used as padding values)
 $grav-sp-inset-xs: $grav-sp-xs $grav-sp-xs;
 $grav-sp-inset-s: $grav-sp-s $grav-sp-s;
diff --git a/packages/gravity-ui-web/src/sass/06-utilities/_padding.scss b/packages/gravity-ui-web/src/sass/06-utilities/_padding.scss
index d3039b67..8cffe020 100644
--- a/packages/gravity-ui-web/src/sass/06-utilities/_padding.scss
+++ b/packages/gravity-ui-web/src/sass/06-utilities/_padding.scss
@@ -1,8 +1,7 @@
 $grav-sides: (top, bottom, left, right);
-$grav-spaces-map: ('xs': $grav-sp-s,'s': $grav-sp-s, 'm': $grav-sp-m, 'l': $grav-sp-l, 'xl': $grav-sp-xl, 'xxl': $grav-sp-xl);
 
 // Generate utility classes for available spacing sizes
-@each $name, $space in $grav-spaces-map {
+@each $name, $space in $grav-sp-map {
   @each $side in $grav-sides {
     .grav-u-p#{str-slice($side, 0, 1)}-#{$name} {
       padding-#{$side}: #{$space} !important;