diff --git a/src/form/button.js b/src/form/button.js
index 9549dfd..e645e9e 100644
--- a/src/form/button.js
+++ b/src/form/button.js
@@ -258,7 +258,7 @@ class Button extends Component {
   render() {
     let style = styleMap({ 'margin-right': this.#empty ? 0 : '4px' })
     return html`
-      <button ref="btn" disabled=${this.disabled}>
+      <button ref="btn" disabled=${this.disabled || this.loading}>
         <wc-icon class="icon" name=${this.icon} style=${style}></wc-icon>
         <slot ref="cont"></slot>
       </button>
diff --git a/src/space/index.js b/src/space/index.js
index aad7193..22efad4 100644
--- a/src/space/index.js
+++ b/src/space/index.js
@@ -16,6 +16,7 @@ class Space extends Component {
       flex-wrap: wrap;
       align-items: center;
       width: 100%;
+      padding: 12px 0;
       gap: 12px;
     }
     :host([vertical]) {
@@ -35,12 +36,12 @@ class Space extends Component {
       'l': 12px,
       'xl': 16px,
       'xxl': 20px,
-      'xxxl': 24px,
-      'xxxxl': 28px
+      'xxxl': 24px
     );
     @loop $k, $v in $gaps {
       :host([gap='#{$k}']) {
         .container {
+          padding: $v 0;
           gap: $v;
         }
       }