diff --git a/forge-gui-desktop/src/main/java/forge/itemmanager/views/ImageView.java b/forge-gui-desktop/src/main/java/forge/itemmanager/views/ImageView.java
index 5b086bc8591..0e7e2002e5a 100644
--- a/forge-gui-desktop/src/main/java/forge/itemmanager/views/ImageView.java
+++ b/forge-gui-desktop/src/main/java/forge/itemmanager/views/ImageView.java
@@ -1102,7 +1102,7 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
                 if (paperCard.isFoil()) {
                     final CardView card = ViewUtil.getCardForUi(paperCard);
                     if (card.getOriginal().getFoilIndex() == 0) { //if foil finish not yet established, assign a random one
-                        card.getOriginal().setRandomFoil();
+                        card.getOriginal().setFoilIndex(1); // FIXME should assign a random foil here
                     }
                     CardPanel.drawFoilEffect(g, card, bounds.x, bounds.y, bounds.width, bounds.height, borderSize);
                 }
diff --git a/forge-gui-desktop/src/main/java/forge/screens/match/controllers/CPicture.java b/forge-gui-desktop/src/main/java/forge/screens/match/controllers/CPicture.java
index a06a5d08691..e3c636effe5 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/match/controllers/CPicture.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/match/controllers/CPicture.java
@@ -84,7 +84,7 @@ public enum CPicture implements ICDoc {
             final IPaperCard paperCard = ((IPaperCard)item);
             final CardView c = ViewUtil.getCardForUi(paperCard);
             if (paperCard.isFoil() && c.getOriginal().getFoilIndex() == 0) {
-                c.getOriginal().setRandomFoil();
+                c.getOriginal().setFoilIndex(1); // FIXME should assign random foil here
             }
             showCard(c, false);
         } else {
diff --git a/forge-gui-desktop/src/main/java/forge/view/arcane/util/OutlinedLabel.java b/forge-gui-desktop/src/main/java/forge/view/arcane/util/OutlinedLabel.java
index d254de11a67..d91c5ccbdd9 100644
--- a/forge-gui-desktop/src/main/java/forge/view/arcane/util/OutlinedLabel.java
+++ b/forge-gui-desktop/src/main/java/forge/view/arcane/util/OutlinedLabel.java
@@ -18,6 +18,9 @@
 package forge.view.arcane.util;
 
 import javax.swing.*;
+
+import org.apache.commons.lang3.StringUtils;
+
 import java.awt.*;
 import java.awt.font.FontRenderContext;
 import java.awt.font.LineBreakMeasurer;
@@ -121,8 +124,11 @@ public class OutlinedLabel extends JLabel {
         int textX = outlineSize, textY = 0;
         int wrapWidth = Math.max(0, wrap ? size.width - outlineSize * 2 : Integer.MAX_VALUE);
 
-        AttributedString attributedString = new AttributedString(getText());
-        attributedString.addAttribute(TextAttribute.FONT, getFont());
+        final String text = getText();
+        AttributedString attributedString = new AttributedString(text);
+        if (!StringUtils.isEmpty(text)) {
+            attributedString.addAttribute(TextAttribute.FONT, getFont());
+        }
         AttributedCharacterIterator charIterator = attributedString.getIterator();
         FontRenderContext fontContext = g2d.getFontRenderContext();