diff --git a/src/css/button.css b/src/css/button.css
index e2943b2c..9442522f 100755
--- a/src/css/button.css
+++ b/src/css/button.css
@@ -210,10 +210,6 @@ button [class*=" button-"]:last-child,
   padding: 0.5em 0;
   position: relative;
   width: 100%;
-  display: block;
-}
-
-.button-wrap-inline {
-  width: initial;
-  display: inline-block;
+  display: flex;
+  flex-direction: row;
 }
diff --git a/src/css/form.css b/src/css/form.css
index f0e06625..119921a9 100755
--- a/src/css/form.css
+++ b/src/css/form.css
@@ -1200,6 +1200,8 @@ input[type="range"]:disabled::-moz-range-progress {
 }
 
 .form-inline {
+  margin-left: -0.5em;
+  margin-right: -0.5em;
   display: flex;
   flex-direction: row;
   justify-content: flex-start;
@@ -1208,7 +1210,8 @@ input[type="range"]:disabled::-moz-range-progress {
 }
 
 .form-inline>* {
-  margin-right: 1em;
+  padding-left: 0.5em;
+  padding-right: 0.5em;
   width: initial;
 }