diff --git a/cockatrice/cockatrice.qrc b/cockatrice/cockatrice.qrc
index 73fa3f87e..5fb8ed399 100644
--- a/cockatrice/cockatrice.qrc
+++ b/cockatrice/cockatrice.qrc
@@ -56,6 +56,7 @@
     <file>resources/genders/unknown.svg</file>
     
     <file>resources/buddy_icon.svg</file>
+    <file>resources/empty_icon.svg</file>
 
     <file>resources/countries/ar.svg</file>
     <file>resources/countries/at.svg</file>
diff --git a/cockatrice/resources/buddy_icon.svg b/cockatrice/resources/buddy_icon.svg
index e487714aa..fa32b8c37 100644
--- a/cockatrice/resources/buddy_icon.svg
+++ b/cockatrice/resources/buddy_icon.svg
@@ -5,6 +5,7 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    viewBox="0 0 64 64"
@@ -27,7 +28,60 @@
     </rdf:RDF>
   </metadata>
   <defs
-     id="defs10" />
+     id="defs10">
+    <linearGradient
+       id="linearGradient3758">
+      <stop
+         id="stop3760"
+         offset="0"
+         style="stop-color:#ece400;stop-opacity:1;" />
+      <stop
+         id="stop3762"
+         offset="1"
+         style="stop-color:#ec8b00;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3750">
+      <stop
+         style="stop-color:#ece400;stop-opacity:1;"
+         offset="0"
+         id="stop3752" />
+      <stop
+         style="stop-color:#ece400;stop-opacity:0;"
+         offset="1"
+         id="stop3754" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3758"
+       id="linearGradient3756"
+       x1="1.960216"
+       y1="31.261461"
+       x2="60.456024"
+       y2="31.261461"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.87626222,0,0,0.87626222,4.174756,4.8555263)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3758-7"
+       id="linearGradient3756-1"
+       x1="1.960216"
+       y1="31.261461"
+       x2="60.456024"
+       y2="31.261461"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3758-7">
+      <stop
+         id="stop3760-4"
+         offset="0"
+         style="stop-color:#ece400;stop-opacity:1;" />
+      <stop
+         id="stop3762-0"
+         offset="1"
+         style="stop-color:#ec8b00;stop-opacity:1;" />
+    </linearGradient>
+  </defs>
   <sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
@@ -42,15 +96,20 @@
      id="namedview8"
      showgrid="false"
      inkscape:zoom="7.375"
-     inkscape:cx="27.318536"
+     inkscape:cx="6.1659936"
      inkscape:cy="23.31428"
      inkscape:window-x="-8"
      inkscape:window-y="-8"
      inkscape:window-maximized="1"
      inkscape:current-layer="svg2" />
   <path
-     d="M 60.456025,23.062583 38.036064,22.95865 31.209111,0.27044038 24.381168,22.95865 1.9602161,23.062586 20.162454,37.54598 10.959875,62.252482 31.209111,46.553559 51.468243,62.252482 42.254777,37.54598 z"
+     d="M 61.442826,23.621762 38.532402,23.515555 31.556101,0.331013 24.578789,23.515555 1.6673502,23.621765 20.267785,38.422001 10.863888,63.668987 31.556101,47.626631 52.258426,63.668987 42.843404,38.422001 z"
+     id="path4-9"
+     style="fill:#000000;fill-opacity:1"
+     inkscape:connector-curvature="0" />
+  <path
+     d="M 57.150089,25.064396 37.504323,24.973324 31.522122,5.092503 25.539054,24.973324 5.8924192,25.064399 21.842354,37.75565 13.778482,59.405024 31.522122,45.64865 49.274434,59.405024 41.201022,37.75565 z"
      id="path4"
-     style="fill:#9600ec;fill-opacity:1"
+     style="fill:url(#linearGradient3756);fill-opacity:1"
      inkscape:connector-curvature="0" />
 </svg>
diff --git a/cockatrice/resources/empty_icon.svg b/cockatrice/resources/empty_icon.svg
new file mode 100644
index 000000000..ff4027a8f
--- /dev/null
+++ b/cockatrice/resources/empty_icon.svg
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   viewBox="0 0 64 64"
+   enable-background="new 0 0 64 64"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   width="100%"
+   height="100%"
+   sodipodi:docname="empty_icon.svg">
+  <metadata
+     id="metadata12">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs10">
+    <linearGradient
+       id="linearGradient3758">
+      <stop
+         id="stop3760"
+         offset="0"
+         style="stop-color:#ece400;stop-opacity:1;" />
+      <stop
+         id="stop3762"
+         offset="1"
+         style="stop-color:#ec8b00;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3750">
+      <stop
+         style="stop-color:#ece400;stop-opacity:1;"
+         offset="0"
+         id="stop3752" />
+      <stop
+         style="stop-color:#ece400;stop-opacity:0;"
+         offset="1"
+         id="stop3754" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3758"
+       id="linearGradient3756"
+       x1="1.960216"
+       y1="31.261461"
+       x2="60.456024"
+       y2="31.261461"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.87626222,0,0,0.87626222,4.174756,4.8555263)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3758-7"
+       id="linearGradient3756-1"
+       x1="1.960216"
+       y1="31.261461"
+       x2="60.456024"
+       y2="31.261461"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3758-7">
+      <stop
+         id="stop3760-4"
+         offset="0"
+         style="stop-color:#ece400;stop-opacity:1;" />
+      <stop
+         id="stop3762-0"
+         offset="1"
+         style="stop-color:#ec8b00;stop-opacity:1;" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1028"
+     id="namedview8"
+     showgrid="false"
+     inkscape:zoom="7.375"
+     inkscape:cx="6.1659936"
+     inkscape:cy="23.31428"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+</svg>
diff --git a/cockatrice/src/chatview.cpp b/cockatrice/src/chatview.cpp
index 8daed9b80..e99df633f 100644
--- a/cockatrice/src/chatview.cpp
+++ b/cockatrice/src/chatview.cpp
@@ -137,6 +137,8 @@ void ChatView::appendMessage(QString message, QString sender, UserLevelFlags use
                 QMap<QString, UserListTWI *> buddyList = tabSupervisor->getUserListsTab()->getBuddyList()->getUsers();
                 if (buddyList.contains(sender))
                     cursor.insertImage(PixmapGenerator::generatePixmap(pixelSize, ":/resources/buddy_icon.svg").toImage());
+                else
+                    cursor.insertImage(PixmapGenerator::generatePixmap(pixelSize, ":/resources/empty_icon.svg").toImage());
             }
             cursor.insertText(" ");
         }