Bug 954506 - Improve look of contact drop target, r=florian.

im/content/buddy.xml

@@ -290,9 +290,10 @@
   </binding>
 
   <binding id="buddy-dummy" extends="chrome://instantbird/content/buddy.xml#buddy">
-    <content align="center" mousethrough="always">
-      <xul:label crop="end" flex="1" mousethrough="always"
-                 value="&lt;&contactDropTarget;&gt;"/>
+    <content align="center">
+      <xul:image class="dummyBuddyIcon"/>
+      <xul:label crop="end" flex="1" class="buddyDisplayName dummyBuddyLabel"
+                 value="&contactDropTarget2;" tooltiptext="&contactDropTarget2;"/>
     </content>
     <implementation>
      <method name="removeNode">

im/locales/en-US/chrome/instantbird/instantbird.dtd

@@ -108,7 +108,7 @@
 <!ENTITY expandContactTooltip          "Expand">
 <!ENTITY collapseContactTooltip        "Collapse">
 
-<!ENTITY contactDropTarget             "drop a contact here to merge it">
+<!ENTITY contactDropTarget2            "Drop another contact here to merge them.">
 
 <!ENTITY hideGroupTooltip              "Hide">
 

im/themes/blist.css

@@ -252,9 +252,14 @@ contact[droptarget] > buddy[dummy] {
   -moz-padding-start: 23px;
 }
 
-buddy[dummy] {
-  -moz-margin-start: -23px;
-  text-align: center;
+.dummyBuddyIcon {
+  margin: 1px 3px;
+  list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
+}
+
+.dummyBuddyLabel {
+  font-style: italic;
+  color: GrayText;
 }
 
 .prplBuddyIcon {
@@ -267,6 +272,7 @@ buddy[dummy] {
 
 .protoIcon,
 .statusIcon,
+.dummyBuddyIcon,
 .hideGroupButton,
 .startChatBubble,
 .expander-up,