diff --git a/awx/ui/client/lib/theme/index.less b/awx/ui/client/lib/theme/index.less
index 00061e28b4..c1117fef97 100644
--- a/awx/ui/client/lib/theme/index.less
+++ b/awx/ui/client/lib/theme/index.less
@@ -92,6 +92,7 @@
 @import '../../src/organizations/orgcards.block.less';
 @import '../../src/scheduler/repeatFrequencyOptions.block.less';
 @import '../../src/scheduler/schedulerForm.block.less';
+@import '../../src/scheduler/schedulerDatePicker.block.less';
 @import '../../src/scheduler/schedulerFormDetail.block.less';
 @import '../../src/scheduler/schedulertime.block.less';
 @import '../../src/scheduler/scheduleToggle.block.less';
diff --git a/awx/ui/client/src/scheduler/schedulerDatePicker.block.less b/awx/ui/client/src/scheduler/schedulerDatePicker.block.less
new file mode 100644
index 0000000000..8e630e9f9d
--- /dev/null
+++ b/awx/ui/client/src/scheduler/schedulerDatePicker.block.less
@@ -0,0 +1,37 @@
+.DatePicker {
+    flex: 1 0 auto;
+    display: flex;
+
+    &-icon {
+        flex: initial;
+        padding: 6px 12px;
+        font-size: 14px;
+        border-radius: 4px 0 0 4px;
+        border: 1px solid @b7grey;
+        border-right: 0;
+        background-color: @default-bg;
+    }
+
+    &-icon:hover {
+        background-color: @f6grey;
+    }
+
+    &-icon:focus,
+    &-icon:active {
+        background-color: @f6grey;
+    }
+
+    &-input {
+        flex: 1 0 auto;
+        border-radius: 0 4px 4px 0;
+        border: 1px solid @b7grey;
+        padding: 6px 12px;
+        background-color: @fcgrey;
+    }
+
+    &-input:focus,
+    &-input:active {
+        outline-offset: 0;
+        outline: 0;
+    }
+}
\ No newline at end of file
diff --git a/awx/ui/client/src/scheduler/schedulerDatePicker.directive.js b/awx/ui/client/src/scheduler/schedulerDatePicker.directive.js
index bcd4cc031d..310a789091 100644
--- a/awx/ui/client/src/scheduler/schedulerDatePicker.directive.js
+++ b/awx/ui/client/src/scheduler/schedulerDatePicker.directive.js
@@ -20,7 +20,7 @@ export default
                     inputClass: '&',
                     disabled: '=?'
                 },
-                templateUrl: templateUrl('system-tracking/date-picker/date-picker'),
+                templateUrl: templateUrl('scheduler/schedulerDatePicker'),
                 link: function(scope, element, attrs) {
                     var lang = window.navigator.languages ?
                         window.navigator.languages[0] :