diff --git a/css/style.css b/css/style.css
index 7141a070c..65d9c7331 100644
--- a/css/style.css
+++ b/css/style.css
@@ -481,24 +481,23 @@ button.button-inline:hover {
 }
 .due.now {
 	background-color: #fbd850;
-	color: #000;
 }
 .due.next {
 	background-color: #22ac2a;
 	color: #fff;
 }
 
-.due .icon-calendar {
-	background-image: url(../img/calendar.svg);
+.due .badge-icon {
+	background-image: url(../../../core/img/places/calendar-dark.svg);
 	margin-right: 2px;
 }
-.overdue .icon-calendar {
+.overdue .badge-icon {
 	background-image: url(../img/calendar-white.svg);
 }
-.now .icon-calendar {
-	background-image: url(../img/calendar.svg);
+.now .badge-icon {
+	background-image: url(../../../core/img/places/calendar-dark.svg);
 }
-.next .icon-calendar {
+.next .badge-icon {
 	background-image: url(../img/calendar-white.svg);
 }
 /**
@@ -538,7 +537,7 @@ button.button-inline:hover {
 	margin-bottom: 10px;
 }
 
-#card-meta #duedate {
+#card-meta .duedate {
 	display: flex;
 }
 #card-description {
diff --git a/templates/main.php b/templates/main.php
index 4728dbf19..34ea60049 100644
--- a/templates/main.php
+++ b/templates/main.php
@@ -38,7 +38,7 @@ Util::addScript('deck', 'vendor/angular-markdown-it/dist/ng-markdownit.min');
 Util::addScript('deck', 'vendor/markdown-it-link-target/dist/markdown-it-link-target.min');
 Util::addScript('deck', 'vendor/jquery-timepicker/jquery.ui.timepicker');
 
-if(true && !\OC::$server->getConfig()->getSystemValue('debug', false)) {
+if(!\OC::$server->getConfig()->getSystemValue('debug', false)) {
 	Util::addScript('deck', 'public/app');
 } else {
 	// Load seperate JS files when debug mode is enabled
diff --git a/templates/part.board.mainView.php b/templates/part.board.mainView.php
index 48850da6e..d0019b4bc 100644
--- a/templates/part.board.mainView.php
+++ b/templates/part.board.mainView.php
@@ -69,7 +69,7 @@
 						<div class="card-controls">
 							<i class="icon icon-filetype-text" ng-if="c.description" title="{{ c.description }}"></i>
 							<span class="due" ng-if="c.duedate" ng-class="{'overdue': c.overdue == 3, 'now': c.overdue == 2, 'next': c.overdue == 1  }">
-								<i class="icon icon-calendar"></i>
+								<i class="icon badge-icon"></i>
 								<span data-timestamp="{{ c.duedate | dateToTimestamp }}" class="live-relative-timestamp">{{ c.duedate | relativeDateFilterString }}</span>
 							</span>
 							<div class="app-popover-menu-utils" ng-if="!boardservice.isArchived()">
diff --git a/templates/part.card.php b/templates/part.card.php
index e715134e7..d0262ab2e 100644
--- a/templates/part.card.php
+++ b/templates/part.card.php
@@ -46,10 +46,10 @@
 			</ui-select-choices>
 		</ui-select>
 
-		<div id="duedate">
+		<div class="duedate">
 			<input class="datepicker-input medium focus" type="text" placeholder="Set a due date" value="{{ cardservice.getCurrent().duedate | parseDate }}" datepicker="due" />
 			<input class="timepicker-input medium focus" type="text" placeholder="00:00:00" ng-if="cardservice.getCurrent().duedate" value="{{ cardservice.getCurrent().duedate | parseTime }}" timepicker="due" />
-			<button class="icon icon-delete button-inline" title="Remove duedate" ng-if="cardservice.getCurrent().duedate" ng-click="resetDuedate()"></button>
+			<button class="icon icon-delete button-inline" title="<?php p($l->t('Remove due date')); ?>" ng-if="cardservice.getCurrent().duedate" ng-click="resetDuedate()"></button>
 		</div>
 
 	</div>