diff --git a/lemur/static/app/angular/authorities/authority/authority.js b/lemur/static/app/angular/authorities/authority/authority.js
index d4b4bdde..6f038dd6 100644
--- a/lemur/static/app/angular/authorities/authority/authority.js
+++ b/lemur/static/app/angular/authorities/authority/authority.js
@@ -94,6 +94,11 @@ angular.module('lemur')
       startingDay: 1
     };
 
+    $scope.clearDates = function () {
+      $scope.authority.validityStart = null;
+      $scope.authority.validityEnd = null;
+      $scope.authority.validityYears = null;
+    };
 
     $scope.open1 = function() {
       $scope.popup1.opened = true;
diff --git a/lemur/static/app/angular/authorities/authority/tracking.tpl.html b/lemur/static/app/angular/authorities/authority/tracking.tpl.html
index 3544bf1c..72d7e3d5 100644
--- a/lemur/static/app/angular/authorities/authority/tracking.tpl.html
+++ b/lemur/static/app/angular/authorities/authority/tracking.tpl.html
@@ -110,8 +110,6 @@
                     </span>
                 </div>
             </div>
-            <span style="padding-top: 15px" class="text-center col-sm-1"><label><span
-              class="glyphicon glyphicon-resize-horizontal"></span></label></span>
             <div class="col-sm-3">
                 <div class="input-group">
                     <input type="text" class="form-control"
@@ -128,6 +126,9 @@
                     </span>
                 </div>
             </div>
+            <div class="col-sm-1">
+                <button uib-tooltip="Clear Validity" ng-click="clearDates()" class="btn btn-default"><i class="glyphicon glyphicon-remove"></i></button>
+            </div>
         </div>
         <div class="form-group">
             <label class="control-label col-sm-2">
diff --git a/lemur/static/app/angular/certificates/certificate/certificate.js b/lemur/static/app/angular/certificates/certificate/certificate.js
index 589ee319..ce767919 100644
--- a/lemur/static/app/angular/certificates/certificate/certificate.js
+++ b/lemur/static/app/angular/certificates/certificate/certificate.js
@@ -128,6 +128,12 @@ angular.module('lemur')
       opened: false
     };
 
+    $scope.clearDates = function () {
+      $scope.certificate.validityStart = null;
+      $scope.certificate.validityEnd = null;
+      $scope.certificate.validityYears = null;
+    };
+
     $scope.create = function (certificate) {
       WizardHandler.wizard().context.loading = true;
       CertificateService.create(certificate).then(
diff --git a/lemur/static/app/angular/certificates/certificate/tracking.tpl.html b/lemur/static/app/angular/certificates/certificate/tracking.tpl.html
index 66d1be76..6a4784ce 100644
--- a/lemur/static/app/angular/certificates/certificate/tracking.tpl.html
+++ b/lemur/static/app/angular/certificates/certificate/tracking.tpl.html
@@ -102,7 +102,7 @@
                 </select>
             </div>
             <span style="padding-top: 15px" class="text-center col-sm-1">
-                <strong>- or -</strong>
+                <strong>or</strong>
             </span>
             <div class="col-sm-3">
                 <div class="input-group">
@@ -114,15 +114,15 @@
                            close-text="Close"
                            max-date="certificate.authority.authorityCertificate.notAfter"
                            min-date="certificate.authority.authorityCertificate.notBefore"
-                           alt-input-formats="altInputFormats"/>
+                           alt-input-formats="altInputFormats"
+                           placeholder="Start Date"
+                    />
                     <span class="input-group-btn">
                         <button type="button" class="btn btn-default" ng-click="open1()"><i
                           class="glyphicon glyphicon-calendar"></i></button>
                     </span>
                 </div>
             </div>
-            <span style="padding-top: 15px" class="text-center col-sm-1"><label><span
-              class="glyphicon glyphicon-resize-horizontal"></span></label></span>
             <div class="col-sm-3">
                 <div class="input-group">
                     <input type="text" class="form-control"
@@ -133,13 +133,18 @@
                            close-text="Close"
                            max-date="certificate.authority.authorityCertificate.notAfter"
                            min-date="certificate.authority.authorityCertificate.notBefore"
-                           alt-input-formats="altInputFormats"/>
+                           alt-input-formats="altInputFormats"
+                           placeholder="End Date"
+                    />
                     <span class="input-group-btn">
                         <button type="button" class="btn btn-default" ng-click="open2()"><i
                           class="glyphicon glyphicon-calendar"></i></button>
                     </span>
                 </div>
             </div>
+            <div class="col-sm-1">
+                <button uib-tooltip="Clear Validity" ng-click="clearDates()" class="btn btn-default"><i class="glyphicon glyphicon-remove"></i></button>
+            </div>
         </div>
         <div class="form-group"
              ng-class="{'has-error': trackingForm.csr.$invalid&&trackingForm.csr.$dirty, 'has-success': !trackingForm.csr.$invalid&&trackingForm.csr.$dirty}">