diff --git a/APPL/CAD/default.asp b/APPL/CAD/default.asp
index e6cff93a80..6316e3090d 100644
--- a/APPL/CAD/default.asp
+++ b/APPL/CAD/default.asp
@@ -1118,10 +1118,10 @@ if (scenario_key != 0)
       }
 
       // Start draggen van een legendawaarde
-      function mydragstartLegenda(evt, kleur, waarde)
+      function mydragstartLegenda(evt, safe_inlineStyle, waarde)
       {
-        var imgHTML = "<div style='position:absolute;top:-10px;left:-10px;border:1px solid black;width:16px;height:16px'>"
-                    + "   <div style='border:8px solid #"+kleur+";line-height:0px;font-size:0px;'>&nbsp;</div>"
+        var imgHTML = "<div class='legendakleur' style='position:absolute;top:-10px;left:-10px;'>"
+                    + "   <div class='legendakleurblokje' style='" + safe_inlineStyle + "'>&nbsp;</div>"
                     + "</div>"
         mydragstart(evt, imgHTML, { type: "L", key:waarde });
       }
diff --git a/APPL/CAD/legenda.asp b/APPL/CAD/legenda.asp
index 1bfd3d001c..e3a9d47bcc 100644
--- a/APPL/CAD/legenda.asp
+++ b/APPL/CAD/legenda.asp
@@ -196,23 +196,32 @@
               + "  FROM CAD_LEGENDAWAARDE ti"
               + " WHERE ti.CAD_LEGENDA_KEY = " + legenda_key
               + " ORDER BY fac.safe_to_number(CAD_LEGENDAWAARDE_VALUE)" // Numeriek sorteren!
-      oRs = Oracle.Execute(sql)
+      oRs = Oracle.Execute(sql);
+
+      var fg_papercolor = S("fg_papercolor");
+      var r = (fg_papercolor >> 16) % 256;
+      var g = (fg_papercolor >> 8) % 256;
+      var b = fg_papercolor % 256;
+      var legendBackground = "rgb(" + r + ", " + g + ", " + b + ")";
 
       v_count   = "";
       while (!oRs.EOF)
       {
-            v_waarde_key = null;
-            v_waarde  = oRs.Fields("CAD_LEGENDAWAARDE_OMSCHR").value;
-            v_kleur   = oRs.Fields("CAD_LEGENDAWAARDE_RGB").value.replace(/ /g,'');
+            var v_waarde_key = null;
+            var v_waarde  = oRs.Fields("CAD_LEGENDAWAARDE_OMSCHR").value;
+            var v_kleur   = oRs.Fields("CAD_LEGENDAWAARDE_RGB").value.replace(/ /g,'');
+            var legendForeground = toRgb(v_kleur, { "alpha": S("fg_themaalpha") });
             if (discreet && !fulldiscreet)
             {
                 v_count = " (" + oRs.Fields("aantal").value + "x)";
                 v_waarde_key  = oRs.Fields("waarde_key").value;
             }
-%>
-      <tr
+
+            var styleAttr = "border-color: " + safe.htmlattr(legendForeground) + ";"
+                          + "background-color: " + safe.htmlattr(legendBackground);
+%>    <tr
 <% if (isUpdatable && v_waarde_key != null) { %>
-         class='legendaupdatable' onmousedown='mydragstartLegenda(event, "<%=safe.htmlattr(toHexValue(v_kleur))%>", "<%=v_waarde_key%>");'
+         class='legendaupdatable' onmousedown='mydragstartLegenda(event, "<%=safe.htmlattr(safe.jsstring(styleAttr))%>", "<%=v_waarde_key%>");'
 <% } else {
         if ((themaType == 0x01))
         { %>
@@ -222,7 +231,7 @@
         >
         <td class='legendaregel'>
             <div class='legendakleur'>
-                <div style="border:8px solid #<%=safe.htmlattr(toHexValue(v_kleur))%>;line-height:0px;font-size:0px;">&nbsp;</div>
+                <div class='legendakleurblokje' style="<%=styleAttr%>">&nbsp;</div>
             </div>
          </td>
         <td class='legendatekst' title="<%=safe.htmlattr(v_waarde)%><%=v_count%>"><%=safe.html(v_waarde)%></td>
diff --git a/APPL/Shared/Shared.inc b/APPL/Shared/Shared.inc
index dfc5a4d24b..e598884a5b 100644
--- a/APPL/Shared/Shared.inc
+++ b/APPL/Shared/Shared.inc
@@ -1531,6 +1531,20 @@ function toHexValue(colorString, params)
     return retval;
 }
 
+// Maakt gebruik van de sanatize-functie hierboven, en zet de resulterende hexcode om naar een RGB/RGBA-kleur
+function toRgb(colorString, params) {
+    params = params || {};
+    var hexColorString = toHexValue(colorString); // Zonder params
+    var result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hexColorString);
+    var ret = parseInt(result[1], 16) + ", "
+            + parseInt(result[2], 16) + ", "
+            + parseInt(result[3], 16);
+    if (params.alpha) {
+        return "rgba(" + ret + ", " + (Math.round(10000 * params.alpha / 256) / 10000) + ")";
+    }
+    return "rgb(" + ret + ")";
+}
+
 // Zie document"z:\Project\Sm44\DOC\Intern\Facilitor5i\Facilitor 5i Quotes en Escape.doc"
 safe = {
 
diff --git a/APPL/Shared/default.css b/APPL/Shared/default.css
index 19c323d105..02d77aef35 100644
--- a/APPL/Shared/default.css
+++ b/APPL/Shared/default.css
@@ -5560,6 +5560,12 @@ tr.listfatal.updated td {
     height: 16px;
     box-shadow: 1px 1px 1px #888888;
     margin-bottom: 2px;
+    .legendakleurblokje {
+        font-size: 0;
+        line-height: 0;
+        border-width: 8px;
+        border-style: solid;
+    }
 }
 .legendselectable .legendakleur {
     cursor: pointer; /* je kunt er op klikken */