diff --git a/src/client/app/js/app/core/Dict.js b/src/client/app/js/app/core/Dict.js
index ea3c7fb..6525311 100644
--- a/src/client/app/js/app/core/Dict.js
+++ b/src/client/app/js/app/core/Dict.js
@@ -111,6 +111,7 @@ app.core.Dict = {
         "CLOSE" : "Schließen",
         "CREATE_APPOINTMENT" : "Termin erstellen",
         "APPOINTMENT_SUBJECT" : "Terminname",
+        "APPOINTMENT_ICON" : "Icon",
         "APPOINTMENT_START_DATE" : "Startdatum",
         "APPOINTMENT_START_TIME" : "Startzeit",
         "APPOINTMENT_END_DATE" : "Enddatum",
diff --git a/src/client/app/tmpl/appointment-detail.html b/src/client/app/tmpl/appointment-detail.html
index d35a27d..4f92ab5 100644
--- a/src/client/app/tmpl/appointment-detail.html
+++ b/src/client/app/tmpl/appointment-detail.html
@@ -44,7 +44,7 @@
                             <% }    %>
                         </div>
                         <div class="appointment-detail-appointment-name">
-                            <%= a.getSubject() %>
+                            &#10084; <%= a.getSubject() %>
                         </div>
                     </div>
                 </div>
diff --git a/src/client/app/tmpl/appointment-form-edit.html b/src/client/app/tmpl/appointment-form-edit.html
index 114d836..4512031 100644
--- a/src/client/app/tmpl/appointment-form-edit.html
+++ b/src/client/app/tmpl/appointment-form-edit.html
@@ -24,22 +24,47 @@
                            value="<%= mTeam.getId() %>" />
 
                     <div class="form-group">
-                        <label for="input-subject">
-                            <%= _lc( 'APPOINTMENT_SUBJECT' ) %>
-                        </label>
-                        <input type="text"
-                               minlength="3"
-                               maxlength="255"
-                               name="subject"
-                               data-id="input-subject"
-                               id="input-subject"
-                               class="form-control"
-                               value="<%= a.getSubject() %>"
-                               autocomplete="off"
-                               required />
-                        <div class="invalid-feedback">
-                            <%= _lc( 'VALIDATION_INPUT_REQUIRED' ) %>
+                        <div class="form-row">
+                            <div class="col col-2">
+                                <label for="input-start-date">
+                                    <%= _lc( 'APPOINTMENT_ICON' ) %>
+                                </label>
+                                <select class="form-control"
+                                        name="categoryicon">
+                                    <option value="">- kein -</option>
+                                    <option value="flower">&#9880;</option>
+                                    <option value="flag">&#9873;</option>
+                                    <option value="ballot-x">&cross;</option>
+                                    <option value="star">&#10025;</option>
+                                    <option value="asterisk">&#10045;</option>
+                                    <option value="heart">&#10084;</option>
+                                    <option value="arrow">&#10132;</option>
+                                    <option value="gear">&#9881;</option>
+                                    <option value="circle-dots">&#9863;</option>
+                                    <option value="sun">&#9788;</option>
+                                    <option value="smiley">&#9787;</option>
+                                </select>
+                            </div>
+                            <div class="col col-10">
+                                <label for="input-subject">
+                                    <%= _lc( 'APPOINTMENT_SUBJECT' ) %>
+                                </label>
+                                <input type="text"
+                                       minlength="3"
+                                       maxlength="255"
+                                       name="subject"
+                                       data-id="input-subject"
+                                       id="input-subject"
+                                       class="form-control"
+                                       value="<%= a.getSubject() %>"
+                                       autocomplete="off"
+                                       required />
+                                <div class="invalid-feedback">
+                                    <%= _lc( 'VALIDATION_INPUT_REQUIRED' ) %>
+                                </div>
+                            </div>
                         </div>
+
                     </div>
 
                     <% var categories = mTeam.getAdminCourseCategoriesForProfile( currentProfile ); %>
diff --git a/src/client/app/tmpl/appointment-form.html b/src/client/app/tmpl/appointment-form.html
index 9988f99..18e1f08 100644
--- a/src/client/app/tmpl/appointment-form.html
+++ b/src/client/app/tmpl/appointment-form.html
@@ -38,20 +38,44 @@
                 </div>
 
                 <div class="form-group">
-                    <label for="input-subject">
-                        <%= _lc( 'APPOINTMENT_SUBJECT' ) %>
-                    </label>
-                    <input type="text"
-                           minlength="3"
-                           maxlength="255"
-                           name="subject"
-                           data-id="input-subject"
-                           id="input-subject"
-                           class="form-control"
-                           autocomplete="off"
-                           required />
-                    <div class="invalid-feedback">
-                        <%= _lc( 'VALIDATION_INPUT_REQUIRED' ) %>
+                    <div class="form-row">
+                        <div class="col col-2">
+                            <label for="input-start-date">
+                                <%= _lc( 'APPOINTMENT_ICON' ) %>
+                            </label>
+                            <select class="form-control"
+                                    name="categoryicon">
+                                <option value="">- kein -</option>
+                                <option value="flower">&#9880;</option>
+                                <option value="flag">&#9873;</option>
+                                <option value="ballot-x">&cross;</option>
+                                <option value="star">&#10025;</option>
+                                <option value="asterisk">&#10045;</option>
+                                <option value="heart">&#10084;</option>
+                                <option value="arrow">&#10132;</option>
+                                <option value="gear">&#9881;</option>
+                                <option value="circle-dots">&#9863;</option>
+                                <option value="sun">&#9788;</option>
+                                <option value="smiley">&#9787;</option>
+                            </select>
+                        </div>
+                        <div class="col col-10">
+                            <label for="input-subject">
+                                <%= _lc( 'APPOINTMENT_SUBJECT' ) %>
+                            </label>
+                            <input type="text"
+                                   minlength="3"
+                                   maxlength="255"
+                                   name="subject"
+                                   data-id="input-subject"
+                                   id="input-subject"
+                                   class="form-control"
+                                   autocomplete="off"
+                                   required />
+                            <div class="invalid-feedback">
+                                <%= _lc( 'VALIDATION_INPUT_REQUIRED' ) %>
+                            </div>
+                        </div>
                     </div>
                 </div>
 
diff --git a/src/client/app/tmpl/home-appointment-item.html b/src/client/app/tmpl/home-appointment-item.html
index 5169d96..9e36736 100644
--- a/src/client/app/tmpl/home-appointment-item.html
+++ b/src/client/app/tmpl/home-appointment-item.html
@@ -46,7 +46,7 @@
                     <% }    %>
                 </div>
             <div class="appointment-subject">
-                <%= a.getSubject() %>
+                &#10084; <%= a.getSubject() %>
                 <% if ( a.isDraft() ) { %>
                     <span class="badge badge-warning">Entwurf</span>
                 <% } %>