diff --git a/frappe/public/css/form_grid.css b/frappe/public/css/form_grid.css
index 2fe303160c..f64ce1bf77 100644
--- a/frappe/public/css/form_grid.css
+++ b/frappe/public/css/form_grid.css
@@ -101,6 +101,9 @@
 .grid-body .editable-row input[data-fieldtype="Currency"] {
   text-align: right;
 }
+.grid-body .grid-static-col[data-fieldtype="Code"] .static-area {
+  margin-top: -10px;
+}
 @media (max-width: 767px) {
   .grid-body .btn-open-row {
     margin-top: 0px;
diff --git a/frappe/public/js/frappe/form/grid.js b/frappe/public/js/frappe/form/grid.js
index 5ac9d585da..3aa05bac9d 100644
--- a/frappe/public/js/frappe/form/grid.js
+++ b/frappe/public/js/frappe/form/grid.js
@@ -688,6 +688,7 @@ frappe.ui.form.GridRow = Class.extend({
 
 		$col = $('<div class="col grid-static-col col-xs-'+colsize+' '+add_class+'"></div>')
 			.attr("data-fieldname", df.fieldname)
+			.attr("data-fieldtype", df.fieldtype)
 			.data("df", df)
 			.appendTo(this.row)
 			.on('click', function() {
diff --git a/frappe/public/js/frappe/form/templates/grid_form.html b/frappe/public/js/frappe/form/templates/grid_form.html
index 648990eee7..cfdb211b1a 100644
--- a/frappe/public/js/frappe/form/templates/grid_form.html
+++ b/frappe/public/js/frappe/form/templates/grid_form.html
@@ -9,9 +9,9 @@
 			style="margin-left: 7px;">
 			{%= __("Insert Above") %}</button>
 		<button class="btn btn-danger btn-xs pull-right grid-delete-row">
-			<i class="octicon octicon-trashcan visible-xs"
+			<i class="octicon octicon-trashcan"
 				style="padding-bottom: 2px; margin-top: 1px;"></i>
-			<span class="hidden-xs octicon octicon-x"></span></button>
+		</button>
 	</div>
 </div>
 <div class="grid-form-body">
diff --git a/frappe/public/less/form_grid.less b/frappe/public/less/form_grid.less
index 2113cff8de..853af71092 100644
--- a/frappe/public/less/form_grid.less
+++ b/frappe/public/less/form_grid.less
@@ -130,8 +130,12 @@
 		input[data-fieldtype="Int"], input[data-fieldtype="Float"], input[data-fieldtype="Currency"] {
 			text-align: right;
 		}
+	}
 
+	.grid-static-col[data-fieldtype="Code"] .static-area {
+		margin-top: -10px;
 	}
+
 }
 
 @media (max-width: 767px) {