diff --git a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/TinyLeaders.java b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/TinyLeaders.java
index 47e8aead171..c9e6181cf50 100644
--- a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/TinyLeaders.java
+++ b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/TinyLeaders.java
@@ -155,10 +155,10 @@ public class TinyLeaders extends DeckValidator {
                 if (commander == null) {
                     if (deck.getName() == null) {
                         invalid.put("Leader", "You have to save your deck with the leader card name entered to the DECK NAME field of the DECK EDITOR (top left) so that XMage knows your leader."
-                                + "(You can use the \"Sultai\" for a UBG (2/2) default Commander.)");
+                                + "(You can use the \"Sultai\" for a UBG (3/3) default Commander or \"Glass\" for a colorless 3/3 default Commander.)");
                     } else {
                         invalid.put("Leader", "Leader [" + deck.getName() + "] not found. You have to enter the name of the leader card into the DECK NAME field of the DECK EDITOR (top left). Check your spelling "
-                                + "(use the \"Sultai\" for a UBG (2/2) default Commander)");
+                                + "(use the \"Sultai\" for a UBG (3/3) default Commander or \"Glass\" for a colorless (3/3) default Commander)");
 
                     }
                 }
diff --git a/Mage.Sets/src/mage/sets/oathofthegatewatch/CrushOfTentacles.java b/Mage.Sets/src/mage/sets/oathofthegatewatch/CrushOfTentacles.java
index 3ffdc4b4d73..9b07d459c89 100644
--- a/Mage.Sets/src/mage/sets/oathofthegatewatch/CrushOfTentacles.java
+++ b/Mage.Sets/src/mage/sets/oathofthegatewatch/CrushOfTentacles.java
@@ -75,6 +75,7 @@ class CrushOfTentaclesToken extends Token {
 
     public CrushOfTentaclesToken() {
         super("Octopus", "8/8 blue Octopus creature");
+        this.setExpansionSetCodeForImage("BFZ");
         this.cardType.add(CardType.CREATURE);
         this.color.setBlue(true);
         this.subtype.add("Octopus");
diff --git a/Mage/src/main/java/mage/game/GameTinyLeadersImpl.java b/Mage/src/main/java/mage/game/GameTinyLeadersImpl.java
index 6addf9f0c9e..4c4b887bbdb 100644
--- a/Mage/src/main/java/mage/game/GameTinyLeadersImpl.java
+++ b/Mage/src/main/java/mage/game/GameTinyLeadersImpl.java
@@ -110,11 +110,9 @@ public abstract class GameTinyLeadersImpl extends GameImpl{
     /**
      * Name of Tiny Leader comes from the deck name (it's not in the sideboard)
      * Additionally, it was taken into account that WOTC had missed a few color combinations
-     * when making Legendary Creatures at 3 CMC. There are three Commanders available to use 
+     * when making Legendary Creatures at 3 CMC. There are two Commanders available to use 
      * for the missing color identities: 
-     *  Mardu [WBR 2/2], 
-     *  Sultai [UBG 2/2], and 
-     *  Jeskai [WUR 2/2]. 
+     *  Sultai [UBG 3/3] and Glass [colorless 3/3]
      *
      * @param commanderName
      * @param ownerId
@@ -127,6 +125,9 @@ public abstract class GameTinyLeadersImpl extends GameImpl{
                 case "Sultai":
                     commander = new DefaultCommander(ownerId, commanderName, "{U}{B}{G}");
                     break;
+                case "Glass":
+                    commander = new DefaultCommander(ownerId, commanderName, "{C}{C}{C}");
+                    break;
                 default:
                     CardInfo cardInfo = CardRepository.instance.findCard(commanderName);
                     if (cardInfo != null) {
@@ -184,8 +185,8 @@ class DefaultCommander extends CardImpl {
         if (manaString.contains("{R}")) {
             this.color.setRed(true);
         }
-        this.power = new MageInt(2);
-        this.toughness = new MageInt(2);
+        this.power = new MageInt(3);
+        this.toughness = new MageInt(3);
 
     }