diff --git a/app/assets/javascripts/app/controllers/_application_controller.js.coffee b/app/assets/javascripts/app/controllers/_application_controller.js.coffee
index 11bd1ac74..871f28bcc 100644
--- a/app/assets/javascripts/app/controllers/_application_controller.js.coffee
+++ b/app/assets/javascripts/app/controllers/_application_controller.js.coffee
@@ -557,6 +557,7 @@ class App.ControllerModal extends App.Controller
       backdrop: true
       keyboard: true
       close:    true
+      large:    false
       head:     '?'
       buttonClass: 'btn--success'
       centerButtons: []
@@ -565,6 +566,8 @@ class App.ControllerModal extends App.Controller
 
     options = _.extend( defaults, options )
 
+    @className += ' modal--large' if options.large
+
     super(options)
 
     if @shown
diff --git a/app/assets/javascripts/app/controllers/calendar.js.coffee b/app/assets/javascripts/app/controllers/calendar.js.coffee
index a196e264e..d794b2d0e 100644
--- a/app/assets/javascripts/app/controllers/calendar.js.coffee
+++ b/app/assets/javascripts/app/controllers/calendar.js.coffee
@@ -52,6 +52,7 @@ class Index extends App.ControllerContent
   newDialog: =>
     console.log('NEW')
     @newItemModal = new App.ControllerModal
+      large: true
       head: 'New Calendar'
       content: App.view('calendar/new')()
       button: 'Create'
diff --git a/app/assets/javascripts/app/controllers/layout_ref.js.coffee b/app/assets/javascripts/app/controllers/layout_ref.js.coffee
index 09aaab3d1..03f3851c9 100644
--- a/app/assets/javascripts/app/controllers/layout_ref.js.coffee
+++ b/app/assets/javascripts/app/controllers/layout_ref.js.coffee
@@ -1600,7 +1600,7 @@ class PrimaryEmailRef extends App.ControllerContent
     @render()
 
   render: ->
-    @html App.view('layout_ref/primary_email')
+    @html App.view('layout_ref/primary_email')()
 
 App.Config.set( 'layout_ref/primary_email', PrimaryEmailRef, 'Routes' )
 
diff --git a/app/assets/javascripts/app/views/calendar/new.jst.eco b/app/assets/javascripts/app/views/calendar/new.jst.eco
index 81a6e37a0..65755f9b1 100644
--- a/app/assets/javascripts/app/views/calendar/new.jst.eco
+++ b/app/assets/javascripts/app/views/calendar/new.jst.eco
@@ -12,7 +12,7 @@
   <div class="formGroup-label">
     <label for="name">Timezone <span>*</span></label>
   </div>
-  <div class="controls">
+  <div class="controls" style="position: relative">
 
     <select class="form-control js-selectTimezone" name="timezone">
       <option value="Africa/Abidjan">Africa/Abidjan (GMT0)</option>
@@ -563,98 +563,87 @@
     <label for="name">Business Hours <span>*</span></label>
   </div>
   <div class="controls">
-    <table class="settings-list">
+    <table class="settings-list settings-list--stretch settings-list--toggleColumn">
       <thead>
         <tr>
           <th style="text-align: center">
-            <%- @T('Day') %>
+            <label class="day-name"><input class="js-activateColumn" data-target="monday" type="checkbox" checked> Monday</label>
           <th style="text-align: center">
-            <%- @T('From/Till') %>
+            <label class="day-name"><input class="js-activateColumn" data-target="tuesday" type="checkbox" checked> Tuesday</label>
           <th style="text-align: center">
-            <%- @T('From/Till') %>
+            <label class="day-name"><input class="js-activateColumn" data-target="wednesday" type="checkbox" checked> Wednesday</label>
+          <th style="text-align: center">
+            <label class="day-name"><input class="js-activateColumn" data-target="thursday" type="checkbox" checked> Thursday</label>
+          <th style="text-align: center">
+            <label class="day-name"><input class="js-activateColumn" data-target="friday" type="checkbox" checked> Friday</label>
+          <th style="text-align: center">
+            <label class="day-name"><input class="js-activateColumn" data-target="saturday" type="checkbox"> Saturday</label>
+          <th style="text-align: center">
+            <label class="day-name"><input class="js-activateColumn" data-target="sunday" type="checkbox"> Sunday</label>
         </tr>
       </thead>
       <tbody>
         <tr>
-          <td><%- @T('Monday') %></td>
-          <td>
-            <input type="text" name="mon_start_time" value="07:00" class="time time--12 js-time">
-            <input type="text" name="mon_end_time" value="18:00" class="time time--12 js-time">
-          </td>
-          <td>
-            <input type="text" name="mon_start_time" value="" class="time time--12 js-time">
-            <input type="text" name="mon_end_time" value="" class="time time--12 js-time">
-          </td>
+          <td data-column="monday" class="form-group day-time is-active">
+            <label for="monday_start_time">from</label>
+            <input type="text" id="monday_start_time" value="07:00" class="form-control form-control--small time js-time">
+            <label for="monday_end_time">till</label>
+            <input type="text" id="monday_end_time" value="18:00" class="form-control form-control--small time js-time">
+
+          <td data-column="tuesday" class="form-group day-time is-active">
+            <label for="tuesday_start_time">from</label>
+            <input type="text" id="tuesday_start_time" value="07:00" class="form-control form-control--small time js-time">
+            <label for="tuesday_end_time">till</label>
+            <input type="text" id="tuesday_end_time" value="18:00" class="form-control form-control--small time js-time">
+
+          <td data-column="wednesday" class="form-group day-time is-active">
+            <label for="wednesday_start_time">from</label>
+            <input type="text" id="wednesday_start_time" value="07:00" class="form-control form-control--small time js-time">
+            <label for="wednesday_end_time">till</label>
+            <input type="text" id="wednesday_end_time" value="18:00" class="form-control form-control--small time js-time">
+
+          <td data-column="thursday" class="form-group day-time is-active">
+            <label for="thursday_start_time">from</label>
+            <input type="text" id="thursday_start_time" value="07:00" class="form-control form-control--small time js-time">
+            <label for="thursday_end_time">till</label>
+            <input type="text" id="thursday_end_time" value="18:00" class="form-control form-control--small time js-time">
+
+          <td data-column="friday" class="form-group day-time is-active">
+            <label for="friday_start_time">from</label>
+            <input type="text" id="friday_start_time" value="07:00" class="form-control form-control--small time js-time">
+            <label for="friday_end_time">till</label>
+            <input type="text" id="friday_end_time" value="13:00" class="form-control form-control--small time js-time">
+
+          <td data-column="saturday" class="form-group day-time">
+            <label for="saturday_start_time">from</label>
+            <input type="text" id="saturday_start_time" value="07:00" class="form-control form-control--small time js-time">
+            <label for="saturday_end_time">till</label>
+            <input type="text" id="saturday_end_time" value="18:00" class="form-control form-control--small time js-time">
+
+          <td data-column="sunday" class="form-group day-time">
+            <label for="sunday_start_time">from</label>
+            <input type="text" id="sunday_start_time" value="07:00" class="form-control form-control--small time js-time">
+            <label for="sunday_end_time">till</label>
+            <input type="text" id="sunday_end_time" value="18:00" class="form-control form-control--small time js-time">
         </tr>
         <tr>
-          <td><%- @T('Tuesday') %></td>
-          <td>
-            <input type="text" name="tue_start_time" value="07:00" class="time time--12 js-time">
-            <input type="text" name="tue_end_time" value="18:00" class="time time--12 js-time">
-          </td>
-          <td>
-            <input type="text" name="tue_start_time" value="" class="time time--12 js-time">
-            <input type="text" name="tue_end_time" value="" class="time time--12 js-time">
-          </td>
-        </tr>
-        <tr>
-          <td><%- @T('Wednesday') %></td>
-          <td>
-            <input type="text" name="wed_start_time" value="07:00" class="time time--12 js-time">
-            <input type="text" name="wed_end_time" value="18:00" class="time time--12 js-time">
-          </td>
-          <td>
-            <input type="text" name="wed_start_time" value="" class="time time--12 js-time">
-            <input type="text" name="wed_end_time" value="" class="time time--12 js-time">
-          </td>
-        </tr>
-        <tr>
-          <td><%- @T('Thursday') %></td>
-          <td>
-            <input type="text" name="thu_start_time" value="07:00" class="time time--12 js-time">
-            <input type="text" name="thu_end_time" value="18:00" class="time time--12 js-time">
-          </td>
-          <td>
-            <input type="text" name="thu_start_time" value="" class="time time--12 js-time">
-            <input type="text" name="thu_end_time" value="" class="time time--12 js-time">
-          </td>
-        </tr>
-        <tr>
-          <td><%- @T('Friday') %></td>
-          <td>
-            <input type="text" name="fri_start_time" value="07:00" class="time time--12 js-time">
-            <input type="text" name="fri_end_time" value="18:00" class="time time--12 js-time">
-          </td>
-          <td>
-            <input type="text" name="fri_start_time" value="" class="time time--12 js-time">
-            <input type="text" name="fri_end_time" value="" class="time time--12 js-time">
-          </td>
-        </tr>
-        <tr>
-          <td><%- @T('Saturday') %></td>
-          <td>
-            <input type="text" name="sat_start_time" value="" class="time time--12 js-time">
-            <input type="text" name="sat_end_time" value="" class="time time--12 js-time">
-          </td>
-          <td>
-            <input type="text" name="sat_start_time" value="" class="time time--12 js-time">
-            <input type="text" name="sat_end_time" value="" class="time time--12 js-time">
-          </td>
-        </tr>
-        <tr>
-          <td><%- @T('Sunday') %></td>
-          <td>
-            <input type="text" name="sun_start_time" value="" class="time time--12 js-time">
-            <input type="text" name="sun_end_time" value="" class="time time--12 js-time">
-          </td>
-          <td>
-            <input type="text" name="sun_start_time" value="" class="time time--12 js-time">
-            <input type="text" name="sun_end_time" value="" class="time time--12 js-time">
-          </td>
+          <td data-column="monday" class="settings-list-action-cell js-add-time is-active">
+            <%- @Icon('plus') %>
+          <td data-column="tuesday" class="settings-list-action-cell js-add-time is-active">
+            <%- @Icon('plus') %>
+          <td data-column="wednesday" class="settings-list-action-cell js-add-time is-active">
+            <%- @Icon('plus') %>
+          <td data-column="thursday" class="settings-list-action-cell js-add-time is-active">
+            <%- @Icon('plus') %>
+          <td data-column="friday" class="settings-list-action-cell js-add-time is-active">
+            <%- @Icon('plus') %>
+          <td data-column="saturday" class="settings-list-action-cell js-add-time">
+            <%- @Icon('plus') %>
+          <td data-column="sunday" class="settings-list-action-cell js-add-time">
+            <%- @Icon('plus') %>
         </tr>
       </tbody>
     </table>
-
   </div>
 </div>
 
diff --git a/app/assets/javascripts/app/views/layout_ref/primary_email.jst.eco b/app/assets/javascripts/app/views/layout_ref/primary_email.jst.eco
index 10b577b84..43b8faed7 100644
--- a/app/assets/javascripts/app/views/layout_ref/primary_email.jst.eco
+++ b/app/assets/javascripts/app/views/layout_ref/primary_email.jst.eco
@@ -5,7 +5,7 @@
     <form>
       <div class="modal-content">
         <div class="modal-header">
-          <div class="modal-close js-close"></div>
+          <div class="modal-close js-close"><%- @Icon('diagonal-cross') %></div>
 
           <h1 class="modal-title">New: User</h1>
         </div>
diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss
index c71cb1180..62a77f236 100644
--- a/app/assets/stylesheets/zammad.css.scss
+++ b/app/assets/stylesheets/zammad.css.scss
@@ -779,7 +779,7 @@ label,
   display: block;
   font-size: 12px;
   font-weight: normal;
-  letter-spacing: 0.1em;
+  letter-spacing: 0.05em;
   margin-bottom: 4px;
   text-align: left;
   padding: 0;
@@ -1054,6 +1054,10 @@ input.time {
   box-sizing: content-box;
   padding: 0 6px;
   line-height: 42px;
+  
+  &.form-control--small {
+    line-height: 31px;
+  }
 }
 
 input.time.time--12 {
@@ -4514,6 +4518,9 @@ footer {
   margin-top: 35px;
   margin-bottom: 35px;
 }
+.modal--large .modal-dialog {
+  max-width: 740px;
+}
 .modal-dialog.wizard {
   max-width: 460px;
 }
@@ -5773,13 +5780,28 @@ output {
 }
 
 .form-group.day-time {
-  padding: 5px;
+  padding-bottom: 4px;
+  
+  label {
+    text-align: center; 
+  }
+
+  .form-control {
+    margin-left: auto;
+    margin-right: auto;
+    margin-bottom: 5px;
+  }
 }
 
 .settings-list {
   border-collapse: separate;
   color: hsl(60,1%,34%);
   background: white;
+  table-layout: auto;
+  
+  &.settings-list--stretch {
+    width: 100%;
+  }
   
   &:not(:last-child) {
     margin-bottom: 34px;
@@ -5799,7 +5821,7 @@ output {
   
   
   th, td {
-    padding: 10px;
+    padding: 5px;
     border: 1px solid hsl(198,18%,86%);
   }
   
@@ -5807,6 +5829,8 @@ output {
     font-weight: normal;
     text-transform: uppercase;
     font-size: 12px;
+    padding-top: 8px;
+    padding-bottom: 8px;
     letter-spacing: 1px;
     background: hsl(197,20%,93%);
     border-bottom: none;
@@ -5853,6 +5877,23 @@ output {
   }
 }
 
+.settings-list-action-cell {
+  @extend .u-clickable;
+  text-align: center;
+  background: hsl(197,22%,96%);
+  
+  &:hover {
+    .icon {
+      fill: hsl(60,1%,34%);
+    }
+  }
+  
+  .icon {
+    fill: hsl(198,19%,72%);
+    vertical-align: top;
+  }
+}
+
 
 .select-boxes {
   display: flex;