diff --git a/forge-game/src/main/java/forge/game/ability/effects/EffectEffect.java b/forge-game/src/main/java/forge/game/ability/effects/EffectEffect.java
index 00503460ea5..a5a127ee8bb 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/EffectEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/EffectEffect.java
@@ -105,7 +105,7 @@ public class EffectEffect extends SpellAbilityEffect {
         if (sa.hasParam("Image")) {
             image = ImageKeys.getTokenKey(sa.getParam("Image"));
         } else if (name.startsWith("Emblem")) { // try to get the image from name
-            image = ImageKeys.getTokenKey(name.replace(",", "").replace(" ", "_").toLowerCase());
+            image = ImageKeys.getTokenKey(name.toLowerCase().replace(" - ", "_").replace(",", "").replace(" ", "_").toLowerCase());
         } else { // use host image
             image = hostCard.getImageKey();
         }
diff --git a/forge-gui/res/cardsfolder/k/kiora_the_crashing_wave.txt b/forge-gui/res/cardsfolder/k/kiora_the_crashing_wave.txt
index e271340e3ab..3a1a7b52daa 100644
--- a/forge-gui/res/cardsfolder/k/kiora_the_crashing_wave.txt
+++ b/forge-gui/res/cardsfolder/k/kiora_the_crashing_wave.txt
@@ -6,7 +6,7 @@ A:AB$ Pump | Cost$ AddCounter<1/LOYALTY> | ValidTgts$ Permanent.OppCtrl | TgtPro
 A:AB$ Draw | Cost$ SubCounter<1/LOYALTY> | Planeswalker$ True | SubAbility$ DBEffect | SpellDescription$ Draw a card. You may play an additional land this turn.
 SVar:DBEffect:DB$ Effect | StaticAbilities$ Exploration
 SVar:Exploration:Mode$ Continuous | Affected$ You | AddKeyword$ AdjustLandPlays:1 | EffectZone$ Command | Description$ You may play an additional land this turn.
-A:AB$ Effect | Cost$ SubCounter<5/LOYALTY> | Planeswalker$ True | Ultimate$ True | Name$ Emblem Kiora, the Crashing Wave | Triggers$ EOTTrig | SVars$ KioraToken | Duration$ Permanent | AILogic$ Always | SpellDescription$ You get an emblem with "At the beginning of your end step, create a 9/9 blue Kraken creature token."
+A:AB$ Effect | Cost$ SubCounter<5/LOYALTY> | Planeswalker$ True | Ultimate$ True | Name$ Emblem - Kiora, the Crashing Wave | Triggers$ EOTTrig | SVars$ KioraToken | Duration$ Permanent | AILogic$ Always | SpellDescription$ You get an emblem with "At the beginning of your end step, create a 9/9 blue Kraken creature token."
 SVar:EOTTrig:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Command | Execute$ KioraToken | TriggerDescription$ At the beginning of your end step, create a 9/9 blue Kraken creature token.
 SVar:KioraToken:AB$ Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Kraken | TokenTypes$ Creature,Kraken | TokenOwner$ You | TokenColors$ Blue | TokenPower$ 9 | TokenToughness$ 9
 SVar:Picture:http://www.wizards.com/global/images/magic/general/kiora_the_crashing_wave.jpg