diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/GrabbagImageSource.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/GrabbagImageSource.java
index ab56977114d..972724d952c 100644
--- a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/GrabbagImageSource.java
+++ b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/GrabbagImageSource.java
@@ -478,8 +478,8 @@ public enum GrabbagImageSource implements CardImageSource {
 
         // Emblems
         singleLinks.put("SWS/Emblem Obi-Wan Kenobi", "Qyc10aT.png");
-        singleLinks.put("SWS/Aurra Sing", "BLWbVJC.png");
-        singleLinks.put("SWS/Yoda", "zH0sYxg.png");
+        singleLinks.put("SWS/Emblem Aurra Sing", "BLWbVJC.png");
+        singleLinks.put("SWS/Emblem Yoda", "zH0sYxg.png");
         singleLinks.put("SWS/Emblem Luke Skywalker", "kHELZDJ.jpeg");
 
         // Tokens
diff --git a/Mage.Sets/src/mage/cards/a/AurraSingBaneOfJedi.java b/Mage.Sets/src/mage/cards/a/AurraSingBaneOfJedi.java
index 7cb81874763..381813a1b21 100644
--- a/Mage.Sets/src/mage/cards/a/AurraSingBaneOfJedi.java
+++ b/Mage.Sets/src/mage/cards/a/AurraSingBaneOfJedi.java
@@ -44,7 +44,7 @@ public final class AurraSingBaneOfJedi extends CardImpl {
         ability.addTarget(new TargetCreaturePermanent());
         this.addAbility(ability);
 
-        // -4: Target player gets an emblem wiht "Whenever a nontoken creature you control leave the battlefied, discard a card.".
+        // -4: Target player gets an emblem with "Whenever a nontoken creature you control leave the battlefied, discard a card.".
         ability = new LoyaltyAbility(new GetEmblemTargetPlayerEffect(new AurraSingBaneOfJediEmblem()), -4);
         ability.addTarget(new TargetPlayer());
         this.addAbility(ability);
diff --git a/Mage/src/main/java/mage/game/command/emblems/AurraSingBaneOfJediEmblem.java b/Mage/src/main/java/mage/game/command/emblems/AurraSingBaneOfJediEmblem.java
index 746ea66785b..fc9f282fefa 100644
--- a/Mage/src/main/java/mage/game/command/emblems/AurraSingBaneOfJediEmblem.java
+++ b/Mage/src/main/java/mage/game/command/emblems/AurraSingBaneOfJediEmblem.java
@@ -13,7 +13,7 @@ public final class AurraSingBaneOfJediEmblem extends Emblem {
 
     //  Whenever a nontoken creature you control leaves the battlefied, discard a card.
     public AurraSingBaneOfJediEmblem() {
-        super("Emblem Aurra Sing, Bane of Jedi");
+        super("Emblem Aurra Sing");
         getAbilities().add(new LeavesBattlefieldAllTriggeredAbility(Zone.COMMAND, new DiscardControllerEffect(1), StaticFilters.FILTER_CONTROLLED_CREATURE_NON_TOKEN, false));
     }
 
diff --git a/Mage/src/main/java/mage/game/command/emblems/YodaEmblem.java b/Mage/src/main/java/mage/game/command/emblems/YodaEmblem.java
index c816a1051eb..a128a6df188 100644
--- a/Mage/src/main/java/mage/game/command/emblems/YodaEmblem.java
+++ b/Mage/src/main/java/mage/game/command/emblems/YodaEmblem.java
@@ -18,7 +18,7 @@ public final class YodaEmblem extends Emblem {
     // You get an emblem with "Hexproof, you and your creatures have."
 
     public YodaEmblem() {
-        super("Emblem Yoda, Jedi Master");
+        super("Emblem Yoda");
         Effect effect = new GainAbilityControllerEffect(HexproofAbility.getInstance(), Duration.EndOfGame);
         effect.setText("Hexproof, you");
         Ability ability = new SimpleStaticAbility(Zone.COMMAND, effect);
diff --git a/Mage/src/main/resources/tokens-database.txt b/Mage/src/main/resources/tokens-database.txt
index 140b37f3f0b..b045b475b98 100644
--- a/Mage/src/main/resources/tokens-database.txt
+++ b/Mage/src/main/resources/tokens-database.txt
@@ -73,6 +73,8 @@
 |Generate|EMBLEM:MD1|Emblem Elspeth|||ElspethKnightErrantEmblem|
 |Generate|EMBLEM:SWS|Emblem Obi-Wan Kenobi|||ObiWanKenobiEmblem|
 |Generate|EMBLEM:SWS|Emblem Luke Skywalker|||LukeSkywalkerEmblem|
+|Generate|EMBLEM:SWS|Emblem Yoda|||YodaEmblem|
+|Generate|EMBLEM:SWS|Emblem Aurra Sing|||AurraSingBaneOfJediEmblem|
 |Generate|EMBLEM:RIX|Emblem Huatli|||HuatliRadiantChampionEmblem|
 |Generate|EMBLEM:RNA|Emblem Domri|||DomriChaosBringerEmblem|
 |Generate|EMBLEM:WAR|Emblem Nissa|||NissaWhoShakesTheWorldEmblem|