diff --git a/api/js/etemplate/et2_core_valueWidget.js b/api/js/etemplate/et2_core_valueWidget.js
index 2cea56756f..ca64b5eef7 100644
--- a/api/js/etemplate/et2_core_valueWidget.js
+++ b/api/js/etemplate/et2_core_valueWidget.js
@@ -108,6 +108,9 @@ var et2_valueWidget = (function(){ "use strict"; return et2_baseWidget.extend(
 					this._labelContainer.append(ph);
 				}
 			}
+
+			// add class if label is empty
+			this._labelContainer.toggleClass('et2_label_empty', !_value || !parts[0]);
 		}
 		else
 		{
diff --git a/api/js/etemplate/et2_widget_date.js b/api/js/etemplate/et2_widget_date.js
index 40fd2352e4..6767aad6d9 100644
--- a/api/js/etemplate/et2_widget_date.js
+++ b/api/js/etemplate/et2_widget_date.js
@@ -1104,6 +1104,9 @@ var et2_date_ro = (function(){ "use strict"; return et2_valueWidget.extend([et2_
 		this._labelContainer.prepend(parts[0]);
 		this._labelContainer.append(parts[1]);
 		this.label = label;
+
+		// add class if label is empty
+		this._labelContainer.toggleClass('et2_label_empty', !label || !parts[0]);
 	},
 
 	/**
diff --git a/api/templates/default/etemplate2.css b/api/templates/default/etemplate2.css
index a83a958d2f..6555f1b7bb 100644
--- a/api/templates/default/etemplate2.css
+++ b/api/templates/default/etemplate2.css
@@ -51,11 +51,11 @@ div.et2_hbox {
 div.et2_hbox > * {
   text-align: left;
   white-space: normal;
-  padding-right: 5px;
+  margin-right: 5px;
   display: inline-block;
 }
 div.et2_hbox > *:empty {
-  padding-right: 0;
+  margin-right: 0;
 }
 div.et2_hbox_left {
   float: left;
@@ -148,6 +148,12 @@ div.et2_hbox > div {
   color: #101050;
   white-space: pre-wrap;
 }
+label.et2_label > * {
+	margin-left: 5px !important;
+}
+label.et2_label > input[type="checkbox"], label.et2_label.et2_label_empty > * {
+	margin-left: 0 !important;
+}
 #msg,
 .message {
   color: red;
@@ -204,6 +210,7 @@ input[type=button] {
 	background-position: center;
 	background-repeat: repeat-x;
 	margin: 5px;
+	margin-left: 0;
 	padding: 3px;
 	border: 1px solid silver;
 	color: #101010;
@@ -392,12 +399,9 @@ ul.et2_selectbox {
   display: inline-block;
 }
 /* padding between selectbox/textbox and it's label */
-label.et2_label > .et2_selectbox, label.et2_label > .et2_textbox, label.et2_label > .et2_textbox_ro {
+input, select {
 	padding-left: 5px;
 }
-label.et2_label_empty > .et2_textbox_ro{
-	padding-left: 0;
-}
 .et2_selectbox li {
   text-decoration: none;
   list-style-image: none;
diff --git a/pixelegg/css/mobile.css b/pixelegg/css/mobile.css
index 3c4c3c56d9..0f9ee7290b 100644
--- a/pixelegg/css/mobile.css
+++ b/pixelegg/css/mobile.css
@@ -65,7 +65,6 @@
   button,
   select {
     margin: 1px;
-    padding: 0px;
     /*-webkit-appearance: none;*/
   }
   /**
@@ -2681,7 +2680,6 @@ input {
     &:focus{.Complete_Button_input_focus;}*/
 }
 select {
-  padding: 3px;
   margin: 0;
   -webkit-border-radius: 3px;
   -moz-border-radius: 3px;
@@ -2736,7 +2734,9 @@ input,
 button {
   color: #000000;
   /*font-size:99%;*/
-  padding: 2px 0px;
+  padding-top: 2px;
+  padding-bottom: 2px;
+  padding-right: 0;
   border-width: 1px;
   border-style: solid;
   border-color: #e6e6e6;
@@ -2908,17 +2908,16 @@ div#popupMainDiv > * {
 form.et2_container {
   padding: 0;
 }
-form.et2_container div table.et2_grid tbody tr .row td .et2_box_widget select {
+form.et2_container div table.et2_grid tbody tr .row td .et2_box_widget select,
+form.et2_container div table.et2_grid tbody tr .row td .et2_box_widget input {
   height: 20px;
-  padding: 0;
-  margin: 0px;
+  padding-right: 0;
+  padding-top: 0;
+  padding-bottom: 0;
   font-size: 0.95em;
 }
 form.et2_container div table.et2_grid tbody tr .row td .et2_box_widget input {
-  height: 20px;
-  padding: 0;
-  margin: 4px 4px 4px 5px;
-  font-size: 0.95em;
+  margin: 4px 5px 4px 0;
   -webkit-border-top-right-radius: 3px;
   -webkit-border-bottom-right-radius: 3px;
   -webkit-border-bottom-left-radius: 3px;
@@ -3204,6 +3203,9 @@ div#etemplate\.tab_widget {
 .dialogFooterToolbar td {
   padding: 0px 5px 0px 0px;
 }
+.dialogFooterToolbar td:first-child {
+  padding-left: 5px;
+}
 .dialogFooterToolbar button {
   height: 24px;
   min-width: 86px;
@@ -3664,7 +3666,7 @@ td.message span.message {
 }
 .egwGridView_scrollarea {
   width: 100%;
-  overflow-y: auto;
+  overflow-y: scroll;
   overflow-x: hidden;
 }
 /**
diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css
index c2c47d49a1..a6675bafd5 100644
--- a/pixelegg/css/pixelegg.css
+++ b/pixelegg/css/pixelegg.css
@@ -54,7 +54,6 @@
   button,
   select {
     margin: 1px;
-    padding: 0px;
     /*-webkit-appearance: none;*/
   }
   /**
@@ -2670,7 +2669,6 @@ input {
     &:focus{.Complete_Button_input_focus;}*/
 }
 select {
-  padding: 3px;
   margin: 0;
   -webkit-border-radius: 3px;
   -moz-border-radius: 3px;
@@ -2725,7 +2723,9 @@ input,
 button {
   color: #000000;
   /*font-size:99%;*/
-  padding: 2px 0px;
+  padding-top: 2px;
+  padding-bottom: 2px;
+  padding-right: 0;
   border-width: 1px;
   border-style: solid;
   border-color: #e6e6e6;
@@ -2897,17 +2897,16 @@ div#popupMainDiv > * {
 form.et2_container {
   padding: 0;
 }
-form.et2_container div table.et2_grid tbody tr .row td .et2_box_widget select {
+form.et2_container div table.et2_grid tbody tr .row td .et2_box_widget select,
+form.et2_container div table.et2_grid tbody tr .row td .et2_box_widget input {
   height: 20px;
-  padding: 0;
-  margin: 0px;
+  padding-right: 0;
+  padding-top: 0;
+  padding-bottom: 0;
   font-size: 0.95em;
 }
 form.et2_container div table.et2_grid tbody tr .row td .et2_box_widget input {
-  height: 20px;
-  padding: 0;
-  margin: 4px 4px 4px 5px;
-  font-size: 0.95em;
+  margin: 4px 5px 4px 0;
   -webkit-border-top-right-radius: 3px;
   -webkit-border-bottom-right-radius: 3px;
   -webkit-border-bottom-left-radius: 3px;
@@ -3193,6 +3192,9 @@ div#etemplate\.tab_widget {
 .dialogFooterToolbar td {
   padding: 0px 5px 0px 0px;
 }
+.dialogFooterToolbar td:first-child {
+  padding-left: 5px;
+}
 .dialogFooterToolbar button {
   height: 24px;
   min-width: 86px;
diff --git a/pixelegg/less/etemplate2.less b/pixelegg/less/etemplate2.less
index 1b903e1d1f..83ff5c15c1 100755
--- a/pixelegg/less/etemplate2.less
+++ b/pixelegg/less/etemplate2.less
@@ -30,7 +30,7 @@
  */
 input,button,select {
     margin: 1px;
-    padding: 0px;
+    //padding: 0px;
     // switch off for Safari + Chrome
     /*-webkit-appearance: none;*/
 }
diff --git a/pixelegg/less/layout_content_elements.less b/pixelegg/less/layout_content_elements.less
index 21eb86b82b..ef19866cc1 100755
Binary files a/pixelegg/less/layout_content_elements.less and b/pixelegg/less/layout_content_elements.less differ
diff --git a/pixelegg/less/layout_dialog.less b/pixelegg/less/layout_dialog.less
index 35a7db8ea0..d76bba8655 100755
--- a/pixelegg/less/layout_dialog.less
+++ b/pixelegg/less/layout_dialog.less
@@ -58,20 +58,17 @@ form.et2_container {
                         td {
                             .et2_box_widget {
 
-                                select{
+                                select, input{
                                     height: 20px;
-                                    padding: 0;
-                                    margin: 0px;
+                                    padding-right: 0;
+									padding-top: 0;
+									padding-bottom: 0;
                                     font-size: 0.95em;
-
                                 }
 
-                               input {
-                                    height: 20px;
-                                    padding: 0;
-                                    margin: 4px 4px 4px 5px;;
-                                    font-size: 0.95em;
-                                    .border_radius (3px, 3px ,3px ,3px );
+							    input {
+                                    margin: 4px 5px 4px 0;
+                                   .border_radius (3px, 3px ,3px ,3px );
                                 }
 
                                 input.hasDatepicker {
@@ -397,7 +394,12 @@ div#etemplate\.tab_widget {
     padding: 3px;
     white-space: nowrap;
 
-    td {padding: 0px 5px 0px 0px;}
+    td {
+		padding: 0px 5px 0px 0px;
+	}
+	td:first-child {
+		padding-left: 5px;
+	}
 
     button {
         .dimension_height_m; min-width: 86px;
@@ -410,8 +412,8 @@ div#etemplate\.tab_widget {
     }
 
     div.et2_hbox {
-    white-space: normal;
-}
+		white-space: normal;
+	}
 
     div.et2_box_widget{white-space: nowrap;}
 
diff --git a/pixelegg/less/layout_raster.less b/pixelegg/less/layout_raster.less
index adc8fea852..87845487d7 100644
--- a/pixelegg/less/layout_raster.less
+++ b/pixelegg/less/layout_raster.less
@@ -36,7 +36,7 @@
 
 .egwGridView_scrollarea {
     width: 100%;
-    overflow-y: auto;
+    overflow-y: scroll;
     overflow-x: hidden;
 }
 
diff --git a/pixelegg/mobile/fw_mobile.css b/pixelegg/mobile/fw_mobile.css
index ed834d092a..0a4703f1aa 100644
--- a/pixelegg/mobile/fw_mobile.css
+++ b/pixelegg/mobile/fw_mobile.css
@@ -2928,7 +2928,7 @@ form.et2_container div table.et2_grid tbody tr .row td .et2_box_widget select {
 form.et2_container div table.et2_grid tbody tr .row td .et2_box_widget input {
   height: 20px;
   padding: 0;
-  margin: 4px 4px 4px 5px;
+  margin: 4px 5px 4px 0;
   font-size: 0.95em;
   -webkit-border-top-right-radius: 3px;
   -webkit-border-bottom-right-radius: 3px;