diff --git a/superset-frontend/src/CRUD/crud.less b/superset-frontend/src/CRUD/crud.less
index b3e298cc2d..cace6f8e52 100644
--- a/superset-frontend/src/CRUD/crud.less
+++ b/superset-frontend/src/CRUD/crud.less
@@ -29,7 +29,6 @@
 
   .control-label {
     font-weight: @font-weight-bold;
-    font-size: @font-size-l;
   }
 
   .tiny-cell {
diff --git a/superset-frontend/stylesheets/less/cosmo/bootswatch.less b/superset-frontend/stylesheets/less/cosmo/bootswatch.less
index 3ae51f77cd..9b0ebd7563 100644
--- a/superset-frontend/stylesheets/less/cosmo/bootswatch.less
+++ b/superset-frontend/stylesheets/less/cosmo/bootswatch.less
@@ -470,3 +470,9 @@ hr {
 a {
   cursor: pointer;
 }
+
+.control-label {
+  text-transform: uppercase;
+  color: @gray;
+  font-size: @font-size-s;
+}
diff --git a/superset-frontend/stylesheets/less/cosmo/variables.less b/superset-frontend/stylesheets/less/cosmo/variables.less
index 84f8088d32..438054862c 100644
--- a/superset-frontend/stylesheets/less/cosmo/variables.less
+++ b/superset-frontend/stylesheets/less/cosmo/variables.less
@@ -220,7 +220,7 @@
 );
 
 // ** `.form-group` margin
-@form-group-margin-bottom: 10px;
+@form-group-margin-bottom: 16px;
 
 @legend-color: @text-color;
 @legend-border-color: @gray-bg;