diff --git a/res/gui/display_layout.xml b/res/gui/display_layout.xml
index 8fcaaa96135..e7a99bc4d89 100644
--- a/res/gui/display_layout.xml
+++ b/res/gui/display_layout.xml
@@ -219,7 +219,7 @@
       <object class="java.awt.Rectangle"> 
        <int>286</int> 
        <int>0</int> 
-       <int>765</int> 
+       <int>747</int> 
        <int>707</int> 
       </object> 
      </void> 
@@ -230,7 +230,7 @@
          <object class="java.awt.Rectangle"> 
           <int>286</int> 
           <int>0</int> 
-          <int>765</int> 
+          <int>747</int> 
           <int>124</int> 
          </object> 
         </void> 
@@ -251,7 +251,7 @@
          <object class="java.awt.Rectangle"> 
           <int>286</int> 
           <int>124</int> 
-          <int>765</int> 
+          <int>747</int> 
           <int>10</int> 
          </object> 
         </void> 
@@ -266,7 +266,7 @@
          <object class="java.awt.Rectangle"> 
           <int>286</int> 
           <int>134</int> 
-          <int>765</int> 
+          <int>747</int> 
           <int>121</int> 
          </object> 
         </void> 
@@ -287,7 +287,7 @@
          <object class="java.awt.Rectangle"> 
           <int>286</int> 
           <int>255</int> 
-          <int>765</int> 
+          <int>747</int> 
           <int>10</int> 
          </object> 
         </void> 
@@ -302,7 +302,7 @@
          <object class="java.awt.Rectangle"> 
           <int>286</int> 
           <int>265</int> 
-          <int>765</int> 
+          <int>747</int> 
           <int>162</int> 
          </object> 
         </void> 
@@ -323,7 +323,7 @@
          <object class="java.awt.Rectangle"> 
           <int>286</int> 
           <int>427</int> 
-          <int>765</int> 
+          <int>747</int> 
           <int>10</int> 
          </object> 
         </void> 
@@ -338,7 +338,7 @@
          <object class="java.awt.Rectangle"> 
           <int>286</int> 
           <int>437</int> 
-          <int>765</int> 
+          <int>747</int> 
           <int>122</int> 
          </object> 
         </void> 
@@ -359,7 +359,7 @@
          <object class="java.awt.Rectangle"> 
           <int>286</int> 
           <int>559</int> 
-          <int>765</int> 
+          <int>747</int> 
           <int>10</int> 
          </object> 
         </void> 
@@ -374,7 +374,7 @@
          <object class="java.awt.Rectangle"> 
           <int>286</int> 
           <int>569</int> 
-          <int>765</int> 
+          <int>747</int> 
           <int>138</int> 
          </object> 
         </void> 
@@ -408,7 +408,7 @@
     <object class="org.jdesktop.swingx.MultiSplitLayout$Divider"> 
      <void property="bounds"> 
       <object class="java.awt.Rectangle"> 
-       <int>1051</int> 
+       <int>1033</int> 
        <int>0</int> 
        <int>10</int> 
        <int>707</int> 
@@ -423,9 +423,9 @@
     <object id="MultiSplitLayout$Split3" class="org.jdesktop.swingx.MultiSplitLayout$Split"> 
      <void property="bounds"> 
       <object class="java.awt.Rectangle"> 
-       <int>1061</int> 
+       <int>1043</int> 
        <int>0</int> 
-       <int>219</int> 
+       <int>237</int> 
        <int>707</int> 
       </object> 
      </void> 
@@ -434,10 +434,10 @@
        <object class="org.jdesktop.swingx.MultiSplitLayout$Leaf"> 
         <void property="bounds"> 
          <object class="java.awt.Rectangle"> 
-          <int>1061</int> 
+          <int>1043</int> 
           <int>0</int> 
-          <int>219</int> 
-          <int>396</int> 
+          <int>237</int> 
+          <int>368</int> 
          </object> 
         </void> 
         <void property="name"> 
@@ -455,9 +455,9 @@
        <object class="org.jdesktop.swingx.MultiSplitLayout$Divider"> 
         <void property="bounds"> 
          <object class="java.awt.Rectangle"> 
-          <int>1061</int> 
-          <int>396</int> 
-          <int>219</int> 
+          <int>1043</int> 
+          <int>368</int> 
+          <int>237</int> 
           <int>10</int> 
          </object> 
         </void> 
@@ -470,10 +470,10 @@
        <object class="org.jdesktop.swingx.MultiSplitLayout$Leaf"> 
         <void property="bounds"> 
          <object class="java.awt.Rectangle"> 
-          <int>1061</int> 
-          <int>406</int> 
-          <int>219</int> 
-          <int>301</int> 
+          <int>1043</int> 
+          <int>378</int> 
+          <int>237</int> 
+          <int>329</int> 
          </object> 
         </void> 
         <void property="name"> 
diff --git a/res/main.properties b/res/main.properties
index 32e183203a7..fcaef18a319 100644
--- a/res/main.properties
+++ b/res/main.properties
@@ -52,6 +52,6 @@ quest--properties=quest/quest.properties
 
 lang--transparent-properties=lang/lang.properties
 
-image/base--file=pics
-image/token--file=pics/tokens
+image/base--file=/home/clemens/Dokumente/Magic/forge/sharedRes/pics
+image/token--file=/home/clemens/Dokumente/Magic/forge/sharedRes/pics/tokens
 sound/base--file=sound
\ No newline at end of file
diff --git a/src/forge/Gui_DeckEditor.java b/src/forge/Gui_DeckEditor.java
index e23f67448ca..670b5e0608c 100644
--- a/src/forge/Gui_DeckEditor.java
+++ b/src/forge/Gui_DeckEditor.java
@@ -377,7 +377,12 @@ public class Gui_DeckEditor extends JFrame implements CardContainer, DeckDisplay
         picture.addMouseListener(new MouseAdapter() {
             @Override
             public void mouseEntered(MouseEvent e) {
-                if(picture.getCard() != null) glassPane.setVisible(true);
+                Card c = picture.getCard();
+                if(c == null) return;
+                Image i = ImageCache.getOriginalImage(c);
+                if(i == null) return;
+                if(i.getWidth(null) < 300) return;
+                glassPane.setVisible(true);
             }
         });
     }//addListeners()
diff --git a/src/forge/Gui_Quest_DeckEditor.java b/src/forge/Gui_Quest_DeckEditor.java
index 9b42d90e0a9..707e07e26f3 100644
--- a/src/forge/Gui_Quest_DeckEditor.java
+++ b/src/forge/Gui_Quest_DeckEditor.java
@@ -106,10 +106,6 @@ public class Gui_Quest_DeckEditor extends JFrame implements CardContainer, DeckD
     private CardPicturePanel  picture              = new CardPicturePanel(null);
     private JPanel            glassPane;
     
-    public static void main(String[] args) {
-
-    }
-    
     @Override
     public void setTitle(String message) {
         super.setTitle(message);
@@ -409,7 +405,12 @@ public class Gui_Quest_DeckEditor extends JFrame implements CardContainer, DeckD
         picture.addMouseListener(new MouseAdapter() {
             @Override
             public void mouseEntered(MouseEvent e) {
-                if(picture.getCard() != null) glassPane.setVisible(true);
+                Card c = picture.getCard();
+                if(c == null) return;
+                Image i = ImageCache.getOriginalImage(c);
+                if(i == null) return;
+                if(i.getWidth(null) < 200) return;
+                glassPane.setVisible(true);
             }
         });
     }//addListeners()