diff --git a/scss/elements/buttons.scss b/scss/elements/buttons.scss
index a9a0644..1411939 100644
--- a/scss/elements/buttons.scss
+++ b/scss/elements/buttons.scss
@@ -32,7 +32,7 @@
 
   position: relative;
   display: inline-block;
-  padding: 10px 12px;
+  padding: 6px 8px;
   margin: $border-size;
   text-align: center;
   vertical-align: middle;
diff --git a/scss/elements/containers.scss b/scss/elements/containers.scss
index 81d1d20..19d95a9 100644
--- a/scss/elements/containers.scss
+++ b/scss/elements/containers.scss
@@ -21,7 +21,7 @@
     > .title {
       display: table;
       padding: 0 0.5rem;
-      margin: -2rem 0 1rem;
+      margin: -1.8rem 0 1rem;
       font-size: 1rem;
       background-color: $background-color;
     }
@@ -40,10 +40,23 @@
   }
 
   &.is-dark {
+    position: relative;
+    margin: $border-size;
     color: $background-color;
     background-color: $base-color;
     border-color: white;
 
+    &::after {
+      position: absolute;
+      top: -$border-size * 1.8;
+      right: -$border-size * 1.8;
+      bottom: -$border-size * 1.8;
+      left: -$border-size * 1.8;
+      z-index: -1;
+      content: "";
+      background-color: $base-color;
+    }
+
     &.with-title {
       > .title {
         color: $background-color;
@@ -56,11 +69,7 @@
     @include rounded-corners();
 
     padding: 1rem 1.5rem;
-    margin: 14px 8px;
-
-    &.is-dark {
-      @include rounded-corners(true);
-    }
+    margin: $border-size;
 
     &.with-title {
       > .title {
@@ -79,5 +88,30 @@
         }
       }
     }
+
+    &.is-dark {
+      @include rounded-corners(true);
+      &::after {
+        content: none;
+      }
+
+      &.with-title {
+        > .title {
+          margin-top: -1.3rem;
+        }
+
+        &.is-centered {
+          > .title {
+            margin: -1.3rem auto 1rem;
+          }
+        }
+
+        &.is-right {
+          > .title {
+            margin: -1.3rem 0 1rem auto;
+          }
+        }
+      }
+    }
   }
 }
diff --git a/scss/utilities/rounded-corners-mixin.scss b/scss/utilities/rounded-corners-mixin.scss
index a96d94f..eec9ef1 100644
--- a/scss/utilities/rounded-corners-mixin.scss
+++ b/scss/utilities/rounded-corners-mixin.scss
@@ -4,11 +4,11 @@
 }
 
 @mixin border-image($color) {
-  border-image-source: url('data:image/svg+xml;utf8,<?xml version="1.0" encoding="UTF-8" ?><svg version="1.1" width="8" height="8" xmlns="http://www.w3.org/2000/svg"><path class="svg-border" d="M3 1 h1 v1 h-1 z M4 1 h1 v1 h-1 z M2 2 h1 v1 h-1 z M5 2 h1 v1 h-1 z M1 3 h1 v1 h-1 z M6 3 h1 v1 h-1 z M1 4 h1 v1 h-1 z M6 4 h1 v1 h-1 z M2 5 h1 v1 h-1 z M5 5 h1 v1 h-1 z M3 6 h1 v1 h-1 z M4 6 h1 v1 h-1 z" fill="#{$color}" /></svg>');
+  border-image-source: url('data:image/svg+xml;utf8,<?xml version="1.0" encoding="UTF-8" ?><svg version="1.1" width="8" height="8" xmlns="http://www.w3.org/2000/svg"><path d="M3 1 h1 v1 h-1 z M4 1 h1 v1 h-1 z M2 2 h1 v1 h-1 z M5 2 h1 v1 h-1 z M1 3 h1 v1 h-1 z M6 3 h1 v1 h-1 z M1 4 h1 v1 h-1 z M6 4 h1 v1 h-1 z M2 5 h1 v1 h-1 z M5 5 h1 v1 h-1 z M3 6 h1 v1 h-1 z M4 6 h1 v1 h-1 z" fill="rgb(#{red($color)},#{green($color)},#{blue($color)})" /></svg>');
 }
 
 @mixin compact-border-image($color) {
-  border-image-source: url('data:image/svg+xml;utf8,<?xml version="1.0" encoding="UTF-8" ?><svg version="1.1" width="5" height="5" xmlns="http://www.w3.org/2000/svg"><path class="svg-border" d="M2 1 h1 v1 h-1 z M1 2 h1 v1 h-1 z M3 2 h1 v1 h-1 z M2 3 h1 v1 h-1 z" fill="#{$color}" /></svg>');
+  border-image-source: url('data:image/svg+xml;utf8,<?xml version="1.0" encoding="UTF-8" ?><svg version="1.1" width="5" height="5" xmlns="http://www.w3.org/2000/svg"><path d="M2 1 h1 v1 h-1 z M1 2 h1 v1 h-1 z M3 2 h1 v1 h-1 z M2 3 h1 v1 h-1 z" fill="rgb(#{red($color)},#{green($color)},#{blue($color)})" /></svg>');
 }
 
 @mixin rounded-corners($isDark: false) {