diff --git a/UI/MailerUI/product.plist b/UI/MailerUI/product.plist
index fc31aac67..722f929b0 100644
--- a/UI/MailerUI/product.plist
+++ b/UI/MailerUI/product.plist
@@ -52,11 +52,8 @@
 		     "message-mail.png",
 		     "message-mail-read.png",
 
-		     "icon_mark_flagged.gif",
-		     "icon_mark_read.gif",
-		     "icon_mark_unflagged.gif",
-		     "icon_mark_unread.gif",
-		     "icon_read.gif",
+		     "dot.png",
+		     "flag.png",
 		     "icon_unread.gif",
 
 		     "title_attachment_14x14.png",
diff --git a/UI/Templates/MailerUI/UIxMailListView.wox b/UI/Templates/MailerUI/UIxMailListView.wox
index dc59caeda..631bac945 100644
--- a/UI/Templates/MailerUI/UIxMailListView.wox
+++ b/UI/Templates/MailerUI/UIxMailListView.wox
@@ -71,7 +71,7 @@
                 ><img rsrc:src="flag.png" const:class="messageIsFlagged" 
               /></var:if
             ><var:if condition="isMessageFlagged" const:negate="YES"
-                ><img rsrc:src="flag-col.png" 
+                ><img rsrc:src="dot.png" 
               /></var:if
             ></td
           ></var:if>
@@ -110,7 +110,7 @@
           ><var:if condition="currentColumn.value" const:value="Unread"
             ><td class="messageFlagColumn"
               ><var:if condition="isMessageRead"
-                ><img rsrc:src="icon_read.gif"
+                ><img rsrc:src="dot.png"
                 class="mailerReadIcon"
                 label:title="Mark Unread"
                 label:title-markread="Mark Read"
diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js
index 4374eb44a..f7f45735c 100644
--- a/UI/WebServerResources/MailerUI.js
+++ b/UI/WebServerResources/MailerUI.js
@@ -114,14 +114,14 @@ function flagMailInWindow (win, msguid, flagged) {
     var row = win.$("row_" + msguid);
 
     if (row) {
-        var col = $$("TR#row_"+msguid+" TD.messageFlag").first ();
-        var img = col.childElements ().first ();
+        var col = row.select("TD.messageFlag").first();
+        var img = col.select("img").first();
         if (flagged) {
-            img.src = img.src.replace (/-col/, "");
-            img.addClassName ("messageIsFlagged");
+            img.setAttribute("src", ResourcesURL + "/flag.png");
+            img.addClassName("messageIsFlagged");
         }
         else {
-            img.src = img.src.replace (/.png/, "-col.png");
+            img.setAttribute("src", ResourcesURL + "/dot.png");
             img.removeClassName ("messageIsFlagged");
         }
     }
@@ -142,7 +142,7 @@ function markMailInWindow(win, msguid, markread) {
                     img.removeClassName("mailerUnreadIcon");
                     img.addClassName("mailerReadIcon");
                     img.setAttribute("id", "readdiv_" + msguid);
-                    img.setAttribute("src", ResourcesURL + "/icon_read.gif");
+                    img.setAttribute("src", ResourcesURL + "/dot.png");
                     var title = img.getAttribute("title-markunread");
                     if (title)
                         img.setAttribute("title", title);
@@ -1460,7 +1460,7 @@ function openInbox(node) {
 
 function initFlagIcons () {
     var icons = $$("TABLE#messageList TBODY TR.mailer_listcell_regular TD.messageFlag");
-    for (var i = 0; i < icons.length; i++) 
+    for (var i = 0; i < icons.length; i++)
       icons[i].onclick = mailListFlagMessageToggle;
 }
 
diff --git a/UI/WebServerResources/dot.png b/UI/WebServerResources/dot.png
new file mode 100644
index 000000000..a62a523d6
Binary files /dev/null and b/UI/WebServerResources/dot.png differ
diff --git a/UI/WebServerResources/icon_read.gif b/UI/WebServerResources/icon_read.gif
deleted file mode 100644
index 6c7c104e3..000000000
Binary files a/UI/WebServerResources/icon_read.gif and /dev/null differ