diff -r 7e5174fe9816 -r 5b7d7ab6baff web/res/metadataplayer/Annotation.css
--- a/web/res/metadataplayer/Annotation.css	Mon May 21 18:53:02 2012 +0200
+++ b/web/res/metadataplayer/Annotation.css	Tue May 22 16:47:35 2012 +0200
@@ -4,7 +4,6 @@
     border-color: #b7b7b7;
     padding: 0 1px 1px;
     margin: 0;
-    font-family: Helvetica, Arial, sans-serif;
 }
 
 .Ldt-Annotation-Widget.Ldt-Annotation-ShowTop {
@@ -20,11 +19,15 @@
 
 .Ldt-Annotation-Inner h3 {
     margin: 5px 0;
-    font-size: 15px;
+    font-size: 14px;
     font-weight: bold;
 }
 
-.Ldt-Annotation-Title {
+.Ldt-Annotation-Inner h3.Ldt-Annotation-MashupOrigin {
+    font-size: 12px;
+}
+
+.Ldt-Annotation-Title, .Ldt-Annotation-MashupMedia {
     color: #0068c4;
 }
 
@@ -76,16 +79,39 @@
     display: none;
 }
 
+.Ldt-Annotation-TagTitle {
+    margin: 5px 0 2px; font-size: 12px;
+}
+
 ul.Ldt-Annotation-Tags {
-    list-style: none; padding: 0; margin: 5px 0;
+    display: inline; list-style: none; padding: 0; margin: 5px 0;
+}
+
+li.Ldt-Annotation-TagLabel {
+    display: inline-block; border: none; margin: 0 10px 5px 0; height: 23px; padding: 0 0 0 20px;
+    background: url(img/tag.png) left top no-repeat;
+    cursor: pointer;
 }
 
-.Ldt-Annotation-Tags li {
-    display: inline-block; margin: 0 3px 0 0; padding: 0;
+.Ldt-Annotation-TagLabel span {
+    display: inline-block; font-size: 12px; height: 19px; padding: 4px 5px 0 0; border: none; margin: 0;
+    background: url(img/tag.png) right top no-repeat;
+}
+
+li.Ldt-Annotation-TagLabel:hover {
+    background-position: left -23px;
 }
 
-.Ldt-Annotation-TagLabel {
-    font-weight: bold;
+.Ldt-Annotation-TagLabel:hover span {
+    background-position: right -23px;
+}
+
+.Ldt-Annotation-MashupOrigin {
+    display: none;
+}
+
+.Ldt-Annotation-isMashup .Ldt-Annotation-MashupOrigin {
+    display: block;
 }
 
 .Ldt-Annotation-Empty .Ldt-Annotation-HiddenWhenEmpty {