diff --git a/UI/WebServerResources/SchedulerUI.css b/UI/WebServerResources/SchedulerUI.css
index 653555b5c..f2838c1df 100644
--- a/UI/WebServerResources/SchedulerUI.css
+++ b/UI/WebServerResources/SchedulerUI.css
@@ -1318,6 +1318,9 @@ DIV.gradient > IMG
   min-height: 15px; /* for 15-minute events */
   width: 100%; }
 
+DIV.text SPAN IMG
+{ vertical-align: middle; }
+
 DIV#calendarHeader DIV.event,
 DIV.monthView DIV.event
 { position: relative;
@@ -1329,11 +1332,6 @@ DIV.monthView DIV.event
   white-space: nowrap;
   height: 20px; }
 
-DIV.event.alarm DIV.text
-{ background-image: url("alarm.png");
-  background-repeat: no-repeat;
-  background-position: top right; }
-
 DIV.eventInside.tentative,
 DIV.eventInside.needs-action
 { -moz-opacity: 0.7;
diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js
index 095d8a5a9..da6262c95 100644
--- a/UI/WebServerResources/SchedulerUI.js
+++ b/UI/WebServerResources/SchedulerUI.js
@@ -1378,7 +1378,7 @@ function newBaseEventDIV(eventRep, event, eventText) {
     //	log ("5 end = " + event[5]);
     //	log ("6 location = " + event[6]);
     //	log ("7 isallday = " + event[7]);
-    //	log ("8 classification = " + event[8]);
+    //	log ("8 classification = " + event[8]); // 0 = public, 1 = private, 2 = confidential
     //	log ("9 category = " + event[9]);
     //	log ("10 participants emails = " + event[10]);
     //	log ("11 participants states = " + event[11]);
@@ -1394,6 +1394,10 @@ function newBaseEventDIV(eventRep, event, eventText) {
     var eventCell = createElement("div");
     eventCell.cname = event[0];
     eventCell.calendar = event[1];
+//    if (event[8] == 1)
+//        eventCell.addClassName("private");
+//    else if (event[8] == 2)
+//        eventCell.addClassName("confidential");
     if (eventRep.recurrenceTime)
         eventCell.recurrenceTime = eventRep.recurrenceTime;
     //eventCell.owner = event[12];
@@ -1402,8 +1406,8 @@ function newBaseEventDIV(eventRep, event, eventText) {
     eventCell.erasable = event[18];
     eventCell.ownerIsOrganizer = event[19];
     eventCell.addClassName("event");
-    if (event[14] > 0)
-        eventCell.addClassName("alarm");
+//    if (event[14] > 0)
+//        eventCell.addClassName("alarm");
 
     var innerDiv = createElement("div");
     eventCell.appendChild(innerDiv);
@@ -1423,7 +1427,17 @@ function newBaseEventDIV(eventRep, event, eventText) {
     var textDiv = createElement("div");
     innerDiv.appendChild(textDiv);
     textDiv.addClassName("text");
-    textDiv.update(eventText.replace(/(\\r)?\\n/g, "<BR/>"));
+    var iconSpan = createElement("span");
+    textDiv.appendChild(iconSpan);
+    textDiv.appendChild(document.createTextNode(eventText.replace(/(\\r)?\\n/g, "<BR/>")));
+
+    // Add alarm and classification icons
+    if (event[8] == 1)
+        createElement("img", null, null, {src: ResourcesURL + "/private.png"}, null, iconSpan);
+    else if (event[8] == 2)
+        createElement("img", null, null, {src: ResourcesURL + "/confidential.png"}, null, iconSpan);
+    if (event[14] > 0)
+        createElement("img", null, null, {src: ResourcesURL + "/alarm.png"}, null, iconSpan);
 
     if (event[9] != null) {
         var categoryStyle = categoriesStyles.get(event[9]);
diff --git a/UI/WebServerResources/alarm.png b/UI/WebServerResources/alarm.png
index 81b44d927..e8676dfde 100644
Binary files a/UI/WebServerResources/alarm.png and b/UI/WebServerResources/alarm.png differ
diff --git a/UI/WebServerResources/confidential.png b/UI/WebServerResources/confidential.png
new file mode 100644
index 000000000..8af82f011
Binary files /dev/null and b/UI/WebServerResources/confidential.png differ
diff --git a/UI/WebServerResources/private.png b/UI/WebServerResources/private.png
new file mode 100644
index 000000000..f8420bb65
Binary files /dev/null and b/UI/WebServerResources/private.png differ