diff --git a/C4.puml b/C4.puml
index e4ec9fd..c6d71ac 100644
--- a/C4.puml
+++ b/C4.puml
@@ -231,6 +231,10 @@ skinparam rectangle<<boundary>> {
     !if ($newSprite>"")
        !return $newSprite
     !endif
+    !$newSprite = %get_variable_value("$" + $elementType + "ElementTagSprite")
+    !if ($newSprite>"")
+       !return $newSprite
+    !endif
   !endif
   !return $sprite
 !endfunction
@@ -605,9 +609,14 @@ $elementSkin
 $defineSkinparams($tagStereo, $bgColor, $fontColor, $borderColor, $shadowing, $shape)
   !if ($sprite!="")
 %set_variable_value("$" + $tagStereo + "ElementTagSprite", $sprite)
-    !if ($legendSprite == "" && %strpos($sprite, "scale")>=0)
-      ' element symbols typically 4 times too big
-      !$legendSprite = $sprite + ",scale=0.25"
+    !if ($legendSprite == "")
+      ' ,scale= ... has to be first (...,color=black,scale=0.25... is invalid too)
+      !if (%strpos($sprite, "=") < 0) 
+        ' element symbols typically 4 times too big
+        !$legendSprite = $sprite + ",scale=0.25"
+      !else
+        !$legendSprite = $sprite
+      !endif
     !endif
   !endif
 $addTagToLegend($tagStereo, $bgColor, $fontColor, $borderColor, $shadowing, $shape, $legendText, $legendSprite)