diff --git a/Mage.Client/src/main/java/org/mage/card/arcane/CardPanel.java b/Mage.Client/src/main/java/org/mage/card/arcane/CardPanel.java
index 8b1172c92f..f3a918c3eb 100644
--- a/Mage.Client/src/main/java/org/mage/card/arcane/CardPanel.java
+++ b/Mage.Client/src/main/java/org/mage/card/arcane/CardPanel.java
@@ -879,6 +879,8 @@ public class CardPanel extends MagePermanent implements MouseListener, MouseMoti
 
     private static ImageIcon getCounterImageWithAmount(int amount, BufferedImage image, int cardWidth) {
         int factor = cardWidth > WIDTH_LIMIT ? 2 :1;
+        int xOffset = amount > 9 ? 2 : 5;
+        int fontSize = amount < 10 ? 9 : amount < 100 ? 9 : 8;
         BufferedImage newImage;
         if (cardWidth > WIDTH_LIMIT) {
             newImage = ImageManagerImpl.deepCopy(image);
@@ -887,8 +889,8 @@ public class CardPanel extends MagePermanent implements MouseListener, MouseMoti
         }
         Graphics graphics = newImage.getGraphics();
         graphics.setColor(Color.BLACK);
-        graphics.setFont(new Font("Arial Black", Font.BOLD, factor * 9 ));
-        graphics.drawString(Integer.toString(amount), 4 * factor, 11 * factor);
+        graphics.setFont(new Font("Arial Black", Font.BOLD, factor * fontSize ));
+        graphics.drawString(Integer.toString(amount), xOffset * factor, 11 * factor);
         return new ImageIcon(newImage);
     }
 
diff --git a/Mage/src/mage/abilities/mana/DynamicManaAbility.java b/Mage/src/mage/abilities/mana/DynamicManaAbility.java
index c233fe3c94..e915973159 100644
--- a/Mage/src/mage/abilities/mana/DynamicManaAbility.java
+++ b/Mage/src/mage/abilities/mana/DynamicManaAbility.java
@@ -27,12 +27,12 @@
  */
 package mage.abilities.mana;
 
-import mage.constants.Zone;
 import mage.Mana;
 import mage.abilities.costs.Cost;
 import mage.abilities.costs.common.TapSourceCost;
 import mage.abilities.dynamicvalue.DynamicValue;
 import mage.abilities.effects.common.DynamicManaEffect;
+import mage.constants.Zone;
 import mage.game.Game;
 
 /**
@@ -46,6 +46,8 @@ public class DynamicManaAbility extends ManaAbility {
 
     /**
      * TapSourceCost added by default
+     * @param mana
+     * @param amount
      */
     public DynamicManaAbility(Mana mana, DynamicValue amount) {
         this(mana, amount, new TapSourceCost());