diff --git a/src/main/java/forge/quest/gui/QuestWinLoseHandler.java b/src/main/java/forge/quest/gui/QuestWinLoseHandler.java
index 8d43e1fb2d5..78d8638354f 100644
--- a/src/main/java/forge/quest/gui/QuestWinLoseHandler.java
+++ b/src/main/java/forge/quest/gui/QuestWinLoseHandler.java
@@ -465,7 +465,7 @@ public class QuestWinLoseHandler extends ControlWinLose {
         this.model.qData.addCredits(credTotal);
 
         // Generate Swing components and attach.
-        this.icoTemp = GuiUtils.getResizedIcon("GoldIcon.png", 0.5);
+        this.icoTemp = GuiUtils.getResizedIcon(skin.getIcon(FSkin.QuestIcons.ICO_GOLD), 0.5);
 
         this.lblTemp1 = new TitleLabel("Gameplay Results");
 
@@ -568,7 +568,7 @@ public class QuestWinLoseHandler extends ControlWinLose {
         this.model.qData.addCredits(questRewardCredits);
 
         // Generate Swing components and attach.
-        this.icoTemp = GuiUtils.getResizedIcon("BoxIcon.png", 0.5);
+        this.icoTemp = GuiUtils.getResizedIcon(skin.getIcon(FSkin.QuestIcons.ICO_BOX), 0.5);
         this.lblTemp1 = new TitleLabel("Challenge Rewards for \"" + ((QuestChallenge) this.model.qEvent).getTitle()
                 + "\"");
 
@@ -591,7 +591,7 @@ public class QuestWinLoseHandler extends ControlWinLose {
 
     private void penalizeLoss() {
         int x = Singletons.getModel().getQuestPreferences().getPreferenceInt(QPref.PENALTY_LOSS);
-        this.icoTemp = GuiUtils.getResizedIcon("HeartIcon.png", 0.5);
+        this.icoTemp = GuiUtils.getResizedIcon(skin.getIcon(FSkin.QuestIcons.ICO_HEART), 0.5);
 
         this.lblTemp1 = new TitleLabel("Gameplay Results");
 
diff --git a/src/main/java/forge/view/GuiTopLevel.java b/src/main/java/forge/view/GuiTopLevel.java
index 8d346e7aa5c..5c7aa5946db 100644
--- a/src/main/java/forge/view/GuiTopLevel.java
+++ b/src/main/java/forge/view/GuiTopLevel.java
@@ -407,6 +407,8 @@ public class GuiTopLevel extends JFrame implements Display, CardContainer {
         fp.setPref(FPref.DEV_MILLING_LOSS, String.valueOf(Constant.Runtime.MILL[0]));
         fp.setPref(FPref.UI_LAYOUT_PARAMS, String.valueOf(control.getMatchController().getView().getLayoutParams()));
         fp.setPref(FPref.DEV_UNLIMITED_LAND, String.valueOf(v.getLblUnlimitedLands().getEnabled()));
+
+        fp.save();
         return true;
     }