diff --git a/src/Squidex.Core/Schemas/NumberFieldEditor.cs b/src/Squidex.Core/Schemas/NumberFieldEditor.cs
index 8e54de235..5ab5deed9 100644
--- a/src/Squidex.Core/Schemas/NumberFieldEditor.cs
+++ b/src/Squidex.Core/Schemas/NumberFieldEditor.cs
@@ -12,6 +12,7 @@ namespace Squidex.Core.Schemas
     {
         Input,
         Radio,
-        Dropdown
+        Dropdown,
+        Stars
     }
 }
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 cae05d773..605ad47eb 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
@@ -20,6 +20,9 @@
                             <div *ngSwitchCase="'Input'">
                                 <input class="form-control" type="number" [formControlName]="language">
                             </div>
+                            <div *ngSwitchCase="'Stars'">
+                                <sqx-stars [formControlName]="language" [maximumStars]="field.properties.maxValue"></sqx-stars>
+                            </div>
                             <div *ngSwitchCase="'Dropdown'">
                                 <select class="form-control" [formControlName]="language">
                                     <option></option>
diff --git a/src/Squidex/app/features/schemas/pages/schema/types/number-ui.component.html b/src/Squidex/app/features/schemas/pages/schema/types/number-ui.component.html
index ff5fd97ce..193c44198 100644
--- a/src/Squidex/app/features/schemas/pages/schema/types/number-ui.component.html
+++ b/src/Squidex/app/features/schemas/pages/schema/types/number-ui.component.html
@@ -35,6 +35,13 @@
 
                 <span class="radio-label">Radio</span>
             </label>
+            <label class="btn btn-radio" [class.active]="editForm.controls.editor.value === 'Stars'">
+                <input type="radio" class="radio-input" formControlName="editor" value="Stars" />
+
+                <i class="icon-control-Stars"></i>
+
+                <span class="radio-label">Stars</span>
+            </label>
         </div>
     </div>
     <div class="form-group row" [class.hidden]="hideAllowedValues | async">
diff --git a/src/Squidex/app/framework/angular/stars.component.html b/src/Squidex/app/framework/angular/stars.component.html
new file mode 100644
index 000000000..b3054eac5
--- /dev/null
+++ b/src/Squidex/app/framework/angular/stars.component.html
@@ -0,0 +1,10 @@
+<div class="stars-container">
+    <div *ngIf="maximumStars === 0 || maximumStars > 15" class="many-stars">
+        Must not have more more than 15 stars
+    </div>
+    <div *ngIf="maximumStars > 0 && maximumStars <= 15">
+        <span class="stars" (mouseleave)="stopPreview()" [class.disabled]="isDisabled">
+            <span class="star" *ngFor="let star of starsArray" (mouseenter)="setPreview(star)" (click)="setValue(star)" [class.selected]="star <= stars"></span>
+        </span>
+    </div>
+</div>
\ No newline at end of file
diff --git a/src/Squidex/app/framework/angular/stars.component.scss b/src/Squidex/app/framework/angular/stars.component.scss
new file mode 100644
index 000000000..cf00f7508
--- /dev/null
+++ b/src/Squidex/app/framework/angular/stars.component.scss
@@ -0,0 +1,44 @@
+@import '_mixins';
+@import '_vars';
+
+$color-gold: #ffd700;
+
+.many-stars {
+    color: $color-empty;
+}
+
+.stars-container {
+    height: 1.8rem;
+}
+
+.stars {
+    & {
+        display: inline-block;
+        border: 0;
+    }
+
+    &.disabled {
+        cursor: not-allowed;
+    }
+}
+
+.star {
+    & {
+        background: transparent;
+        border: 0;
+    }
+
+    &::before {
+        display: inline-block;
+        color: $color-gold;
+        content: '☆';
+        font-size: 1.8rem;
+        line-height: 2rem;
+    }
+
+    &.selected {
+        &::before {
+            content: '★';
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Squidex/app/framework/angular/stars.component.ts b/src/Squidex/app/framework/angular/stars.component.ts
new file mode 100644
index 000000000..3d2d167ec
--- /dev/null
+++ b/src/Squidex/app/framework/angular/stars.component.ts
@@ -0,0 +1,91 @@
+/*
+ * Squidex Headless CMS
+ *
+ * @license
+ * Copyright (c) Sebastian Stehle. All rights reserved
+ */
+
+import { Component, forwardRef, Input } from '@angular/core';
+import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
+
+const NOOP = () => { /* NOOP */ };
+
+export const SQX_STARS_CONTROL_VALUE_ACCESSOR: any = {
+    provide: NG_VALUE_ACCESSOR, useExisting: forwardRef(() => StarsComponent), multi: true
+};
+
+@Component({
+    selector: 'sqx-stars',
+    styleUrls: ['./stars.component.scss'],
+    templateUrl: './stars.component.html',
+    providers: [SQX_STARS_CONTROL_VALUE_ACCESSOR]
+})
+export class StarsComponent implements ControlValueAccessor {
+    private changeCallback: (value: any) => void = NOOP;
+    private touchedCallback: () => void = NOOP;
+    private value = 1;
+    private maximumStarsValue = 5;
+
+    public isDisabled = false;
+
+    public stars: number;
+    public starsArray: number[] = [1, 2, 3, 4, 5];
+
+    public get maximumStars() {
+        return this.maximumStarsValue;
+    }
+
+    @Input()
+    public set maximumStars(value: any) {
+        value = value || 5;
+
+        if (!(typeof value === 'number')) {
+            value = 5;
+        }
+
+        if (this.maximumStarsValue !== value) {
+            this.maximumStarsValue = value;
+
+            this.starsArray = [];
+
+            for (let i = 1; i <= value; i++) {
+                this.starsArray.push(i);
+            }
+        }
+    }
+
+    public writeValue(value: any) {
+        this.value = this.stars = value;
+    }
+
+    public setDisabledState(isDisabled: boolean): void {
+        this.isDisabled = isDisabled;
+    }
+
+    public registerOnChange(fn: any) {
+        this.changeCallback = fn;
+    }
+
+    public registerOnTouched(fn: any) {
+        this.touchedCallback = fn;
+    }
+
+    public setPreview(value: number) {
+        this.stars = value;
+    }
+
+    public stopPreview() {
+        this.stars = this.value;
+    }
+
+    public setValue(value: number) {
+        if (this.isDisabled) {
+            return;
+        }
+
+        this.value = this.stars = value;
+
+        this.changeCallback(this.value);
+        this.touchedCallback();
+    }
+}
\ No newline at end of file
diff --git a/src/Squidex/app/framework/declarations.ts b/src/Squidex/app/framework/declarations.ts
index 9174436c7..a3f16a970 100644
--- a/src/Squidex/app/framework/declarations.ts
+++ b/src/Squidex/app/framework/declarations.ts
@@ -28,6 +28,7 @@ export * from './angular/rich-editor.component';
 export * from './angular/scroll-active.directive';
 export * from './angular/shortcut.component';
 export * from './angular/slider.component';
+export * from './angular/stars.component';
 export * from './angular/tag-editor.component';
 export * from './angular/title.component';
 export * from './angular/toggle.component';
diff --git a/src/Squidex/app/framework/module.ts b/src/Squidex/app/framework/module.ts
index 7255f99aa..7568e41ca 100644
--- a/src/Squidex/app/framework/module.ts
+++ b/src/Squidex/app/framework/module.ts
@@ -44,6 +44,7 @@ import {
     ShortDatePipe,
     ShortTimePipe,
     SliderComponent,
+    StarsComponent,
     TagEditorComponent,
     TitleService,
     TitleComponent,
@@ -85,6 +86,7 @@ import {
         ShortDatePipe,
         ShortTimePipe,
         SliderComponent,
+        StarsComponent,
         TagEditorComponent,
         TitleComponent,
         ToggleComponent,
@@ -116,6 +118,7 @@ import {
         ShortDatePipe,
         ShortTimePipe,
         SliderComponent,
+        StarsComponent,
         TagEditorComponent,
         TitleComponent,
         ToggleComponent,
diff --git a/src/Squidex/app/theme/icomoon/demo-files/demo.css b/src/Squidex/app/theme/icomoon/demo-files/demo.css
index 889fb6c96..8c423177f 100644
--- a/src/Squidex/app/theme/icomoon/demo-files/demo.css
+++ b/src/Squidex/app/theme/icomoon/demo-files/demo.css
@@ -147,10 +147,10 @@ p {
   font-size: 16px;
 }
 .fs1 {
-  font-size: 24px;
+  font-size: 32px;
 }
 .fs2 {
-  font-size: 32px;
+  font-size: 24px;
 }
 .fs3 {
   font-size: 32px;
diff --git a/src/Squidex/app/theme/icomoon/demo.html b/src/Squidex/app/theme/icomoon/demo.html
index c6614995d..027eedbc0 100644
--- a/src/Squidex/app/theme/icomoon/demo.html
+++ b/src/Squidex/app/theme/icomoon/demo.html
@@ -9,11 +9,46 @@
     <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;58)</small></h1>
+        <h1 class="mhmm mvm"><span class="fgc1">Font Name:</span> icomoon <small class="fgc1">(Glyphs:&nbsp;59)</small></h1>
     </div>
     <div class="clearfix mhl ptl">
-        <h1 class="mvm mtn fgc1">Grid Size: 24</h1>
+        <h1 class="mvm mtn fgc1">Grid Size: 32</h1>
         <div class="glyph fs1">
+            <div class="clearfix bshadow0 pbs">
+                <span class="icon-control-Stars">
+                
+                </span>
+                <span class="mls"> icon-control-Stars</span>
+            </div>
+            <fieldset class="fs0 size1of1 clearfix hidden-false">
+                <input type="text" readonly value="e93a" class="unit size1of2" />
+                <input type="text" maxlength="1" readonly value="&#xe93a;" 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 fs1">
+            <div class="clearfix bshadow0 pbs">
+                <span class="icon-browser">
+                
+                </span>
+                <span class="mls"> icon-browser</span>
+            </div>
+            <fieldset class="fs0 size1of1 clearfix hidden-false">
+                <input type="text" readonly value="e935" class="unit size1of2" />
+                <input type="text" maxlength="1" readonly value="&#xe935;" 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>
+    <div class="clearfix mhl ptl">
+        <h1 class="mvm mtn fgc1">Grid Size: 24</h1>
+        <div class="glyph fs2">
             <div class="clearfix bshadow0 pbs">
                 <span class="icon-control-RichText">
                 
@@ -29,10 +64,26 @@
                 <input type="text" readonly value="" class="liga unitRight" />
             </div>
         </div>
+        <div class="glyph fs2">
+            <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>
     <div class="clearfix mhl ptl">
         <h1 class="mvm mtn fgc1">Grid Size: 14</h1>
-        <div class="glyph fs2">
+        <div class="glyph fs3">
             <div class="clearfix bshadow0 pbs">
                 <span class="icon-control-Markdown">
                 
@@ -48,7 +99,7 @@
                 <input type="text" readonly value="" class="liga unitRight" />
             </div>
         </div>
-        <div class="glyph fs2">
+        <div class="glyph fs3">
             <div class="clearfix bshadow0 pbs">
                 <span class="icon-control-Date">
                 
@@ -64,7 +115,7 @@
                 <input type="text" readonly value="" class="liga unitRight" />
             </div>
         </div>
-        <div class="glyph fs2">
+        <div class="glyph fs3">
             <div class="clearfix bshadow0 pbs">
                 <span class="icon-control-DateTime">
                 
@@ -80,7 +131,7 @@
                 <input type="text" readonly value="" class="liga unitRight" />
             </div>
         </div>
-        <div class="glyph fs2">
+        <div class="glyph fs3">
             <div class="clearfix bshadow0 pbs">
                 <span class="icon-angle-right">
                 
@@ -96,7 +147,7 @@
                 <input type="text" readonly value="" class="liga unitRight" />
             </div>
         </div>
-        <div class="glyph fs2">
+        <div class="glyph fs3">
             <div class="clearfix bshadow0 pbs">
                 <span class="icon-user-o">
                 
@@ -112,7 +163,7 @@
                 <input type="text" readonly value="" class="liga unitRight" />
             </div>
         </div>
-        <div class="glyph fs2">
+        <div class="glyph fs3">
             <div class="clearfix bshadow0 pbs">
                 <span class="icon-caret-right">
                 
@@ -128,7 +179,7 @@
                 <input type="text" readonly value="" class="liga unitRight" />
             </div>
         </div>
-        <div class="glyph fs2">
+        <div class="glyph fs3">
             <div class="clearfix bshadow0 pbs">
                 <span class="icon-caret-left">
                 
@@ -144,7 +195,7 @@
                 <input type="text" readonly value="" class="liga unitRight" />
             </div>
         </div>
-        <div class="glyph fs2">
+        <div class="glyph fs3">
             <div class="clearfix bshadow0 pbs">
                 <span class="icon-caret-up">
                 
@@ -160,7 +211,7 @@
                 <input type="text" readonly value="" class="liga unitRight" />
             </div>
         </div>
-        <div class="glyph fs2">
+        <div class="glyph fs3">
             <div class="clearfix bshadow0 pbs">
                 <span class="icon-caret-down">
                 
@@ -176,7 +227,7 @@
                 <input type="text" readonly value="" class="liga unitRight" />
             </div>
         </div>
-        <div class="glyph fs2">
+        <div class="glyph fs3">
             <div class="clearfix bshadow0 pbs">
                 <span class="icon-angle-up">
                 
@@ -192,7 +243,7 @@
                 <input type="text" readonly value="" class="liga unitRight" />
             </div>
         </div>
-        <div class="glyph fs2">
+        <div class="glyph fs3">
             <div class="clearfix bshadow0 pbs">
                 <span class="icon-angle-down">
                 
@@ -208,7 +259,7 @@
                 <input type="text" readonly value="" class="liga unitRight" />
             </div>
         </div>
-        <div class="glyph fs2">
+        <div class="glyph fs3">
             <div class="clearfix bshadow0 pbs">
                 <span class="icon-angle-left">
                 
@@ -225,25 +276,6 @@
             </div>
         </div>
     </div>
-    <div class="clearfix mhl ptl">
-        <h1 class="mvm mtn fgc1">Grid Size: 32</h1>
-        <div class="glyph fs3">
-            <div class="clearfix bshadow0 pbs">
-                <span class="icon-browser">
-                
-                </span>
-                <span class="mls"> icon-browser</span>
-            </div>
-            <fieldset class="fs0 size1of1 clearfix hidden-false">
-                <input type="text" readonly value="e935" class="unit size1of2" />
-                <input type="text" maxlength="1" readonly value="&#xe935;" 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>
     <div class="clearfix mhl ptl">
         <h1 class="mvm mtn fgc1">Grid Size: 16</h1>
         <div class="glyph fs4">
diff --git a/src/Squidex/app/theme/icomoon/fonts/icomoon.eot b/src/Squidex/app/theme/icomoon/fonts/icomoon.eot
index 59ae2834a..41b69d144 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 7e4d5f268..101381bb3 100644
--- a/src/Squidex/app/theme/icomoon/fonts/icomoon.svg
+++ b/src/Squidex/app/theme/icomoon/fonts/icomoon.svg
@@ -65,4 +65,5 @@
 <glyph unicode="&#xe937;" glyph-name="control-DateTime" 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" />
 <glyph unicode="&#xe938;" glyph-name="control-Markdown" d="M793.6 341.441h-61.838v28.108h-0.783q-21.135-33.092-62.034-33.092-37.573 0-60.469 26.912-22.896 27.112-22.896 75.554 0 50.635 25.244 81.136t66.144 30.501q38.747 0 54.011-28.308h0.783v121.405h61.838v-302.216zM732.936 440.718v15.35q0 19.935-11.35 33.092t-29.549 13.157q-20.548 0-32.093-16.546-11.546-16.347-11.546-45.053 0-26.912 11.154-41.465t30.919-14.553q18.786 0 30.528 15.35 11.937 15.35 11.937 40.668zM548.594 341.441h-61.643v116.421q0 44.455-32.093 44.455-15.264 0-24.853-13.357t-9.589-33.292v-114.228h-61.839v117.617q0 43.259-31.506 43.259-15.851 0-25.44-12.758-9.393-12.758-9.393-34.687v-113.431h-61.838v204.135h61.838v-31.896h0.783q9.589 16.347 26.81 26.514 17.417 10.366 37.964 10.366 42.465 0 58.12-38.076 22.896 38.076 67.318 38.076 65.361 0 65.361-82.133v-126.987zM0 950.857v-204.8h76.8v-76.8h51.2v76.8h76.8v204.8zM819.2 950.857v-204.8h204.8v204.8zM51.2 899.657h102.4v-102.4h-102.4zM870.4 899.657h102.4v-102.4h-102.4zM281.6 874.057v-51.2h102.4v51.2zM486.4 874.057v-51.2h102.4v51.2zM691.2 874.057v-51.2h102.4v51.2zM896 669.257v-102.4h51.2v102.4zM76.8 566.857v-102.4h51.2v102.4zM896 464.457v-102.4h51.2v102.4zM76.8 362.057v-102.4h51.2v102.4zM896 259.657v-102.4h51.2v102.4zM76.8 157.257v-25.6h-76.8v-204.8h204.8v76.8h76.8v51.2h-76.8v76.8h-76.8v25.6zM819.2 131.657v-76.8h-25.6v-51.2h25.6v-76.8h204.8v204.8zM51.2 80.457h102.4v-102.4h-102.4zM870.4 80.457h102.4v-102.4h-102.4zM384 54.857v-51.2h102.4v51.2zM588.8 54.857v-51.2h102.4v51.2z" />
 <glyph unicode="&#xe939;" glyph-name="control-RichText" d="M918 554.667v-128h-128v-298h-128v298h-128v128h384zM106 768.667h556v-128h-214v-512h-128v512h-214v128z" />
+<glyph unicode="&#xe93a;" glyph-name="control-Stars" d="M1020.192 558.176c-8.864 25.568-31.616 44.288-59.008 48.352l-266.432 39.616-115.808 240.448c-12.192 25.248-38.272 41.408-66.944 41.408s-54.752-16.16-66.944-41.408l-115.808-240.448-266.464-39.616c-27.36-4.064-50.112-22.784-58.944-48.352-8.8-25.632-2.144-53.856 17.184-73.12l195.264-194.944-45.28-270.432c-4.608-27.232 7.2-54.56 30.336-70.496 12.704-8.736 27.648-13.184 42.592-13.184 12.288 0 24.608 3.008 35.776 8.992l232.288 125.056 232.32-125.056c11.168-5.984 23.488-8.992 35.744-8.992 14.944 0 29.888 4.448 42.624 13.184 23.136 15.936 34.88 43.264 30.304 70.496l-45.312 270.432 195.328 194.944c19.296 19.296 25.92 47.52 17.184 73.12zM754.816 340.384c-16.384-16.32-23.808-39.328-20.064-61.888l45.312-270.432-232.32 124.992c-11.136 6.016-23.424 8.992-35.776 8.992-12.288 0-24.608-3.008-35.744-8.992l-232.32-124.992 45.312 270.432c3.776 22.56-3.648 45.568-20.032 61.888l-195.264 194.944 266.432 39.68c24.352 3.616 45.312 18.848 55.776 40.576l115.872 240.384 115.84-240.416c10.496-21.728 31.424-36.928 55.744-40.576l266.496-39.68-195.264-194.912z" />
 </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 c6452f70f..7683b900f 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 877263ee5..9d811003e 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/selection.json b/src/Squidex/app/theme/icomoon/selection.json
index e772b5346..b85cf938f 100644
--- a/src/Squidex/app/theme/icomoon/selection.json
+++ b/src/Squidex/app/theme/icomoon/selection.json
@@ -1,6 +1,69 @@
 {
   "IcoMoonType": "selection",
   "icons": [
+    {
+      "icon": {
+        "paths": [
+          "M1020.192 401.824c-8.864-25.568-31.616-44.288-59.008-48.352l-266.432-39.616-115.808-240.448c-12.192-25.248-38.272-41.408-66.944-41.408s-54.752 16.16-66.944 41.408l-115.808 240.448-266.464 39.616c-27.36 4.064-50.112 22.784-58.944 48.352-8.8 25.632-2.144 53.856 17.184 73.12l195.264 194.944-45.28 270.432c-4.608 27.232 7.2 54.56 30.336 70.496 12.704 8.736 27.648 13.184 42.592 13.184 12.288 0 24.608-3.008 35.776-8.992l232.288-125.056 232.32 125.056c11.168 5.984 23.488 8.992 35.744 8.992 14.944 0 29.888-4.448 42.624-13.184 23.136-15.936 34.88-43.264 30.304-70.496l-45.312-270.432 195.328-194.944c19.296-19.296 25.92-47.52 17.184-73.12zM754.816 619.616c-16.384 16.32-23.808 39.328-20.064 61.888l45.312 270.432-232.32-124.992c-11.136-6.016-23.424-8.992-35.776-8.992-12.288 0-24.608 3.008-35.744 8.992l-232.32 124.992 45.312-270.432c3.776-22.56-3.648-45.568-20.032-61.888l-195.264-194.944 266.432-39.68c24.352-3.616 45.312-18.848 55.776-40.576l115.872-240.384 115.84 240.416c10.496 21.728 31.424 36.928 55.744 40.576l266.496 39.68-195.264 194.912z"
+        ],
+        "attrs": [
+          {}
+        ],
+        "isMulticolor": false,
+        "isMulticolor2": false,
+        "tags": [
+          "star",
+          "favorite"
+        ],
+        "grid": 32
+      },
+      "attrs": [
+        {}
+      ],
+      "properties": {
+        "order": 1,
+        "id": 0,
+        "prevSize": 32,
+        "code": 59706,
+        "name": "control-Stars"
+      },
+      "setIdx": 0,
+      "setId": 4,
+      "iconIdx": 0
+    },
+    {
+      "icon": {
+        "paths": [
+          "M1328 320c-8.832 0-16 7.168-16 16v640c0 8.832-7.168 16-16 16h-1248c-8.832 0-16-7.168-16-16v-640c0-8.832-7.168-16-16-16s-16 7.168-16 16v640c0 26.464 21.536 48 48 48h1248c26.464 0 48-21.536 48-48v-640c0-8.832-7.168-16-16-16zM1296 0h-1248c-26.464 0-48 21.536-48 48v192c0 8.832 7.168 16 16 16h1312c8.832 0 16-7.168 16-16v-192c0-26.464-21.536-48-48-48zM1312 224h-1280v-176c0-8.832 7.168-16 16-16h1248c8.832 0 16 7.168 16 16v176zM560 896c8.832 0 16-7.168 16-16v-512c0-8.832-7.168-16-16-16h-416c-8.832 0-16 7.168-16 16v512c0 8.832 7.168 16 16 16h416zM160 384h384v480h-384v-480zM720 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 640h480c8.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 800h480c8.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 128c0 17.673 14.327 32 32 32s32-14.327 32-32c0-17.673-14.327-32-32-32s-32 14.327-32 32zM224 128c0 17.673 14.327 32 32 32s32-14.327 32-32c0-17.673-14.327-32-32-32s-32 14.327-32 32zM352 128c0 17.673 14.327 32 32 32s32-14.327 32-32c0-17.673-14.327-32-32-32s-32 14.327-32 32z"
+        ],
+        "attrs": [
+          {}
+        ],
+        "width": 1344,
+        "isMulticolor": false,
+        "isMulticolor2": false,
+        "tags": [
+          "browser",
+          "window",
+          "software",
+          "program"
+        ],
+        "grid": 32
+      },
+      "attrs": [
+        {}
+      ],
+      "properties": {
+        "order": 1,
+        "id": 0,
+        "prevSize": 32,
+        "code": 59701,
+        "name": "browser"
+      },
+      "setIdx": 3,
+      "setId": 1,
+      "iconIdx": 1
+    },
     {
       "icon": {
         "paths": [
@@ -26,7 +89,7 @@
         "code": 59705,
         "name": "control-RichText"
       },
-      "setIdx": 1,
+      "setIdx": 2,
       "setId": 2,
       "iconIdx": 0
     },
@@ -55,7 +118,7 @@
         "prevSize": 32,
         "code": 59704
       },
-      "setIdx": 2,
+      "setIdx": 3,
       "setId": 1,
       "iconIdx": 0
     },
@@ -84,7 +147,7 @@
         "prevSize": 32,
         "code": 59702
       },
-      "setIdx": 2,
+      "setIdx": 3,
       "setId": 1,
       "iconIdx": 9
     },
@@ -113,7 +176,7 @@
         "prevSize": 32,
         "code": 59703
       },
-      "setIdx": 2,
+      "setIdx": 3,
       "setId": 1,
       "iconIdx": 10
     },
@@ -143,7 +206,7 @@
         "code": 59697,
         "name": "angle-right"
       },
-      "setIdx": 2,
+      "setIdx": 3,
       "setId": 1,
       "iconIdx": 11
     },
@@ -172,7 +235,7 @@
         "prevSize": 32,
         "code": 59698
       },
-      "setIdx": 2,
+      "setIdx": 3,
       "setId": 1,
       "iconIdx": 12
     },
@@ -202,7 +265,7 @@
         "code": 59689,
         "name": "caret-right"
       },
-      "setIdx": 2,
+      "setIdx": 3,
       "setId": 1,
       "iconIdx": 13
     },
@@ -232,7 +295,7 @@
         "code": 59690,
         "name": "caret-left"
       },
-      "setIdx": 2,
+      "setIdx": 3,
       "setId": 1,
       "iconIdx": 14
     },
@@ -262,7 +325,7 @@
         "code": 59691,
         "name": "caret-up"
       },
-      "setIdx": 2,
+      "setIdx": 3,
       "setId": 1,
       "iconIdx": 15
     },
@@ -292,7 +355,7 @@
         "code": 59692,
         "name": "caret-down"
       },
-      "setIdx": 2,
+      "setIdx": 3,
       "setId": 1,
       "iconIdx": 16
     },
@@ -322,7 +385,7 @@
         "code": 59651,
         "name": "angle-up"
       },
-      "setIdx": 2,
+      "setIdx": 3,
       "setId": 1,
       "iconIdx": 17
     },
@@ -352,7 +415,7 @@
         "code": 59648,
         "name": "angle-down"
       },
-      "setIdx": 2,
+      "setIdx": 3,
       "setId": 1,
       "iconIdx": 18
     },
@@ -382,43 +445,10 @@
         "code": 59649,
         "name": "angle-left"
       },
-      "setIdx": 2,
+      "setIdx": 3,
       "setId": 1,
       "iconIdx": 19
     },
-    {
-      "icon": {
-        "paths": [
-          "M1328 320c-8.832 0-16 7.168-16 16v640c0 8.832-7.168 16-16 16h-1248c-8.832 0-16-7.168-16-16v-640c0-8.832-7.168-16-16-16s-16 7.168-16 16v640c0 26.464 21.536 48 48 48h1248c26.464 0 48-21.536 48-48v-640c0-8.832-7.168-16-16-16zM1296 0h-1248c-26.464 0-48 21.536-48 48v192c0 8.832 7.168 16 16 16h1312c8.832 0 16-7.168 16-16v-192c0-26.464-21.536-48-48-48zM1312 224h-1280v-176c0-8.832 7.168-16 16-16h1248c8.832 0 16 7.168 16 16v176zM560 896c8.832 0 16-7.168 16-16v-512c0-8.832-7.168-16-16-16h-416c-8.832 0-16 7.168-16 16v512c0 8.832 7.168 16 16 16h416zM160 384h384v480h-384v-480zM720 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 640h480c8.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 800h480c8.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 128c0 17.673 14.327 32 32 32s32-14.327 32-32c0-17.673-14.327-32-32-32s-32 14.327-32 32zM224 128c0 17.673 14.327 32 32 32s32-14.327 32-32c0-17.673-14.327-32-32-32s-32 14.327-32 32zM352 128c0 17.673 14.327 32 32 32s32-14.327 32-32c0-17.673-14.327-32-32-32s-32 14.327-32 32z"
-        ],
-        "attrs": [
-          {}
-        ],
-        "width": 1344,
-        "isMulticolor": false,
-        "isMulticolor2": false,
-        "tags": [
-          "browser",
-          "window",
-          "software",
-          "program"
-        ],
-        "grid": 32
-      },
-      "attrs": [
-        {}
-      ],
-      "properties": {
-        "order": 1,
-        "id": 0,
-        "prevSize": 32,
-        "code": 59701,
-        "name": "browser"
-      },
-      "setIdx": 2,
-      "setId": 1,
-      "iconIdx": 1
-    },
     {
       "icon": {
         "paths": [
@@ -445,7 +475,7 @@
         "code": 59699,
         "name": "unlocked"
       },
-      "setIdx": 2,
+      "setIdx": 3,
       "setId": 1,
       "iconIdx": 2
     },
@@ -477,7 +507,7 @@
         "code": 59700,
         "name": "lock"
       },
-      "setIdx": 2,
+      "setIdx": 3,
       "setId": 1,
       "iconIdx": 3
     },
@@ -516,7 +546,7 @@
         "code": 59694,
         "name": "reset"
       },
-      "setIdx": 2,
+      "setIdx": 3,
       "setId": 1,
       "iconIdx": 4
     },
@@ -546,7 +576,7 @@
         "code": 59695,
         "name": "pause"
       },
-      "setIdx": 2,
+      "setIdx": 3,
       "setId": 1,
       "iconIdx": 5
     },
@@ -576,7 +606,7 @@
         "code": 59696,
         "name": "play"
       },
-      "setIdx": 2,
+      "setIdx": 3,
       "setId": 1,
       "iconIdx": 6
     },
@@ -611,7 +641,7 @@
         "code": 59693,
         "name": "settings2"
       },
-      "setIdx": 2,
+      "setIdx": 3,
       "setId": 1,
       "iconIdx": 7
     },
@@ -648,7 +678,7 @@
         "prevSize": 32,
         "code": 59650
       },
-      "setIdx": 2,
+      "setIdx": 3,
       "setId": 1,
       "iconIdx": 8
     },
@@ -677,7 +707,7 @@
         "prevSize": 32,
         "code": 59652
       },
-      "setIdx": 2,
+      "setIdx": 3,
       "setId": 1,
       "iconIdx": 20
     },
@@ -706,7 +736,7 @@
         "prevSize": 32,
         "code": 59653
       },
-      "setIdx": 2,
+      "setIdx": 3,
       "setId": 1,
       "iconIdx": 21
     },
@@ -735,7 +765,7 @@
         "prevSize": 32,
         "code": 59654
       },
-      "setIdx": 2,
+      "setIdx": 3,
       "setId": 1,
       "iconIdx": 22
     },
@@ -764,7 +794,7 @@
         "prevSize": 32,
         "code": 59655
       },
-      "setIdx": 2,
+      "setIdx": 3,
       "setId": 1,
       "iconIdx": 23
     },
@@ -793,7 +823,7 @@
         "prevSize": 32,
         "code": 59656
       },
-      "setIdx": 2,
+      "setIdx": 3,
       "setId": 1,
       "iconIdx": 24
     },
@@ -822,7 +852,7 @@
         "prevSize": 32,
         "code": 59657
       },
-      "setIdx": 2,
+      "setIdx": 3,
       "setId": 1,
       "iconIdx": 25
     },
@@ -851,7 +881,7 @@
         "prevSize": 32,
         "code": 59658
       },
-      "setIdx": 2,
+      "setIdx": 3,
       "setId": 1,
       "iconIdx": 26
     },
@@ -880,7 +910,7 @@
         "prevSize": 32,
         "code": 59659
       },
-      "setIdx": 2,
+      "setIdx": 3,
       "setId": 1,
       "iconIdx": 27
     },
@@ -909,7 +939,7 @@
         "prevSize": 32,
         "code": 59660
       },
-      "setIdx": 2,
+      "setIdx": 3,
       "setId": 1,
       "iconIdx": 28
     },
@@ -938,7 +968,7 @@
         "prevSize": 32,
         "code": 59661
       },
-      "setIdx": 2,
+      "setIdx": 3,
       "setId": 1,
       "iconIdx": 29
     },
@@ -967,7 +997,7 @@
         "prevSize": 32,
         "code": 59662
       },
-      "setIdx": 2,
+      "setIdx": 3,
       "setId": 1,
       "iconIdx": 30
     },
@@ -996,7 +1026,7 @@
         "prevSize": 32,
         "code": 59663
       },
-      "setIdx": 2,
+      "setIdx": 3,
       "setId": 1,
       "iconIdx": 31
     },
@@ -1025,7 +1055,7 @@
         "prevSize": 32,
         "code": 59664
       },
-      "setIdx": 2,
+      "setIdx": 3,
       "setId": 1,
       "iconIdx": 32
     },
@@ -1054,7 +1084,7 @@
         "prevSize": 32,
         "code": 59665
       },
-      "setIdx": 2,
+      "setIdx": 3,
       "setId": 1,
       "iconIdx": 33
     },
@@ -1083,7 +1113,7 @@
         "prevSize": 32,
         "code": 59666
       },
-      "setIdx": 2,
+      "setIdx": 3,
       "setId": 1,
       "iconIdx": 34
     },
@@ -1112,7 +1142,7 @@
         "prevSize": 32,
         "code": 59667
       },
-      "setIdx": 2,
+      "setIdx": 3,
       "setId": 1,
       "iconIdx": 35
     },
@@ -1141,7 +1171,7 @@
         "prevSize": 32,
         "code": 59668
       },
-      "setIdx": 2,
+      "setIdx": 3,
       "setId": 1,
       "iconIdx": 36
     },
@@ -1170,7 +1200,7 @@
         "prevSize": 32,
         "code": 59669
       },
-      "setIdx": 2,
+      "setIdx": 3,
       "setId": 1,
       "iconIdx": 37
     },
@@ -1199,7 +1229,7 @@
         "prevSize": 32,
         "code": 59670
       },
-      "setIdx": 2,
+      "setIdx": 3,
       "setId": 1,
       "iconIdx": 38
     },
@@ -1228,7 +1258,7 @@
         "prevSize": 32,
         "code": 59671
       },
-      "setIdx": 2,
+      "setIdx": 3,
       "setId": 1,
       "iconIdx": 39
     },
@@ -1257,7 +1287,7 @@
         "prevSize": 32,
         "code": 59672
       },
-      "setIdx": 2,
+      "setIdx": 3,
       "setId": 1,
       "iconIdx": 40
     },
@@ -1286,7 +1316,7 @@
         "prevSize": 32,
         "code": 59673
       },
-      "setIdx": 2,
+      "setIdx": 3,
       "setId": 1,
       "iconIdx": 41
     },
@@ -1315,7 +1345,7 @@
         "prevSize": 32,
         "code": 59674
       },
-      "setIdx": 2,
+      "setIdx": 3,
       "setId": 1,
       "iconIdx": 42
     },
@@ -1344,7 +1374,7 @@
         "prevSize": 32,
         "code": 59675
       },
-      "setIdx": 2,
+      "setIdx": 3,
       "setId": 1,
       "iconIdx": 43
     },
@@ -1373,7 +1403,7 @@
         "prevSize": 32,
         "code": 59676
       },
-      "setIdx": 2,
+      "setIdx": 3,
       "setId": 1,
       "iconIdx": 44
     },
@@ -1402,7 +1432,7 @@
         "prevSize": 32,
         "code": 59677
       },
-      "setIdx": 2,
+      "setIdx": 3,
       "setId": 1,
       "iconIdx": 45
     },
@@ -1431,7 +1461,7 @@
         "prevSize": 32,
         "code": 59678
       },
-      "setIdx": 2,
+      "setIdx": 3,
       "setId": 1,
       "iconIdx": 46
     },
@@ -1460,7 +1490,7 @@
         "prevSize": 32,
         "code": 59679
       },
-      "setIdx": 2,
+      "setIdx": 3,
       "setId": 1,
       "iconIdx": 47
     },
@@ -1489,7 +1519,7 @@
         "prevSize": 32,
         "code": 59680
       },
-      "setIdx": 2,
+      "setIdx": 3,
       "setId": 1,
       "iconIdx": 48
     },
@@ -1518,7 +1548,7 @@
         "prevSize": 32,
         "code": 59681
       },
-      "setIdx": 2,
+      "setIdx": 3,
       "setId": 1,
       "iconIdx": 49
     },
@@ -1547,7 +1577,7 @@
         "prevSize": 32,
         "code": 59682
       },
-      "setIdx": 2,
+      "setIdx": 3,
       "setId": 1,
       "iconIdx": 50
     },
@@ -1576,7 +1606,7 @@
         "prevSize": 32,
         "code": 59683
       },
-      "setIdx": 2,
+      "setIdx": 3,
       "setId": 1,
       "iconIdx": 51
     },
@@ -1605,7 +1635,7 @@
         "prevSize": 32,
         "code": 59684
       },
-      "setIdx": 2,
+      "setIdx": 3,
       "setId": 1,
       "iconIdx": 52
     },
@@ -1634,7 +1664,7 @@
         "prevSize": 32,
         "code": 59685
       },
-      "setIdx": 2,
+      "setIdx": 3,
       "setId": 1,
       "iconIdx": 53
     },
@@ -1663,7 +1693,7 @@
         "prevSize": 32,
         "code": 59686
       },
-      "setIdx": 2,
+      "setIdx": 3,
       "setId": 1,
       "iconIdx": 54
     },
@@ -1692,7 +1722,7 @@
         "prevSize": 32,
         "code": 59687
       },
-      "setIdx": 2,
+      "setIdx": 3,
       "setId": 1,
       "iconIdx": 55
     },
@@ -1721,7 +1751,7 @@
         "prevSize": 32,
         "code": 59688
       },
-      "setIdx": 2,
+      "setIdx": 3,
       "setId": 1,
       "iconIdx": 56
     }
diff --git a/src/Squidex/app/theme/icomoon/style.css b/src/Squidex/app/theme/icomoon/style.css
index f1314a0b4..58fc10e50 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?y1amtc');
-  src:  url('fonts/icomoon.eot?y1amtc#iefix') format('embedded-opentype'),
-    url('fonts/icomoon.ttf?y1amtc') format('truetype'),
-    url('fonts/icomoon.woff?y1amtc') format('woff'),
-    url('fonts/icomoon.svg?y1amtc#icomoon') format('svg');
+  src:  url('fonts/icomoon.eot?y7zcsi');
+  src:  url('fonts/icomoon.eot?y7zcsi#iefix') format('embedded-opentype'),
+    url('fonts/icomoon.ttf?y7zcsi') format('truetype'),
+    url('fonts/icomoon.woff?y7zcsi') format('woff'),
+    url('fonts/icomoon.svg?y7zcsi#icomoon') format('svg');
   font-weight: normal;
   font-style: normal;
 }
@@ -24,9 +24,18 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-control-Stars:before {
+  content: "\e93a";
+}
+.icon-browser:before {
+  content: "\e935";
+}
 .icon-control-RichText:before {
   content: "\e939";
 }
+.icon-control-Date:before {
+  content: "\e936";
+}
 .icon-control-Markdown:before {
   content: "\e938";
 }
@@ -63,9 +72,6 @@
 .icon-angle-left:before {
   content: "\e901";
 }
-.icon-browser:before {
-  content: "\e935";
-}
 .icon-unlocked:before {
   content: "\e933";
 }