diff --git a/css/80_app.css b/css/80_app.css
index dfd594ae3fa..f96fbd7b988 100644
--- a/css/80_app.css
+++ b/css/80_app.css
@@ -2056,6 +2056,14 @@ a.hide-toggle {
 }
 
 
+/* Field - Date
+------------------------------------------------------- */
+.ideditor .form-field-input-date > input.date-main + input.date-main,
+.ideditor .form-field-input-date > .combobox-caret + input.date-main {
+    border-left: 0;
+}
+
+
 /* Field - Address
 ------------------------------------------------------- */
 .form-field-input-address {
diff --git a/modules/ui/fields/date.js b/modules/ui/fields/date.js
index c59a6e5f357..5b8974e4120 100644
--- a/modules/ui/fields/date.js
+++ b/modules/ui/fields/date.js
@@ -125,7 +125,7 @@ export function uiFieldDate(field, context) {
                     yearInput = yearInput.enter()
                         .append('input')
                         .attr('type', 'number')
-                        .attr('class', 'date-year')
+                        .attr('class', 'date-main date-year')
                         .attr('id', field.domId)
                         .call(utilNoAuto)
                         .merge(yearInput);
@@ -134,7 +134,7 @@ export function uiFieldDate(field, context) {
                     eraInput = eraInput.enter()
                         .append('input')
                         .attr('type', 'text')
-                        .attr('class', 'date-era')
+                        .attr('class', 'date-main date-era')
                         .call(eraCombo)
                         .merge(eraInput);
                     break;
@@ -142,7 +142,7 @@ export function uiFieldDate(field, context) {
                     monthInput = monthInput.enter()
                         .append('input')
                         .attr('type', 'text')
-                        .attr('class', 'date-month')
+                        .attr('class', 'date-main date-month')
                         .call(monthCombo)
                         .merge(monthInput);
                     break;
@@ -150,7 +150,7 @@ export function uiFieldDate(field, context) {
                     dayInput = dayInput.enter()
                         .append('input')
                         .attr('type', 'number')
-                        .attr('class', 'date-day')
+                        .attr('class', 'date-main date-day')
                         .call(utilNoAuto)
                         .merge(dayInput);
                     break;