diff --git a/src/Squidex/app/features/content/pages/content/content-field.component.html b/src/Squidex/app/features/content/pages/content/content-field.component.html
index ead778762..0f880e2e6 100644
--- a/src/Squidex/app/features/content/pages/content/content-field.component.html
+++ b/src/Squidex/app/features/content/pages/content/content-field.component.html
@@ -56,7 +56,7 @@
                             </div>
                         </div>
                     </div><div *ngSwitchCase="'dateTime'">
-                        <sqx-date-time-editor [mode]="field.properties.editor" [formControlName]="language"></sqx-date-time-editor>
+                        <sqx-date-time-editor enforceTime="true" [mode]="field.properties.editor" [formControlName]="language"></sqx-date-time-editor>
                     </div>
                     <div *ngSwitchCase="'boolean'">
                         <div [ngSwitch]="field.properties.editor">
diff --git a/src/Squidex/app/features/schemas/pages/schema/types/date-time-ui.component.html b/src/Squidex/app/features/schemas/pages/schema/types/date-time-ui.component.html
index 8f66a87ba..ed868dabf 100644
--- a/src/Squidex/app/features/schemas/pages/schema/types/date-time-ui.component.html
+++ b/src/Squidex/app/features/schemas/pages/schema/types/date-time-ui.component.html
@@ -24,7 +24,7 @@
             <label class="btn btn-radio" [class.active]="editForm.controls.editor.value === 'DateTime'">
                 <input type="radio" class="radio-input" formControlName="editor" value="DateTime" />
 
-                <i class="icon-control-datetime"></i>
+                <i class="icon-control-date-time"></i>
 
                 <span class="radio-label" clas>DateTime</span>
             </label>
diff --git a/src/Squidex/app/features/settings/pages/clients/clients-page.component.html b/src/Squidex/app/features/settings/pages/clients/clients-page.component.html
index df59e5a9e..16d74a829 100644
--- a/src/Squidex/app/features/settings/pages/clients/clients-page.component.html
+++ b/src/Squidex/app/features/settings/pages/clients/clients-page.component.html
@@ -13,10 +13,6 @@
 
     <div class="panel-main">
         <div class="panel-content panel-content-scroll">
-            <div><sqx-date-time-editor mode="DateTime" ngModel="other"></sqx-date-time-editor></div>
-            <div><sqx-date-time-editor mode="Date" ngModel="2013-01-01T00:00:00-13:00"></sqx-date-time-editor></div>
-            <div><sqx-date-time-editor mode="DateTime" ngModel="2013-01-01T00:00:00-13:00"></sqx-date-time-editor></div>
-
             <div class="table-items-row" *ngIf="appClients && appClients.length === 0">
                 No client created yet.
             </div>
diff --git a/src/Squidex/app/framework/angular/date-time-editor.component.ts b/src/Squidex/app/framework/angular/date-time-editor.component.ts
index 9466eec83..2d5bc9e0a 100644
--- a/src/Squidex/app/framework/angular/date-time-editor.component.ts
+++ b/src/Squidex/app/framework/angular/date-time-editor.component.ts
@@ -93,11 +93,11 @@ export class DateTimeEditorComponent implements ControlValueAccessor, OnInit, Af
 
     public setDisabledState(isDisabled: boolean): void {
         if (isDisabled) {
-            this.dateControl.disable();
-            this.timeControl.disable();
+            this.dateControl.disable({ emitEvent: false });
+            this.timeControl.disable({ emitEvent: false });
         } else {
-            this.dateControl.enable();
-            this.timeControl.enable();
+            this.dateControl.enable({ emitEvent: false });
+            this.timeControl.enable({ emitEvent: false });
         }
     }
 
@@ -112,6 +112,9 @@ export class DateTimeEditorComponent implements ControlValueAccessor, OnInit, Af
     public ngAfterViewInit() {
         this.picker = new Pikaday({ field: this.dateInput.nativeElement, format: 'YYYY-MM-DD',
             onSelect: () => {
+                if (this.suppressEvents) {
+                    return;
+                }
                 this.dateValue = this.picker.getMoment();
 
                 this.updateValue();
@@ -145,8 +148,6 @@ export class DateTimeEditorComponent implements ControlValueAccessor, OnInit, Af
             }
         }
 
-        console.error(result);
-
         this.changeCallback(result);
     }
 
@@ -160,7 +161,7 @@ export class DateTimeEditorComponent implements ControlValueAccessor, OnInit, Af
         if (this.timeValue && this.timeValue.isValid()) {
             this.timeControl.setValue(this.timeValue.format('HH:mm:ss'), { emitEvent: false });
         }
-        if (this.dateValue && this.dateValue.isValid()) {
+        if (this.dateValue && this.dateValue.isValid() && this.picker) {
             this.dateControl.setValue(this.dateValue.format('YYYY-MM-DD'), { emitEvent: false });
 
             this.picker.setMoment(this.dateValue);
diff --git a/src/Squidex/app/shared/services/schemas.service.spec.ts b/src/Squidex/app/shared/services/schemas.service.spec.ts
index bbcb471be..d7ca5a9ed 100644
--- a/src/Squidex/app/shared/services/schemas.service.spec.ts
+++ b/src/Squidex/app/shared/services/schemas.service.spec.ts
@@ -99,7 +99,7 @@ describe('SchemasService', () => {
                             lastModified: '2017-12-12T10:10',
                             lastModifiedBy: 'LastModifiedBy1',
                             fields: [{
-                                fieldId: 123,
+                                fieldId: 1,
                                 name: 'field1',
                                 isHidden: true,
                                 isDisabled: true,
@@ -107,7 +107,7 @@ describe('SchemasService', () => {
                                     fieldType: 'number'
                                 }
                             }, {
-                                fieldId: 234,
+                                fieldId: 2,
                                 name: 'field2',
                                 isHidden: true,
                                 isDisabled: true,
@@ -115,13 +115,21 @@ describe('SchemasService', () => {
                                     fieldType: 'string'
                                 }
                             }, {
-                                fieldId: 345,
+                                fieldId: 3,
                                 name: 'field3',
                                 isHidden: true,
                                 isDisabled: true,
                                 properties: {
                                     fieldType: 'boolean'
                                 }
+                            }, {
+                                fieldId: 4,
+                                name: 'field4',
+                                isHidden: true,
+                                isDisabled: true,
+                                properties: {
+                                    fieldType: 'dateTime'
+                                }
                             }]
                         }
                     })
@@ -139,9 +147,10 @@ describe('SchemasService', () => {
             new SchemaDetailsDto('id1', 'name1', 'label1', 'hints1', true, 'Created1', 'LastModifiedBy1',
                 DateTime.parseISO_UTC('2016-12-12T10:10'),
                 DateTime.parseISO_UTC('2017-12-12T10:10'), [
-                    new FieldDto(123, 'field1', true, true, createProperties('number')),
-                    new FieldDto(234, 'field2', true, true, createProperties('string')),
-                    new FieldDto(345, 'field3', true, true, createProperties('boolean'))
+                    new FieldDto(1, 'field1', true, true, createProperties('number')),
+                    new FieldDto(2, 'field2', true, true, createProperties('string')),
+                    new FieldDto(3, 'field3', true, true, createProperties('boolean')),
+                    new FieldDto(4, 'field4', true, true, createProperties('dateTime'))
                 ]));
 
         authService.verifyAll();
diff --git a/src/Squidex/app/theme/_bootstrap.scss b/src/Squidex/app/theme/_bootstrap.scss
index a6d9f71c1..beb1ee90a 100644
--- a/src/Squidex/app/theme/_bootstrap.scss
+++ b/src/Squidex/app/theme/_bootstrap.scss
@@ -182,7 +182,7 @@ body {
             & {
                 @include box-shadow(0, 0, 10px, .5);
                 background: $color-theme-blue;
-                border: 0;
+                border-color: $color-theme-blue;
                 color: $color-accent-dark;
             }
 
diff --git a/src/Squidex/app/theme/icomoon/demo.html b/src/Squidex/app/theme/icomoon/demo.html
index eeae76328..e7bb54eb1 100644
--- a/src/Squidex/app/theme/icomoon/demo.html
+++ b/src/Squidex/app/theme/icomoon/demo.html
@@ -9,7 +9,7 @@
     <link rel="stylesheet" href="style.css"></head>
 <body>
     <div class="bgc1 clearfix">
-        <h1 class="mhmm mvm"><span class="fgc1">Font Name:</span> icomoon <small class="fgc1">(Glyphs:&nbsp;54)</small></h1>
+        <h1 class="mhmm mvm"><span class="fgc1">Font Name:</span> icomoon <small class="fgc1">(Glyphs:&nbsp;56)</small></h1>
     </div>
     <div class="clearfix mhl ptl">
         <h1 class="mvm mtn fgc1">Grid Size: 32</h1>
@@ -147,6 +147,38 @@
     </div>
     <div class="clearfix mhl ptl">
         <h1 class="mvm mtn fgc1">Grid Size: 14</h1>
+        <div class="glyph fs3">
+            <div class="clearfix bshadow0 pbs">
+                <span class="icon-control-date">
+                
+                </span>
+                <span class="mls"> icon-control-date</span>
+            </div>
+            <fieldset class="fs0 size1of1 clearfix hidden-false">
+                <input type="text" readonly value="e936" class="unit size1of2" />
+                <input type="text" maxlength="1" readonly value="&#xe936;" class="unitRight size1of2 talign-right" />
+            </fieldset>
+            <div class="fs0 bshadow0 clearfix hidden-true">
+                <span class="unit pvs fgc1">liga: </span>
+                <input type="text" readonly value="" class="liga unitRight" />
+            </div>
+        </div>
+        <div class="glyph fs3">
+            <div class="clearfix bshadow0 pbs">
+                <span class="icon-control-date-time">
+                
+                </span>
+                <span class="mls"> icon-control-date-time</span>
+            </div>
+            <fieldset class="fs0 size1of1 clearfix hidden-false">
+                <input type="text" readonly value="e937" class="unit size1of2" />
+                <input type="text" maxlength="1" readonly value="&#xe937;" class="unitRight size1of2 talign-right" />
+            </fieldset>
+            <div class="fs0 bshadow0 clearfix hidden-true">
+                <span class="unit pvs fgc1">liga: </span>
+                <input type="text" readonly value="" class="liga unitRight" />
+            </div>
+        </div>
         <div class="glyph fs3">
             <div class="clearfix bshadow0 pbs">
                 <span class="icon-angle-right">
diff --git a/src/Squidex/app/theme/icomoon/fonts/icomoon.eot b/src/Squidex/app/theme/icomoon/fonts/icomoon.eot
index fe8a0f34d..19060baeb 100644
Binary files a/src/Squidex/app/theme/icomoon/fonts/icomoon.eot and b/src/Squidex/app/theme/icomoon/fonts/icomoon.eot differ
diff --git a/src/Squidex/app/theme/icomoon/fonts/icomoon.svg b/src/Squidex/app/theme/icomoon/fonts/icomoon.svg
index 9b0c9cf44..a05f0975a 100644
--- a/src/Squidex/app/theme/icomoon/fonts/icomoon.svg
+++ b/src/Squidex/app/theme/icomoon/fonts/icomoon.svg
@@ -61,4 +61,6 @@
 <glyph unicode="&#xe933;" glyph-name="unlocked" d="M768 896c105.87 0 192-86.13 192-192v-192h-128v192c0 35.29-28.71 64-64 64h-128c-35.29 0-64-28.71-64-64v-192h16c26.4 0 48-21.6 48-48v-480c0-26.4-21.6-48-48-48h-544c-26.4 0-48 21.6-48 48v480c0 26.4 21.6 48 48 48h400v192c0 105.87 86.13 192 192 192h128z" />
 <glyph unicode="&#xe934;" glyph-name="lock" d="M592 512h-16v192c0 105.87-86.13 192-192 192h-128c-105.87 0-192-86.13-192-192v-192h-16c-26.4 0-48-21.6-48-48v-480c0-26.4 21.6-48 48-48h544c26.4 0 48 21.6 48 48v480c0 26.4-21.6 48-48 48zM192 704c0 35.29 28.71 64 64 64h128c35.29 0 64-28.71 64-64v-192h-256v192z" />
 <glyph unicode="&#xe935;" glyph-name="browser" horiz-adv-x="1344" d="M1328 640c-8.832 0-16-7.168-16-16v-640c0-8.832-7.168-16-16-16h-1248c-8.832 0-16 7.168-16 16v640c0 8.832-7.168 16-16 16s-16-7.168-16-16v-640c0-26.464 21.536-48 48-48h1248c26.464 0 48 21.536 48 48v640c0 8.832-7.168 16-16 16zM1296 960h-1248c-26.464 0-48-21.536-48-48v-192c0-8.832 7.168-16 16-16h1312c8.832 0 16 7.168 16 16v192c0 26.464-21.536 48-48 48zM1312 736h-1280v176c0 8.832 7.168 16 16 16h1248c8.832 0 16-7.168 16-16v-176zM560 64c8.832 0 16 7.168 16 16v512c0 8.832-7.168 16-16 16h-416c-8.832 0-16-7.168-16-16v-512c0-8.832 7.168-16 16-16h416zM160 576h384v-480h-384v480zM720 480h480c8.832 0 16 7.168 16 16s-7.168 16-16 16h-480c-8.832 0-16-7.168-16-16s7.168-16 16-16zM720 320h480c8.832 0 16 7.168 16 16s-7.168 16-16 16h-480c-8.832 0-16-7.168-16-16s7.168-16 16-16zM720 160h480c8.832 0 16 7.168 16 16s-7.168 16-16 16h-480c-8.832 0-16-7.168-16-16s7.168-16 16-16zM96 832c0-17.673 14.327-32 32-32s32 14.327 32 32c0 17.673-14.327 32-32 32s-32-14.327-32-32zM224 832c0-17.673 14.327-32 32-32s32 14.327 32 32c0 17.673-14.327 32-32 32s-32-14.327-32-32zM352 832c0-17.673 14.327-32 32-32s32 14.327 32 32c0 17.673-14.327 32-32 32s-32-14.327-32-32z" />
+<glyph unicode="&#xe936;" glyph-name="control-date" d="M947.2 848.457h-128v25.6c0 14.131-11.469 25.6-25.6 25.6s-25.6-11.469-25.6-25.6v-25.6h-512v25.6c0 14.131-11.52 25.6-25.6 25.6s-25.6-11.469-25.6-25.6v-25.6h-128c-42.342 0-76.8-34.458-76.8-76.8v-716.8c0-42.342 34.458-76.8 76.8-76.8h870.4c42.342 0 76.8 34.458 76.8 76.8v716.8c0 42.342-34.458 76.8-76.8 76.8zM972.8 54.857c0-14.131-11.469-25.6-25.6-25.6h-870.4c-14.080 0-25.6 11.469-25.6 25.6v537.6h921.6v-537.6zM972.8 643.657h-921.6v128c0 14.080 11.52 25.6 25.6 25.6h128v-76.8c0-14.080 11.52-25.6 25.6-25.6s25.6 11.52 25.6 25.6v76.8h512v-76.8c0-14.080 11.469-25.6 25.6-25.6s25.6 11.52 25.6 25.6v76.8h128c14.131 0 25.6-11.52 25.6-25.6v-128zM332.8 438.857h51.2c14.080 0 25.6 11.52 25.6 25.6s-11.52 25.6-25.6 25.6h-51.2c-14.080 0-25.6-11.52-25.6-25.6s11.52-25.6 25.6-25.6zM486.4 438.857h51.2c14.131 0 25.6 11.52 25.6 25.6s-11.469 25.6-25.6 25.6h-51.2c-14.080 0-25.6-11.52-25.6-25.6s11.52-25.6 25.6-25.6zM640 438.857h51.2c14.131 0 25.6 11.52 25.6 25.6s-11.469 25.6-25.6 25.6h-51.2c-14.131 0-25.6-11.52-25.6-25.6s11.469-25.6 25.6-25.6zM793.6 438.857h51.2c14.131 0 25.6 11.52 25.6 25.6s-11.469 25.6-25.6 25.6h-51.2c-14.131 0-25.6-11.52-25.6-25.6s11.469-25.6 25.6-25.6zM179.2 336.457h51.2c14.080 0 25.6 11.469 25.6 25.6s-11.52 25.6-25.6 25.6h-51.2c-14.080 0-25.6-11.469-25.6-25.6s11.52-25.6 25.6-25.6zM332.8 336.457h51.2c14.080 0 25.6 11.469 25.6 25.6s-11.52 25.6-25.6 25.6h-51.2c-14.080 0-25.6-11.469-25.6-25.6s11.52-25.6 25.6-25.6zM486.4 336.457h51.2c14.131 0 25.6 11.469 25.6 25.6s-11.469 25.6-25.6 25.6h-51.2c-14.080 0-25.6-11.469-25.6-25.6s11.52-25.6 25.6-25.6zM640 336.457h51.2c14.131 0 25.6 11.469 25.6 25.6s-11.469 25.6-25.6 25.6h-51.2c-14.131 0-25.6-11.469-25.6-25.6s11.469-25.6 25.6-25.6zM793.6 336.457h51.2c14.131 0 25.6 11.469 25.6 25.6s-11.469 25.6-25.6 25.6h-51.2c-14.131 0-25.6-11.469-25.6-25.6s11.469-25.6 25.6-25.6zM179.2 234.057h51.2c14.080 0 25.6 11.469 25.6 25.6s-11.52 25.6-25.6 25.6h-51.2c-14.080 0-25.6-11.469-25.6-25.6s11.52-25.6 25.6-25.6zM332.8 234.057h51.2c14.080 0 25.6 11.469 25.6 25.6s-11.52 25.6-25.6 25.6h-51.2c-14.080 0-25.6-11.469-25.6-25.6s11.52-25.6 25.6-25.6zM486.4 234.057h51.2c14.131 0 25.6 11.469 25.6 25.6s-11.469 25.6-25.6 25.6h-51.2c-14.080 0-25.6-11.469-25.6-25.6s11.52-25.6 25.6-25.6zM640 234.057h51.2c14.131 0 25.6 11.469 25.6 25.6s-11.469 25.6-25.6 25.6h-51.2c-14.131 0-25.6-11.469-25.6-25.6s11.469-25.6 25.6-25.6zM793.6 234.057h51.2c14.131 0 25.6 11.469 25.6 25.6s-11.469 25.6-25.6 25.6h-51.2c-14.131 0-25.6-11.469-25.6-25.6s11.469-25.6 25.6-25.6zM179.2 131.657h51.2c14.080 0 25.6 11.469 25.6 25.6s-11.52 25.6-25.6 25.6h-51.2c-14.080 0-25.6-11.469-25.6-25.6s11.52-25.6 25.6-25.6zM332.8 131.657h51.2c14.080 0 25.6 11.469 25.6 25.6s-11.52 25.6-25.6 25.6h-51.2c-14.080 0-25.6-11.469-25.6-25.6s11.52-25.6 25.6-25.6zM486.4 131.657h51.2c14.131 0 25.6 11.469 25.6 25.6s-11.469 25.6-25.6 25.6h-51.2c-14.080 0-25.6-11.469-25.6-25.6s11.52-25.6 25.6-25.6zM640 131.657h51.2c14.131 0 25.6 11.469 25.6 25.6s-11.469 25.6-25.6 25.6h-51.2c-14.131 0-25.6-11.469-25.6-25.6s11.469-25.6 25.6-25.6zM793.6 131.657h51.2c14.131 0 25.6 11.469 25.6 25.6s-11.469 25.6-25.6 25.6h-51.2c-14.131 0-25.6-11.469-25.6-25.6s11.469-25.6 25.6-25.6z" />
+<glyph unicode="&#xe937;" glyph-name="control-date-time" d="M486.4 541.257h51.2c14.080 0 25.6-11.52 25.6-25.6s-11.52-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.52-25.6 25.6s11.52 25.6 25.6 25.6zM230.4 336.457c14.080 0 25.6-11.469 25.6-25.6s-11.52-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.469-25.6 25.6s11.52 25.6 25.6 25.6h51.2zM230.4 438.857c14.080 0 25.6-11.469 25.6-25.6s-11.52-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.469-25.6 25.6s11.52 25.6 25.6 25.6h51.2zM51.2 208.457v435.2h665.6v-102.4h51.2v281.6c0 42.342-34.458 76.8-76.8 76.8h-128v25.6c0 14.131-11.469 25.6-25.6 25.6s-25.6-11.469-25.6-25.6v-25.6h-256v25.6c0 14.131-11.52 25.6-25.6 25.6s-25.6-11.469-25.6-25.6v-25.6h-128c-42.342 0-76.8-34.458-76.8-76.8v-614.4c0-42.342 34.458-76.8 76.8-76.8h332.8v51.2h-332.8c-14.080 0-25.6 11.469-25.6 25.6zM51.2 822.857c0 14.080 11.52 25.6 25.6 25.6h128v-76.8c0-14.080 11.52-25.6 25.6-25.6s25.6 11.52 25.6 25.6v76.8h256v-76.8c0-14.080 11.469-25.6 25.6-25.6s25.6 11.52 25.6 25.6v76.8h128c14.131 0 25.6-11.52 25.6-25.6v-128h-665.6v128zM384 541.257c14.080 0 25.6-11.52 25.6-25.6s-11.52-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.52-25.6 25.6s11.52 25.6 25.6 25.6h51.2zM742.4 490.057c-155.546 0-281.6-126.054-281.6-281.6s126.054-281.6 281.6-281.6 281.6 126.054 281.6 281.6-126.054 281.6-281.6 281.6zM742.4-21.943c-127.232 0-230.4 103.168-230.4 230.4s103.168 230.4 230.4 230.4 230.4-103.168 230.4-230.4-103.168-230.4-230.4-230.4zM384 438.857c14.080 0 25.6-11.469 25.6-25.6s-11.52-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.469-25.6 25.6s11.52 25.6 25.6 25.6h51.2zM384 336.457c14.080 0 25.6-11.469 25.6-25.6s-11.52-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.469-25.6 25.6s11.52 25.6 25.6 25.6h51.2zM844.8 234.057c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6h-102.4c-14.131 0-25.6 11.469-25.6 25.6v102.4c0 14.131 11.469 25.6 25.6 25.6s25.6-11.469 25.6-25.6v-76.8h76.8z" />
 </font></defs></svg>
\ No newline at end of file
diff --git a/src/Squidex/app/theme/icomoon/fonts/icomoon.ttf b/src/Squidex/app/theme/icomoon/fonts/icomoon.ttf
index ab2ac0408..cb25cfb2c 100644
Binary files a/src/Squidex/app/theme/icomoon/fonts/icomoon.ttf and b/src/Squidex/app/theme/icomoon/fonts/icomoon.ttf differ
diff --git a/src/Squidex/app/theme/icomoon/fonts/icomoon.woff b/src/Squidex/app/theme/icomoon/fonts/icomoon.woff
index 1a3044c82..b3b3e88f8 100644
Binary files a/src/Squidex/app/theme/icomoon/fonts/icomoon.woff and b/src/Squidex/app/theme/icomoon/fonts/icomoon.woff differ
diff --git a/src/Squidex/app/theme/icomoon/icons/client.svg b/src/Squidex/app/theme/icomoon/icons/client.svg
new file mode 100644
index 000000000..bc0e64a7c
--- /dev/null
+++ b/src/Squidex/app/theme/icomoon/icons/client.svg
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="64px" height="64px" viewBox="0 0 64 64" enable-background="new 0 0 64 64" xml:space="preserve">
+<path fill-rule="evenodd" clip-rule="evenodd" fill="#D3DBE2" d="M32,0c17.672,0,32,14.327,32,32c0,17.673-14.328,32-32,32
+	C14.326,64,0,49.673,0,32C0,14.327,14.326,0,32,0z"/>
+<g>
+	<defs>
+		<circle id="SVGID_1_" cx="32" cy="32" r="32"/>
+	</defs>
+	<clipPath id="SVGID_2_">
+		<use xlink:href="#SVGID_1_"  overflow="visible"/>
+	</clipPath>
+	<g clip-path="url(#SVGID_2_)">
+		<g>
+			<path fill="#95A1AC" d="M27,28c0-1.104-0.896-2-2-2s-2,0.896-2,2s0.896,2,2,2S27,29.104,27,28z M39,26c-1.104,0-2,0.896-2,2
+				s0.896,2,2,2s2-0.896,2-2S40.104,26,39,26z M37,36H27c-0.552,0-1,0.447-1,1s0.448,1,1,1h10c0.553,0,1-0.447,1-1S37.553,36,37,36z
+				 M50.861,26.479C50.941,26.335,51,26.177,51,26v-7.277c0.596-0.347,1-0.984,1-1.723c0-1.104-0.896-2-2-2s-2,0.896-2,2
+				c0,0.738,0.404,1.376,1,1.723V26h-2v-2c0-2.209-1.791-4-4-4H21c-2.209,0-4,1.791-4,4v2h-2v-7.277c0.595-0.347,1-0.984,1-1.723
+				c0-1.104-0.896-2-2-2s-2,0.896-2,2c0,0.738,0.405,1.376,1,1.723V26c0,0.177,0.059,0.335,0.139,0.479
+				C11.873,27.15,11,28.467,11,30v4c0,2.209,1.791,4,4,4h2v2c0,2.209,1.791,4,4,4h6v3h-3c-2.209,0-4,1.791-4,4v16
+				c0,2.209,1.791,4,4,4h16c2.209,0,4-1.791,4-4V51c0-2.209-1.791-4-4-4h-3v-3h6c2.209,0,4-1.791,4-4v-2h2c2.209,0,4-1.791,4-4v-4
+				C53,28.467,52.127,27.15,50.861,26.479z M35,47h-6v-3h6V47z M45,40c0,1.104-0.896,2-2,2H21c-1.104,0-2-0.896-2-2V24
+				c0-1.104,0.896-2,2-2h22c1.104,0,2,0.896,2,2V40z"/>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/src/Squidex/app/theme/icomoon/icons/control-date-time.svg b/src/Squidex/app/theme/icomoon/icons/control-date-time.svg
new file mode 100644
index 000000000..8467eecaa
--- /dev/null
+++ b/src/Squidex/app/theme/icomoon/icons/control-date-time.svg
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   width="20px"
+   height="20px"
+   viewBox="0 0 20 20"
+   enable-background="new 0 0 20 20"
+   xml:space="preserve"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="control-date-time.svg"><metadata
+     id="metadata13"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs11" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="742"
+     inkscape:window-height="480"
+     id="namedview9"
+     showgrid="false"
+     inkscape:zoom="11.8"
+     inkscape:cx="10"
+     inkscape:cy="10"
+     inkscape:window-x="2884"
+     inkscape:window-y="162"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="Layer_1" /><g
+     id="g3"
+     style="fill:#000000"><g
+       id="g5"
+       style="fill:#000000"><path
+         fill-rule="evenodd"
+         clip-rule="evenodd"
+         fill="#A1B0B5"
+         d="M9.5,8C9.225,8,9,8.225,9,8.5S9.225,9,9.5,9h1    C10.775,9,11,8.775,11,8.5S10.775,8,10.5,8H9.5z M4.5,12h-1C3.225,12,3,12.224,3,12.5S3.225,13,3.5,13h1C4.775,13,5,12.776,5,12.5    S4.775,12,4.5,12z M4.5,10h-1C3.225,10,3,10.224,3,10.5S3.225,11,3.5,11h1C4.775,11,5,10.776,5,10.5S4.775,10,4.5,10z M1,14.5V6    h13v2h1V2.5C15,1.673,14.327,1,13.5,1H11V0.5C11,0.224,10.776,0,10.5,0S10,0.224,10,0.5V1H5V0.5C5,0.224,4.775,0,4.5,0    S4,0.224,4,0.5V1H1.5C0.673,1,0,1.673,0,2.5v12C0,15.327,0.673,16,1.5,16H8v-1H1.5C1.225,15,1,14.776,1,14.5z M1,2.5    C1,2.225,1.225,2,1.5,2H4v1.5C4,3.775,4.225,4,4.5,4S5,3.775,5,3.5V2h5v1.5C10,3.775,10.224,4,10.5,4S11,3.775,11,3.5V2h2.5    C13.776,2,14,2.225,14,2.5V5H1V2.5z M7.5,8h-1C6.225,8,6,8.225,6,8.5S6.225,9,6.5,9h1C7.775,9,8,8.775,8,8.5S7.775,8,7.5,8z     M14.5,9C11.462,9,9,11.462,9,14.5s2.462,5.5,5.5,5.5s5.5-2.462,5.5-5.5S17.538,9,14.5,9z M14.5,19c-2.485,0-4.5-2.015-4.5-4.5    s2.015-4.5,4.5-4.5s4.5,2.015,4.5,4.5S16.985,19,14.5,19z M7.5,10h-1C6.225,10,6,10.224,6,10.5S6.225,11,6.5,11h1    C7.775,11,8,10.776,8,10.5S7.775,10,7.5,10z M7.5,12h-1C6.225,12,6,12.224,6,12.5S6.225,13,6.5,13h1C7.775,13,8,12.776,8,12.5    S7.775,12,7.5,12z M16.5,14H15v-1.5c0-0.276-0.224-0.5-0.5-0.5S14,12.224,14,12.5v2c0,0.276,0.224,0.5,0.5,0.5h2    c0.276,0,0.5-0.224,0.5-0.5S16.776,14,16.5,14z"
+         id="path7"
+         style="fill:#000000" /></g></g></svg>
\ No newline at end of file
diff --git a/src/Squidex/app/theme/icomoon/icons/control-date.svg b/src/Squidex/app/theme/icomoon/icons/control-date.svg
new file mode 100644
index 000000000..60865ecd4
--- /dev/null
+++ b/src/Squidex/app/theme/icomoon/icons/control-date.svg
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   width="20px"
+   height="20px"
+   viewBox="0 0 20 20"
+   enable-background="new 0 0 20 20"
+   xml:space="preserve"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="control-date.svg"><metadata
+     id="metadata13"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs11" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     id="namedview9"
+     showgrid="false"
+     inkscape:zoom="11.8"
+     inkscape:cx="10"
+     inkscape:cy="10"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Layer_1" /><g
+     id="g3"
+     style="fill:#000000"><g
+       id="g5"
+       style="fill:#000000"><path
+         fill="#A1B0B5"
+         d="M18.5,2H16V1.5C16,1.224,15.776,1,15.5,1S15,1.224,15,1.5V2H5V1.5C5,1.224,4.775,1,4.5,1S4,1.224,4,1.5V2    H1.5C0.673,2,0,2.673,0,3.5v14C0,18.327,0.673,19,1.5,19h17c0.827,0,1.5-0.673,1.5-1.5v-14C20,2.673,19.327,2,18.5,2z M19,17.5    c0,0.276-0.224,0.5-0.5,0.5h-17C1.225,18,1,17.776,1,17.5V7h18V17.5z M19,6H1V3.5C1,3.225,1.225,3,1.5,3H4v1.5    C4,4.775,4.225,5,4.5,5S5,4.775,5,4.5V3h10v1.5C15,4.775,15.224,5,15.5,5S16,4.775,16,4.5V3h2.5C18.776,3,19,3.225,19,3.5V6z     M6.5,10h1C7.775,10,8,9.775,8,9.5S7.775,9,7.5,9h-1C6.225,9,6,9.225,6,9.5S6.225,10,6.5,10z M9.5,10h1c0.276,0,0.5-0.225,0.5-0.5    S10.776,9,10.5,9h-1C9.225,9,9,9.225,9,9.5S9.225,10,9.5,10z M12.5,10h1c0.276,0,0.5-0.225,0.5-0.5S13.776,9,13.5,9h-1    C12.224,9,12,9.225,12,9.5S12.224,10,12.5,10z M15.5,10h1c0.276,0,0.5-0.225,0.5-0.5S16.776,9,16.5,9h-1C15.224,9,15,9.225,15,9.5    S15.224,10,15.5,10z M3.5,12h1C4.775,12,5,11.776,5,11.5S4.775,11,4.5,11h-1C3.225,11,3,11.224,3,11.5S3.225,12,3.5,12z M6.5,12h1    C7.775,12,8,11.776,8,11.5S7.775,11,7.5,11h-1C6.225,11,6,11.224,6,11.5S6.225,12,6.5,12z M9.5,12h1c0.276,0,0.5-0.224,0.5-0.5    S10.776,11,10.5,11h-1C9.225,11,9,11.224,9,11.5S9.225,12,9.5,12z M12.5,12h1c0.276,0,0.5-0.224,0.5-0.5S13.776,11,13.5,11h-1    c-0.276,0-0.5,0.224-0.5,0.5S12.224,12,12.5,12z M15.5,12h1c0.276,0,0.5-0.224,0.5-0.5S16.776,11,16.5,11h-1    c-0.276,0-0.5,0.224-0.5,0.5S15.224,12,15.5,12z M3.5,14h1C4.775,14,5,13.776,5,13.5S4.775,13,4.5,13h-1C3.225,13,3,13.224,3,13.5    S3.225,14,3.5,14z M6.5,14h1C7.775,14,8,13.776,8,13.5S7.775,13,7.5,13h-1C6.225,13,6,13.224,6,13.5S6.225,14,6.5,14z M9.5,14h1    c0.276,0,0.5-0.224,0.5-0.5S10.776,13,10.5,13h-1C9.225,13,9,13.224,9,13.5S9.225,14,9.5,14z M12.5,14h1    c0.276,0,0.5-0.224,0.5-0.5S13.776,13,13.5,13h-1c-0.276,0-0.5,0.224-0.5,0.5S12.224,14,12.5,14z M15.5,14h1    c0.276,0,0.5-0.224,0.5-0.5S16.776,13,16.5,13h-1c-0.276,0-0.5,0.224-0.5,0.5S15.224,14,15.5,14z M3.5,16h1    C4.775,16,5,15.776,5,15.5S4.775,15,4.5,15h-1C3.225,15,3,15.224,3,15.5S3.225,16,3.5,16z M6.5,16h1C7.775,16,8,15.776,8,15.5    S7.775,15,7.5,15h-1C6.225,15,6,15.224,6,15.5S6.225,16,6.5,16z M9.5,16h1c0.276,0,0.5-0.224,0.5-0.5S10.776,15,10.5,15h-1    C9.225,15,9,15.224,9,15.5S9.225,16,9.5,16z M12.5,16h1c0.276,0,0.5-0.224,0.5-0.5S13.776,15,13.5,15h-1    c-0.276,0-0.5,0.224-0.5,0.5S12.224,16,12.5,16z M15.5,16h1c0.276,0,0.5-0.224,0.5-0.5S16.776,15,16.5,15h-1    c-0.276,0-0.5,0.224-0.5,0.5S15.224,16,15.5,16z"
+         id="path7"
+         style="fill:#000000" /></g></g></svg>
\ No newline at end of file
diff --git a/src/Squidex/app/theme/icomoon/selection.json b/src/Squidex/app/theme/icomoon/selection.json
index b5dd7e9d0..b6da748d5 100644
--- a/src/Squidex/app/theme/icomoon/selection.json
+++ b/src/Squidex/app/theme/icomoon/selection.json
@@ -133,7 +133,7 @@
       },
       "setIdx": 2,
       "setId": 1,
-      "iconIdx": 9
+      "iconIdx": 13
     },
     {
       "icon": {
@@ -163,7 +163,7 @@
       },
       "setIdx": 2,
       "setId": 1,
-      "iconIdx": 10
+      "iconIdx": 14
     },
     {
       "icon": {
@@ -193,7 +193,7 @@
       },
       "setIdx": 2,
       "setId": 1,
-      "iconIdx": 11
+      "iconIdx": 15
     },
     {
       "icon": {
@@ -228,7 +228,7 @@
       },
       "setIdx": 2,
       "setId": 1,
-      "iconIdx": 12
+      "iconIdx": 16
     },
     {
       "icon": {
@@ -265,7 +265,65 @@
       },
       "setIdx": 2,
       "setId": 1,
-      "iconIdx": 13
+      "iconIdx": 17
+    },
+    {
+      "icon": {
+        "paths": [
+          "M947.2 102.4h-128v-25.6c0-14.131-11.469-25.6-25.6-25.6s-25.6 11.469-25.6 25.6v25.6h-512v-25.6c0-14.131-11.52-25.6-25.6-25.6s-25.6 11.469-25.6 25.6v25.6h-128c-42.342 0-76.8 34.458-76.8 76.8v716.8c0 42.342 34.458 76.8 76.8 76.8h870.4c42.342 0 76.8-34.458 76.8-76.8v-716.8c0-42.342-34.458-76.8-76.8-76.8zM972.8 896c0 14.131-11.469 25.6-25.6 25.6h-870.4c-14.080 0-25.6-11.469-25.6-25.6v-537.6h921.6v537.6zM972.8 307.2h-921.6v-128c0-14.080 11.52-25.6 25.6-25.6h128v76.8c0 14.080 11.52 25.6 25.6 25.6s25.6-11.52 25.6-25.6v-76.8h512v76.8c0 14.080 11.469 25.6 25.6 25.6s25.6-11.52 25.6-25.6v-76.8h128c14.131 0 25.6 11.52 25.6 25.6v128zM332.8 512h51.2c14.080 0 25.6-11.52 25.6-25.6s-11.52-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.52-25.6 25.6s11.52 25.6 25.6 25.6zM486.4 512h51.2c14.131 0 25.6-11.52 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.52-25.6 25.6s11.52 25.6 25.6 25.6zM640 512h51.2c14.131 0 25.6-11.52 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.131 0-25.6 11.52-25.6 25.6s11.469 25.6 25.6 25.6zM793.6 512h51.2c14.131 0 25.6-11.52 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.131 0-25.6 11.52-25.6 25.6s11.469 25.6 25.6 25.6zM179.2 614.4h51.2c14.080 0 25.6-11.469 25.6-25.6s-11.52-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.469-25.6 25.6s11.52 25.6 25.6 25.6zM332.8 614.4h51.2c14.080 0 25.6-11.469 25.6-25.6s-11.52-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.469-25.6 25.6s11.52 25.6 25.6 25.6zM486.4 614.4h51.2c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.469-25.6 25.6s11.52 25.6 25.6 25.6zM640 614.4h51.2c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.131 0-25.6 11.469-25.6 25.6s11.469 25.6 25.6 25.6zM793.6 614.4h51.2c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.131 0-25.6 11.469-25.6 25.6s11.469 25.6 25.6 25.6zM179.2 716.8h51.2c14.080 0 25.6-11.469 25.6-25.6s-11.52-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.469-25.6 25.6s11.52 25.6 25.6 25.6zM332.8 716.8h51.2c14.080 0 25.6-11.469 25.6-25.6s-11.52-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.469-25.6 25.6s11.52 25.6 25.6 25.6zM486.4 716.8h51.2c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.469-25.6 25.6s11.52 25.6 25.6 25.6zM640 716.8h51.2c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.131 0-25.6 11.469-25.6 25.6s11.469 25.6 25.6 25.6zM793.6 716.8h51.2c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.131 0-25.6 11.469-25.6 25.6s11.469 25.6 25.6 25.6zM179.2 819.2h51.2c14.080 0 25.6-11.469 25.6-25.6s-11.52-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.469-25.6 25.6s11.52 25.6 25.6 25.6zM332.8 819.2h51.2c14.080 0 25.6-11.469 25.6-25.6s-11.52-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.469-25.6 25.6s11.52 25.6 25.6 25.6zM486.4 819.2h51.2c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.469-25.6 25.6s11.52 25.6 25.6 25.6zM640 819.2h51.2c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.131 0-25.6 11.469-25.6 25.6s11.469 25.6 25.6 25.6zM793.6 819.2h51.2c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.131 0-25.6 11.469-25.6 25.6s11.469 25.6 25.6 25.6z"
+        ],
+        "attrs": [
+          {}
+        ],
+        "isMulticolor": false,
+        "isMulticolor2": false,
+        "grid": 14,
+        "tags": [
+          "control-date"
+        ]
+      },
+      "attrs": [
+        {}
+      ],
+      "properties": {
+        "order": 71,
+        "id": 42,
+        "name": "control-date",
+        "prevSize": 28,
+        "code": 59702
+      },
+      "setIdx": 2,
+      "setId": 1,
+      "iconIdx": 0
+    },
+    {
+      "icon": {
+        "paths": [
+          "M486.4 409.6h51.2c14.080 0 25.6 11.52 25.6 25.6s-11.52 25.6-25.6 25.6h-51.2c-14.080 0-25.6-11.52-25.6-25.6s11.52-25.6 25.6-25.6zM230.4 614.4c14.080 0 25.6 11.469 25.6 25.6s-11.52 25.6-25.6 25.6h-51.2c-14.080 0-25.6-11.469-25.6-25.6s11.52-25.6 25.6-25.6h51.2zM230.4 512c14.080 0 25.6 11.469 25.6 25.6s-11.52 25.6-25.6 25.6h-51.2c-14.080 0-25.6-11.469-25.6-25.6s11.52-25.6 25.6-25.6h51.2zM51.2 742.4v-435.2h665.6v102.4h51.2v-281.6c0-42.342-34.458-76.8-76.8-76.8h-128v-25.6c0-14.131-11.469-25.6-25.6-25.6s-25.6 11.469-25.6 25.6v25.6h-256v-25.6c0-14.131-11.52-25.6-25.6-25.6s-25.6 11.469-25.6 25.6v25.6h-128c-42.342 0-76.8 34.458-76.8 76.8v614.4c0 42.342 34.458 76.8 76.8 76.8h332.8v-51.2h-332.8c-14.080 0-25.6-11.469-25.6-25.6zM51.2 128c0-14.080 11.52-25.6 25.6-25.6h128v76.8c0 14.080 11.52 25.6 25.6 25.6s25.6-11.52 25.6-25.6v-76.8h256v76.8c0 14.080 11.469 25.6 25.6 25.6s25.6-11.52 25.6-25.6v-76.8h128c14.131 0 25.6 11.52 25.6 25.6v128h-665.6v-128zM384 409.6c14.080 0 25.6 11.52 25.6 25.6s-11.52 25.6-25.6 25.6h-51.2c-14.080 0-25.6-11.52-25.6-25.6s11.52-25.6 25.6-25.6h51.2zM742.4 460.8c-155.546 0-281.6 126.054-281.6 281.6s126.054 281.6 281.6 281.6 281.6-126.054 281.6-281.6-126.054-281.6-281.6-281.6zM742.4 972.8c-127.232 0-230.4-103.168-230.4-230.4s103.168-230.4 230.4-230.4 230.4 103.168 230.4 230.4-103.168 230.4-230.4 230.4zM384 512c14.080 0 25.6 11.469 25.6 25.6s-11.52 25.6-25.6 25.6h-51.2c-14.080 0-25.6-11.469-25.6-25.6s11.52-25.6 25.6-25.6h51.2zM384 614.4c14.080 0 25.6 11.469 25.6 25.6s-11.52 25.6-25.6 25.6h-51.2c-14.080 0-25.6-11.469-25.6-25.6s11.52-25.6 25.6-25.6h51.2zM844.8 716.8c14.131 0 25.6 11.469 25.6 25.6s-11.469 25.6-25.6 25.6h-102.4c-14.131 0-25.6-11.469-25.6-25.6v-102.4c0-14.131 11.469-25.6 25.6-25.6s25.6 11.469 25.6 25.6v76.8h76.8z"
+        ],
+        "attrs": [
+          {}
+        ],
+        "isMulticolor": false,
+        "isMulticolor2": false,
+        "grid": 14,
+        "tags": [
+          "control-date-time"
+        ]
+      },
+      "attrs": [
+        {}
+      ],
+      "properties": {
+        "order": 70,
+        "id": 41,
+        "name": "control-date-time",
+        "prevSize": 28,
+        "code": 59703
+      },
+      "setIdx": 2,
+      "setId": 1,
+      "iconIdx": 1
     },
     {
       "icon": {
@@ -287,7 +345,7 @@
         {}
       ],
       "properties": {
-        "order": 1,
+        "order": 67,
         "id": 0,
         "prevSize": 28,
         "code": 59697,
@@ -295,7 +353,7 @@
       },
       "setIdx": 2,
       "setId": 1,
-      "iconIdx": 0
+      "iconIdx": 4
     },
     {
       "icon": {
@@ -324,7 +382,7 @@
       },
       "setIdx": 2,
       "setId": 1,
-      "iconIdx": 1
+      "iconIdx": 5
     },
     {
       "icon": {
@@ -354,7 +412,7 @@
       },
       "setIdx": 2,
       "setId": 1,
-      "iconIdx": 2
+      "iconIdx": 6
     },
     {
       "icon": {
@@ -384,7 +442,7 @@
       },
       "setIdx": 2,
       "setId": 1,
-      "iconIdx": 3
+      "iconIdx": 7
     },
     {
       "icon": {
@@ -414,7 +472,7 @@
       },
       "setIdx": 2,
       "setId": 1,
-      "iconIdx": 4
+      "iconIdx": 8
     },
     {
       "icon": {
@@ -444,7 +502,7 @@
       },
       "setIdx": 2,
       "setId": 1,
-      "iconIdx": 5
+      "iconIdx": 9
     },
     {
       "icon": {
@@ -474,7 +532,7 @@
       },
       "setIdx": 2,
       "setId": 1,
-      "iconIdx": 6
+      "iconIdx": 10
     },
     {
       "icon": {
@@ -504,7 +562,7 @@
       },
       "setIdx": 2,
       "setId": 1,
-      "iconIdx": 7
+      "iconIdx": 11
     },
     {
       "icon": {
@@ -534,7 +592,7 @@
       },
       "setIdx": 2,
       "setId": 1,
-      "iconIdx": 8
+      "iconIdx": 12
     },
     {
       "icon": {
@@ -563,7 +621,7 @@
       },
       "setIdx": 2,
       "setId": 1,
-      "iconIdx": 14
+      "iconIdx": 18
     },
     {
       "icon": {
@@ -592,7 +650,7 @@
       },
       "setIdx": 2,
       "setId": 1,
-      "iconIdx": 15
+      "iconIdx": 19
     },
     {
       "icon": {
@@ -621,7 +679,7 @@
       },
       "setIdx": 2,
       "setId": 1,
-      "iconIdx": 16
+      "iconIdx": 20
     },
     {
       "icon": {
@@ -650,7 +708,7 @@
       },
       "setIdx": 2,
       "setId": 1,
-      "iconIdx": 17
+      "iconIdx": 21
     },
     {
       "icon": {
@@ -679,7 +737,7 @@
       },
       "setIdx": 2,
       "setId": 1,
-      "iconIdx": 18
+      "iconIdx": 22
     },
     {
       "icon": {
@@ -708,7 +766,7 @@
       },
       "setIdx": 2,
       "setId": 1,
-      "iconIdx": 19
+      "iconIdx": 23
     },
     {
       "icon": {
@@ -737,7 +795,7 @@
       },
       "setIdx": 2,
       "setId": 1,
-      "iconIdx": 20
+      "iconIdx": 24
     },
     {
       "icon": {
@@ -766,7 +824,7 @@
       },
       "setIdx": 2,
       "setId": 1,
-      "iconIdx": 21
+      "iconIdx": 25
     },
     {
       "icon": {
@@ -795,7 +853,7 @@
       },
       "setIdx": 2,
       "setId": 1,
-      "iconIdx": 22
+      "iconIdx": 26
     },
     {
       "icon": {
@@ -824,7 +882,7 @@
       },
       "setIdx": 2,
       "setId": 1,
-      "iconIdx": 23
+      "iconIdx": 27
     },
     {
       "icon": {
@@ -853,7 +911,7 @@
       },
       "setIdx": 2,
       "setId": 1,
-      "iconIdx": 24
+      "iconIdx": 28
     },
     {
       "icon": {
@@ -882,7 +940,7 @@
       },
       "setIdx": 2,
       "setId": 1,
-      "iconIdx": 25
+      "iconIdx": 29
     },
     {
       "icon": {
@@ -911,7 +969,7 @@
       },
       "setIdx": 2,
       "setId": 1,
-      "iconIdx": 26
+      "iconIdx": 30
     },
     {
       "icon": {
@@ -940,7 +998,7 @@
       },
       "setIdx": 2,
       "setId": 1,
-      "iconIdx": 27
+      "iconIdx": 31
     },
     {
       "icon": {
@@ -969,7 +1027,7 @@
       },
       "setIdx": 2,
       "setId": 1,
-      "iconIdx": 28
+      "iconIdx": 32
     },
     {
       "icon": {
@@ -998,7 +1056,7 @@
       },
       "setIdx": 2,
       "setId": 1,
-      "iconIdx": 29
+      "iconIdx": 33
     },
     {
       "icon": {
@@ -1027,7 +1085,7 @@
       },
       "setIdx": 2,
       "setId": 1,
-      "iconIdx": 30
+      "iconIdx": 34
     },
     {
       "icon": {
@@ -1056,7 +1114,7 @@
       },
       "setIdx": 2,
       "setId": 1,
-      "iconIdx": 31
+      "iconIdx": 35
     },
     {
       "icon": {
@@ -1085,7 +1143,7 @@
       },
       "setIdx": 2,
       "setId": 1,
-      "iconIdx": 32
+      "iconIdx": 36
     },
     {
       "icon": {
@@ -1114,7 +1172,7 @@
       },
       "setIdx": 2,
       "setId": 1,
-      "iconIdx": 33
+      "iconIdx": 37
     },
     {
       "icon": {
@@ -1143,7 +1201,7 @@
       },
       "setIdx": 2,
       "setId": 1,
-      "iconIdx": 34
+      "iconIdx": 38
     },
     {
       "icon": {
@@ -1172,7 +1230,7 @@
       },
       "setIdx": 2,
       "setId": 1,
-      "iconIdx": 35
+      "iconIdx": 39
     },
     {
       "icon": {
@@ -1201,7 +1259,7 @@
       },
       "setIdx": 2,
       "setId": 1,
-      "iconIdx": 36
+      "iconIdx": 40
     },
     {
       "icon": {
@@ -1230,7 +1288,7 @@
       },
       "setIdx": 2,
       "setId": 1,
-      "iconIdx": 37
+      "iconIdx": 41
     },
     {
       "icon": {
@@ -1259,7 +1317,7 @@
       },
       "setIdx": 2,
       "setId": 1,
-      "iconIdx": 38
+      "iconIdx": 42
     },
     {
       "icon": {
@@ -1288,7 +1346,7 @@
       },
       "setIdx": 2,
       "setId": 1,
-      "iconIdx": 39
+      "iconIdx": 43
     },
     {
       "icon": {
@@ -1317,7 +1375,7 @@
       },
       "setIdx": 2,
       "setId": 1,
-      "iconIdx": 40
+      "iconIdx": 44
     },
     {
       "icon": {
@@ -1346,7 +1404,7 @@
       },
       "setIdx": 2,
       "setId": 1,
-      "iconIdx": 41
+      "iconIdx": 45
     },
     {
       "icon": {
@@ -1375,7 +1433,7 @@
       },
       "setIdx": 2,
       "setId": 1,
-      "iconIdx": 42
+      "iconIdx": 46
     },
     {
       "icon": {
@@ -1404,7 +1462,7 @@
       },
       "setIdx": 2,
       "setId": 1,
-      "iconIdx": 43
+      "iconIdx": 47
     },
     {
       "icon": {
@@ -1433,7 +1491,7 @@
       },
       "setIdx": 2,
       "setId": 1,
-      "iconIdx": 44
+      "iconIdx": 48
     },
     {
       "icon": {
@@ -1462,7 +1520,7 @@
       },
       "setIdx": 2,
       "setId": 1,
-      "iconIdx": 45
+      "iconIdx": 49
     },
     {
       "icon": {
@@ -1491,7 +1549,7 @@
       },
       "setIdx": 2,
       "setId": 1,
-      "iconIdx": 46
+      "iconIdx": 50
     },
     {
       "icon": {
@@ -1520,7 +1578,7 @@
       },
       "setIdx": 2,
       "setId": 1,
-      "iconIdx": 47
+      "iconIdx": 51
     },
     {
       "icon": {
@@ -1549,7 +1607,7 @@
       },
       "setIdx": 2,
       "setId": 1,
-      "iconIdx": 48
+      "iconIdx": 52
     },
     {
       "icon": {
@@ -1578,7 +1636,7 @@
       },
       "setIdx": 2,
       "setId": 1,
-      "iconIdx": 49
+      "iconIdx": 53
     },
     {
       "icon": {
@@ -1607,7 +1665,7 @@
       },
       "setIdx": 2,
       "setId": 1,
-      "iconIdx": 50
+      "iconIdx": 54
     }
   ],
   "height": 1024,
diff --git a/src/Squidex/app/theme/icomoon/style.css b/src/Squidex/app/theme/icomoon/style.css
index 8dc3b858e..47842112a 100644
--- a/src/Squidex/app/theme/icomoon/style.css
+++ b/src/Squidex/app/theme/icomoon/style.css
@@ -1,10 +1,10 @@
 @font-face {
   font-family: 'icomoon';
-  src:  url('fonts/icomoon.eot?7ja4lm');
-  src:  url('fonts/icomoon.eot?7ja4lm#iefix') format('embedded-opentype'),
-    url('fonts/icomoon.ttf?7ja4lm') format('truetype'),
-    url('fonts/icomoon.woff?7ja4lm') format('woff'),
-    url('fonts/icomoon.svg?7ja4lm#icomoon') format('svg');
+  src:  url('fonts/icomoon.eot?9dpklz');
+  src:  url('fonts/icomoon.eot?9dpklz#iefix') format('embedded-opentype'),
+    url('fonts/icomoon.ttf?9dpklz') format('truetype'),
+    url('fonts/icomoon.woff?9dpklz') format('woff'),
+    url('fonts/icomoon.svg?9dpklz#icomoon') format('svg');
   font-weight: normal;
   font-style: normal;
 }
@@ -48,6 +48,12 @@
 .icon-bin2:before {
   content: "\e902";
 }
+.icon-control-date:before {
+  content: "\e936";
+}
+.icon-control-date-time:before {
+  content: "\e937";
+}
 .icon-angle-right:before {
   content: "\e931";
 }
diff --git a/src/Squidex/wwwroot/images/client.png b/src/Squidex/wwwroot/images/client.png
index d234bb53c..e50f3c93b 100644
Binary files a/src/Squidex/wwwroot/images/client.png and b/src/Squidex/wwwroot/images/client.png differ