diff --git a/pkg/api/datasources.go b/pkg/api/datasources.go
index f685dcc2520..63c2ec57b7a 100644
--- a/pkg/api/datasources.go
+++ b/pkg/api/datasources.go
@@ -40,7 +40,7 @@ func GetDataSources(c *middleware.Context) {
 		if plugin, exists := plugins.DataSources[ds.Type]; exists {
 			dsItem.TypeLogoUrl = plugin.Info.Logos.Small
 		} else {
-			dsItem.TypeLogoUrl = "public/img/icn-datasources.svg"
+			dsItem.TypeLogoUrl = "public/img/icn-datasource.svg"
 		}
 
 		result = append(result, dsItem)
diff --git a/public/sass/components/_gf-form.scss b/public/sass/components/_gf-form.scss
index 197ad91db2b..6315f1ecf79 100644
--- a/public/sass/components/_gf-form.scss
+++ b/public/sass/components/_gf-form.scss
@@ -1,9 +1,7 @@
 $gf-form-margin: 0.25rem;
-$gf-form-label-margin: 0.25rem;
 
 .gf-form {
   margin-bottom: $gf-form-margin;
-  margin-right: $gf-form-margin;
   display: flex;
   flex-direction: row;
   align-items: center;
@@ -44,18 +42,12 @@ $gf-form-label-margin: 0.25rem;
   background-color: $input-label-bg;
   display: block;
   font-size: $font-size-sm;
-  margin-right: $gf-form-label-margin;
+  margin-right: $gf-form-margin;
 
   border: $input-btn-border-width solid transparent;
   @include border-radius($label-border-radius-sm);
 }
 
-.gf-form-label--textarea {
-  line-height: $input-line-height * 2;
-  padding-top: 0px;
-  padding-bottom: 16px; // $spacer (1rem) was slightly too short.
-}
-
 .gf-form-checkbox {
   flex-shrink: 0;
   padding: $input-padding-y $input-padding-x;
@@ -73,7 +65,7 @@ $gf-form-label-margin: 0.25rem;
   display: block;
   width: 100%;
   padding: $input-padding-y $input-padding-x;
-  margin-right: $gf-form-label-margin;
+  margin-right: $gf-form-margin;
   font-size: $font-size-base;
   line-height: $input-line-height;
   color: $input-color;
@@ -118,7 +110,7 @@ $gf-form-label-margin: 0.25rem;
 .gf-form-select-wrapper {
   position: relative;
   background-color: $input-bg;
-  margin-right: $gf-form-label-margin;
+  margin-right: $gf-form-margin;
 
   select.gf-form-input {
     text-indent: .01px;
@@ -147,18 +139,19 @@ $gf-form-label-margin: 0.25rem;
   }
 }
 
-.gf-form--textarea {
-  align-items: flex-start;
+.gf-form--v-stretch {
+  align-items: stretch;
 }
 
-input[type="number"].gf-natural-language-form {
-  font-size: $font-size-base;
-  line-height: $input-line-height;
-  margin: -6px -5px 0 5px;
-  padding: $input-padding-y/2 $input-padding-x/2;
-}
+// input[type="number"].gf-natural-language-form {
+//   font-size: $font-size-base;
+//   line-height: $input-line-height;
+//   margin: -6px -5px 0 5px;
+//   padding: $input-padding-y/2 $input-padding-x/2;
+// }
 
 .gf-form-btn {
+  margin-right: $gf-form-margin;
   padding: $input-padding-y $input-padding-x;
   line-height: $input-line-height;
   flex-shrink: 0;