Merge branch 'master' into beta

src/client/app/css/app.css

@@ -1246,6 +1246,7 @@ h6.calendar-week {
 }
 .radio-icons p {
     margin: 0;
+    font-size: 16px;
     cursor: pointer;
 }
 .radio-icons p i {

src/client/app/tmpl/appointment-detail.html

@@ -44,7 +44,7 @@
                             <% }    %>
                         </div>
                         <div class="appointment-detail-appointment-name">
-                            <%= a.getIcon() %> <%= a.getSubject() %>
+                            <% if ( a.getIcon() ) { %><i class="fas <%= a.getIcon() %>"></i> <% } %><%= a.getSubject() %>
                         </div>
                     </div>
                 </div>