diff --git a/C4.puml b/C4.puml
index c89d556d..c20c0bd7 100644
--- a/C4.puml
+++ b/C4.puml
@@ -116,15 +116,15 @@ skinparam arrow {
     FontSize 12
 }
 
-skinparam actor {
+skinparam person {
     StereotypeFontSize 12
     shadowing false
-    style awesome
 }
 
-skinparam person {
+skinparam actor {
     StereotypeFontSize 12
     shadowing false
+    style awesome
 }
 
 ' Some boundary skinparams have to be set as package skinparams too (PlantUML uses internal packages)
@@ -330,9 +330,10 @@ skinparam package {
   !$tagSkin = $elementTagSkinparams("rectangle", $tagStereo, $bgColor, $fontColor, $borderColor, $shadowing, $shape)
   !$tagSkin = $tagSkin + $elementTagSkinparams("database", $tagStereo, $bgColor, $fontColor, $borderColor, $shadowing, "")
   !$tagSkin = $tagSkin + $elementTagSkinparams("queue", $tagStereo, $bgColor, $fontColor, $borderColor, $shadowing, "")
+  ' plantuml.jar bug - actor have to be after person
+  !$tagSkin = $tagSkin + $elementTagSkinparams("person", $tagStereo, $bgColor, $fontColor, $borderColor, $shadowing, "")
   ' actor has style awesome, therefore $fontColor is ignored and text uses $bgColor too
   !$tagSkin = $tagSkin + $elementTagSkinparams("actor", $tagStereo, $bgColor, $bgColor, $borderColor, $shadowing, "")
-  !$tagSkin = $tagSkin + $elementTagSkinparams("person", $tagStereo, $bgColor, $fontColor, $borderColor, $shadowing, "")
   !if (%strpos($tagStereo, "boundary") >= 0 && $bgColor != "")
     !$tagSkin = $tagSkin + "skinparam package<<" + $tagStereo + ">>StereotypeFontColor " + $bgColor + %newline()
     !$tagSkin = $tagSkin + "skinparam rectangle<<" + $tagStereo + ">>StereotypeFontColor " + $bgColor + %newline()
diff --git a/C4_Context.puml b/C4_Context.puml
index 50c5a1e1..af973182 100644
--- a/C4_Context.puml
+++ b/C4_Context.puml
@@ -280,6 +280,9 @@ endlegend
 !global $defaultPersonSprite = "person"
 !$dummy = $restoreEmpty("person", "sprite", $defaultPersonSprite, %true())
 UpdateElementStyle("person")
+' workaround of plantuml.jar bug - person overwrites external_person setting
+!$dummy = $restoreEmpty("external_person", "sprite", $defaultPersonSprite, %true())
+UpdateElementStyle("external_person")
 !global $portraitPerson = "false"
 
 !procedure $clearPersonRestore()
@@ -287,6 +290,11 @@ UpdateElementStyle("person")
   !$dummy = $clearRestore("person", "legendSprite")
   %set_variable_value("$" + "person" + "ElementTagSprite", "")
   UpdateElementStyle("person")
+  ' workaround of plantuml.jar bug - person overwrites external_person setting
+  !$dummy = $clearRestore("external_person", "sprite")
+  !$dummy = $clearRestore("external_person", "legendSprite")
+  %set_variable_value("$" + "external_person" + "ElementTagSprite", "")
+  UpdateElementStyle("external_person")
 !endprocedure
 
 !procedure HIDE_PERSON_SPRITE()
@@ -303,6 +311,9 @@ UpdateElementStyle("person")
   !endif
   !$dummy = $restoreEmpty("person", "sprite", $defaultPersonSprite, %true())
   UpdateElementStyle("person")
+  ' workaround of plantuml.jar bug - person overwrites external_person setting
+  !$dummy = $restoreEmpty("external_person", "sprite", $defaultPersonSprite, %true())
+  UpdateElementStyle("external_person")
   !$portraitPerson = "false"
 !endprocedure