diff --git a/app/assets/javascripts/app/views/calendar/new.jst.eco b/app/assets/javascripts/app/views/calendar/new.jst.eco
index 65755f9b1..92e5a05c9 100644
--- a/app/assets/javascripts/app/views/calendar/new.jst.eco
+++ b/app/assets/javascripts/app/views/calendar/new.jst.eco
@@ -661,34 +661,71 @@
     <label for="name">Public Holidays</label>
   </div>
   <div class="controls">
-
-    <table class="table table-fluid">
+    <table class="settings-list">
       <thead>
         <tr>
+          <th><%- @T('Active') %>
           <th><%- @T('Date') %>
           <th><%- @T('Description') %>
           <th><%- @T('Action') %>
       </thead>
       <tbody>
         <tr>
+          <td>
+            <label class="checkbox-replacement">
+              <input type="checkbox" checked>
+              <%- @Icon('checkbox', 'icon-unchecked') %>
+              <%- @Icon('checkbox-checked', 'icon-checked') %>
+            </label>
           <td><%- @Tdate('2015-12-24') %>
           <td>Some Description
-          <td class="list-item-delete js-disable"><%- @Icon('diagonal-cross') %>
+          <td>
+            <div class="settings-list-rowControls">
+              <div class="btn btn--text js-remove">
+                <%- @Icon('trash') %> <%- @T('Remove') %>
+              </div>
+            </div>
         <tr>
+          <td>
+            <label class="checkbox-replacement">
+              <input type="checkbox" checked>
+              <%- @Icon('checkbox', 'icon-unchecked') %>
+              <%- @Icon('checkbox-checked', 'icon-checked') %>
+            </label>
           <td><%- @Tdate('2015-12-25') %>
           <td>Some Description
-          <td class="list-item-delete js-disable"><%- @Icon('diagonal-cross') %>
+          <td>
+            <div class="settings-list-rowControls">
+              <div class="btn btn--text js-remove">
+                <%- @Icon('trash') %> <%- @T('Remove') %>
+              </div>
+            </div>
         <tr class="is-inactive">
+          <td>
+            <label class="checkbox-replacement">
+              <input type="checkbox">
+              <%- @Icon('checkbox', 'icon-unchecked') %>
+              <%- @Icon('checkbox-checked', 'icon-checked') %>
+            </label>
           <td><%- @Tdate('2015-12-26') %>
           <td>Some Description
-          <td class="list-item-delete js-disable">ICON FOR ENABLE?
-        <tr>
-          <td colspan="2"><%- @T('Add manual hollidays') %>:
-        <tr>
-          <td><input type="text" name="public_holidays_date" placeholder="<%- @Tdate('2015-12-26') %>"/>
-          <td><input type="text" name="public_holidays_description" placeholder="Some New Description"/>
-            <%- @Icon('plus') %>
-
+          <td>
+            <div class="settings-list-rowControls">
+              <div class="btn btn--text js-remove">
+                <%- @Icon('trash') %> <%- @T('Remove') %>
+              </div>
+            </div>
+        <tr class="settings-list-controlRow">
+          <td>
+          <td>
+            <!-- Hallo Martin! Allow to add by pressing enter! -->
+            <input class="form-control form-control--small" type="date" name="public_holidays_date" placeholder="<%- @T('Date') %>"/>
+          <td>
+            <input class="form-control form-control--small" type="text" name="public_holidays_description" placeholder="<%- @T('Date Description') %>"/>
+          <td>
+            <div class="btn btn--text js-add">
+              <%- @Icon('plus-small') %> Add Date
+            </div>
       </tbody>
     </table>
   </div>
diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss
index 5a2345577..361cd20cd 100644
--- a/app/assets/stylesheets/zammad.css.scss
+++ b/app/assets/stylesheets/zammad.css.scss
@@ -294,6 +294,11 @@ span[data-tooltip]:hover:before {
   white-space: nowrap;
   vertical-align: middle;
   
+  .icon {
+    vertical-align: middle;
+    margin-top: -3px;
+  }
+  
   &:focus {
     box-shadow: 0 0 0 3px hsl(201,62%,90%);
   }
@@ -619,7 +624,6 @@ table {
 .radio-replacement {
   padding: 0;
   margin: 0;
-  height: 38px;
   @extend .u-clickable;
   display: flex;
   align-items: center;
@@ -635,6 +639,11 @@ table {
   display: none;
 }
 
+.table .checkbox-replacement,
+.table .radio-replacement {
+  height: 38px;
+}
+
 .table .priority.icon:after {
   background: #f8f9fa;
 }
@@ -801,6 +810,9 @@ label,
   display: inline;
   white-space: nowrap; /* for labels in tables that might get crushed view: calendar_subscriptions */
 }
+.inline-label .label-text {
+  margin-left: 3px;
+}
 
 fieldset {
   margin: 0 -4px;
@@ -1020,6 +1032,7 @@ input[type="checkbox"] {
 input[type=text],
 input[type=password],
 input[type=email],
+input[type=date],
 textarea,
 .form-control,
 .checkbox.form-group .checkbox {
@@ -1040,8 +1053,7 @@ textarea,
   appearance: none;
   
   &.form-control--small {
-    padding-top: 0;
-    padding-bottom: 0;
+    padding: 0 8px;
     height: 31px;
   }
 }
@@ -5823,7 +5835,6 @@ output {
     }
   }
   
-  
   th, td {
     padding: 10px;
     border: 1px solid hsl(198,18%,86%);
@@ -5849,6 +5860,14 @@ output {
     margin: 0;
   }
 
+  .btn.btn--text:not(.btn--secondary) {
+    color: hsl(60,1%,61%);
+  }
+
+  .btn .icon {
+    fill: hsl(60,1%,61%);
+  }
+
   th:not(:last-child),
   td:not(:last-child) {
     border-right: none;
@@ -5858,6 +5877,11 @@ output {
     border-bottom: none;
   }
 
+  tr.is-inactive td {
+    color: hsl(199,19%,80%);
+    text-decoration: line-through;
+  }
+
   thead th:first-child {
     border-top-left-radius: 4px;
   }
@@ -5896,6 +5920,12 @@ output {
       vertical-align: top;
     }
   }
+
+  .settings-list-controlRow {
+    td {
+      padding: 5px;
+    }
+  }
 }