diff --git a/client/components/cards/cardCustomFields.jade b/client/components/cards/cardCustomFields.jade
index 4f18a11f5..11f1bc2f6 100644
--- a/client/components/cards/cardCustomFields.jade
+++ b/client/components/cards/cardCustomFields.jade
@@ -53,23 +53,12 @@ template(name="cardCustomField-number")
             = value
 
 template(name="cardCustomField-checkbox")
-  if canModifyCard
-    +inlinedForm(classNames="js-card-customfield-checkbox")
-      input.materialCheckBox(type="checkbox" checked=data.value)
-      .edit-controls.clearfix
-        button.primary(type="submit") {{_ 'save'}}
-        a.fa.fa-times-thin.js-close-inlined-form
+  .js-checklist-item.checklist-item(class="{{#if data.value }}is-checked{{/if}}")
+    if canModifyCard
+      .check-box-container
+        .check-box.materialCheckBox(class="{{#if data.value }}is-checked{{/if}}")
     else
-      a.js-open-inlined-form.checkbox-display
-        if value
-          i.fa.fa-check-square
-        else
-          i.fa.fa-square
-  else
-    if value
-      i.fa.fa-check-square
-    else
-      i.fa.fa-square
+      .materialCheckBox(class="{{#if data.value }}is-checked{{/if}}")
 
 template(name="cardCustomField-currency")
     if canModifyCard
diff --git a/client/components/cards/cardCustomFields.js b/client/components/cards/cardCustomFields.js
index b115235f6..e4cf38a1d 100644
--- a/client/components/cards/cardCustomFields.js
+++ b/client/components/cards/cardCustomFields.js
@@ -86,18 +86,14 @@ CardCustomField.register('cardCustomField');
     super.onCreated();
   }
 
-  isNull() {
-    return !this.data().value;
+  toggleItem() {
+    this.card.setCustomField(this.customFieldId, !this.data().value);
   }
 
   events() {
     return [
       {
-        'submit .js-card-customfield-checkbox'(event) {
-          event.preventDefault();
-          const value = this.find('input').checked;
-          this.card.setCustomField(this.customFieldId, value);
-        },
+        'click .js-checklist-item .check-box-container': this.toggleItem,
       },
     ];
   }
diff --git a/client/components/cards/cardDate.jade b/client/components/cards/cardDate.jade
index 2e4475067..5ea86aaf5 100644
--- a/client/components/cards/cardDate.jade
+++ b/client/components/cards/cardDate.jade
@@ -8,3 +8,8 @@ template(name="dateBadge")
       time(datetime="{{showISODate}}")
         | {{showDate}}
 
+template(name="dateCustomField")
+  a(title="{{showTitle}}" class="{{classes}}")
+    time(datetime="{{showISODate}}")
+      | {{showDate}}
+
diff --git a/client/components/forms/forms.styl b/client/components/forms/forms.styl
index b906d7a84..a6103776c 100644
--- a/client/components/forms/forms.styl
+++ b/client/components/forms/forms.styl
@@ -242,11 +242,11 @@ textarea
     margin: 3px 4px
 
 // Material Design checkboxes
-//[type="checkbox"]:not(:checked),
-//[type="checkbox"]:checked
-//  position: absolute
-//  left: -9999px
-//  visibility: hidden
+  [type="checkbox"]:not(:checked),
+  [type="checkbox"]:checked
+    position: absolute
+    left: -9999px
+    visibility: hidden
 
 .materialCheckBox
   position: relative