diff --git a/Mage.Client/src/main/java/mage/client/cards/CardsList.form b/Mage.Client/src/main/java/mage/client/cards/CardsList.form
index 7156ed9cc2e..d9cc9dbfad2 100644
--- a/Mage.Client/src/main/java/mage/client/cards/CardsList.form
+++ b/Mage.Client/src/main/java/mage/client/cards/CardsList.form
@@ -34,7 +34,7 @@
     <DimensionLayout dim="0">
       <Group type="103" groupAlignment="0" attributes="0">
           <Component id="panelCardArea" alignment="0" max="32767" attributes="0"/>
-          <Component id="panelControl" pref="754" max="32767" attributes="0"/>
+          <Component id="panelControl" pref="719" max="32767" attributes="0"/>
       </Group>
     </DimensionLayout>
     <DimensionLayout dim="1">
@@ -42,7 +42,7 @@
           <Group type="102" alignment="0" attributes="0">
               <Component id="panelControl" min="-2" max="-2" attributes="0"/>
               <EmptySpace min="-2" pref="0" max="-2" attributes="0"/>
-              <Component id="panelCardArea" pref="49" max="32767" attributes="0"/>
+              <Component id="panelCardArea" pref="120" max="32767" attributes="0"/>
           </Group>
       </Group>
     </DimensionLayout>
@@ -160,7 +160,7 @@
               <ComponentRef name="bgView"/>
             </Property>
             <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="2" name="D:\Projekte\mag\mageRep\localmage\Mage.Client\src\main\resources\buttons\list_panel.png"/>
+              <Image iconType="3" name="/buttons/list_panel.png"/>
             </Property>
             <Property name="toolTipText" type="java.lang.String" value="Shows the cards as a list."/>
             <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
@@ -172,7 +172,6 @@
             <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
               <Dimension value="[37, 25]"/>
             </Property>
-            <Property name="opaque" type="boolean" value="false"/>
             <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
               <Dimension value="[37, 22]"/>
             </Property>
@@ -190,7 +189,7 @@
               <ComponentRef name="bgView"/>
             </Property>
             <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="2" name="D:\Projekte\mag\mageRep\localmage\Mage.Client\src\main\resources\buttons\card_panel.png"/>
+              <Image iconType="3" name="/buttons/card_panel.png"/>
             </Property>
             <Property name="toolTipText" type="java.lang.String" value="Shows the card as images."/>
             <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
diff --git a/Mage.Client/src/main/java/mage/client/cards/CardsList.java b/Mage.Client/src/main/java/mage/client/cards/CardsList.java
index 1f7e12bb0ec..1137e02e02e 100644
--- a/Mage.Client/src/main/java/mage/client/cards/CardsList.java
+++ b/Mage.Client/src/main/java/mage/client/cards/CardsList.java
@@ -432,12 +432,11 @@ public class CardsList extends javax.swing.JPanel implements MouseListener, ICar
         });
 
         bgView.add(jToggleListView);
-        jToggleListView.setIcon(new javax.swing.ImageIcon("D:\\Projekte\\mag\\mageRep\\localmage\\Mage.Client\\src\\main\\resources\\buttons\\list_panel.png")); // NOI18N
+        jToggleListView.setIcon(new javax.swing.ImageIcon(getClass().getResource("/buttons/list_panel.png"))); // NOI18N
         jToggleListView.setToolTipText("Shows the cards as a list.");
         jToggleListView.setMargin(new java.awt.Insets(2, 6, 2, 6));
         jToggleListView.setMaximumSize(new java.awt.Dimension(37, 25));
         jToggleListView.setMinimumSize(new java.awt.Dimension(37, 25));
-        jToggleListView.setOpaque(false);
         jToggleListView.setPreferredSize(new java.awt.Dimension(37, 22));
         jToggleListView.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -446,7 +445,7 @@ public class CardsList extends javax.swing.JPanel implements MouseListener, ICar
         });
 
         bgView.add(jToggleCardView);
-        jToggleCardView.setIcon(new javax.swing.ImageIcon("D:\\Projekte\\mag\\mageRep\\localmage\\Mage.Client\\src\\main\\resources\\buttons\\card_panel.png")); // NOI18N
+        jToggleCardView.setIcon(new javax.swing.ImageIcon(getClass().getResource("/buttons/card_panel.png"))); // NOI18N
         jToggleCardView.setToolTipText("Shows the card as images.");
         jToggleCardView.setMargin(new java.awt.Insets(2, 6, 2, 6));
         jToggleCardView.setPreferredSize(new java.awt.Dimension(33, 22));
@@ -502,14 +501,14 @@ public class CardsList extends javax.swing.JPanel implements MouseListener, ICar
         layout.setHorizontalGroup(
             layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
             .addComponent(panelCardArea)
-            .addComponent(panelControl, javax.swing.GroupLayout.DEFAULT_SIZE, 754, Short.MAX_VALUE)
+            .addComponent(panelControl, javax.swing.GroupLayout.DEFAULT_SIZE, 719, Short.MAX_VALUE)
         );
         layout.setVerticalGroup(
             layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
             .addGroup(layout.createSequentialGroup()
                 .addComponent(panelControl, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                 .addGap(0, 0, 0)
-                .addComponent(panelCardArea, javax.swing.GroupLayout.DEFAULT_SIZE, 49, Short.MAX_VALUE))
+                .addComponent(panelCardArea, javax.swing.GroupLayout.DEFAULT_SIZE, 120, Short.MAX_VALUE))
         );
     }// </editor-fold>//GEN-END:initComponents
 
diff --git a/Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.form b/Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.form
index 3ccc88699d6..b655fa2e4b4 100644
--- a/Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.form
+++ b/Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.form
@@ -33,7 +33,7 @@
               <EmptySpace min="-2" pref="0" max="-2" attributes="0"/>
               <Component id="tbTypes" min="-2" max="-2" attributes="0"/>
               <EmptySpace max="-2" attributes="0"/>
-              <Component id="cardSelectorScrollPane" pref="232" max="32767" attributes="0"/>
+              <Component id="cardSelectorScrollPane" pref="230" max="32767" attributes="0"/>
               <EmptySpace min="0" pref="0" max="-2" attributes="0"/>
               <Component id="cardSelectorBottomPanel" min="-2" pref="31" max="-2" attributes="0"/>
           </Group>
@@ -45,7 +45,7 @@
       <Properties>
         <Property name="floatable" type="boolean" value="false"/>
         <Property name="rollover" type="boolean" value="true"/>
-        <Property name="toolTipText" type="java.lang.String" value="Click with ALT to deselct all other colors or CTRL for invert selection."/>
+        <Property name="toolTipText" type="java.lang.String" value="Click with ALT to deselect all other colors or with CTRL to invert selection."/>
         <Property name="borderPainted" type="boolean" value="false"/>
         <Property name="name" type="java.lang.String" value="" noResource="true"/>
       </Properties>
@@ -55,17 +55,17 @@
         <Component class="javax.swing.JToggleButton" name="tbRed">
           <Properties>
             <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="2" name="D:\Projekte\mag\mageRep\localmage\Mage.Client\src\main\resources\buttons\color_red_off.png"/>
+              <Image iconType="3" name="/buttons/color_red_off.png"/>
             </Property>
             <Property name="selected" type="boolean" value="true"/>
             <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
-              <Connection code="&quot;&lt;html&gt;&lt;font color=&apos;red&apos;&gt;&lt;strong&gt;Red&lt;/strong&gt;&lt;font/&gt;&lt;br/&gt;&quot; &#xd;&#xa;+ tbColor.getToolTipText()" type="code"/>
+              <Connection code="&quot;&lt;html&gt;&lt;font color=&apos;red&apos;&gt;&lt;strong&gt;Red&lt;/strong&gt;&lt;/font&gt;&lt;br/&gt;&quot; &#xd;&#xa;+ tbColor.getToolTipText()" type="code"/>
             </Property>
             <Property name="actionCommand" type="java.lang.String" value="Red"/>
             <Property name="focusable" type="boolean" value="false"/>
             <Property name="horizontalTextPosition" type="int" value="0"/>
             <Property name="selectedIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="2" name="D:\Projekte\mag\mageRep\localmage\Mage.Client\src\main\resources\buttons\color_red.png"/>
+              <Image iconType="3" name="/buttons/color_red.png"/>
             </Property>
             <Property name="verticalTextPosition" type="int" value="3"/>
           </Properties>
@@ -76,17 +76,17 @@
         <Component class="javax.swing.JToggleButton" name="tbGreen">
           <Properties>
             <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="2" name="D:\Projekte\mag\mageRep\localmage\Mage.Client\src\main\resources\buttons\color_green_off.png"/>
+              <Image iconType="3" name="/buttons/color_green_off.png"/>
             </Property>
             <Property name="selected" type="boolean" value="true"/>
             <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
-              <Connection code="&quot;&lt;html&gt;Green&lt;br/&gt;&quot; + tbColor.getToolTipText()" type="code"/>
+              <Connection code="&quot;&lt;html&gt;&lt;font color=&apos;Green&apos;&gt;&lt;strong&gt;Green&lt;/strong&gt;&lt;/font&gt;&lt;br/&gt;&quot; + tbColor.getToolTipText()" type="code"/>
             </Property>
             <Property name="actionCommand" type="java.lang.String" value="Green"/>
             <Property name="focusable" type="boolean" value="false"/>
             <Property name="horizontalTextPosition" type="int" value="0"/>
             <Property name="selectedIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="2" name="D:\Projekte\mag\mageRep\localmage\Mage.Client\src\main\resources\buttons\color_green.png"/>
+              <Image iconType="3" name="/buttons/color_green.png"/>
             </Property>
             <Property name="verifyInputWhenFocusTarget" type="boolean" value="false"/>
             <Property name="verticalTextPosition" type="int" value="3"/>
@@ -98,17 +98,17 @@
         <Component class="javax.swing.JToggleButton" name="tbBlue">
           <Properties>
             <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="2" name="D:\Projekte\mag\mageRep\localmage\Mage.Client\src\main\resources\buttons\color_blueOff.png"/>
+              <Image iconType="3" name="/buttons/color_blueOff.png"/>
             </Property>
             <Property name="selected" type="boolean" value="true"/>
             <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
-              <Connection code="&quot;&lt;html&gt;Blue&lt;br/&gt;&quot; + tbColor.getToolTipText()" type="code"/>
+              <Connection code="&quot;&lt;html&gt;&lt;font color=&apos;blue&apos;&gt;&lt;strong&gt;Blue&lt;/strong&gt;&lt;/font&gt;&lt;br/&gt;&quot; + tbColor.getToolTipText()" type="code"/>
             </Property>
             <Property name="actionCommand" type="java.lang.String" value="Blue"/>
             <Property name="focusable" type="boolean" value="false"/>
             <Property name="horizontalTextPosition" type="int" value="0"/>
             <Property name="selectedIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="2" name="D:\Projekte\mag\mageRep\localmage\Mage.Client\src\main\resources\buttons\color_blue.png"/>
+              <Image iconType="3" name="/buttons/color_blue.png"/>
             </Property>
             <Property name="verticalTextPosition" type="int" value="3"/>
           </Properties>
@@ -119,7 +119,7 @@
         <Component class="javax.swing.JToggleButton" name="tbBlack">
           <Properties>
             <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="2" name="D:\Projekte\mag\mageRep\localmage\Mage.Client\src\main\resources\buttons\color_black_off.png"/>
+              <Image iconType="3" name="/buttons/color_black_off.png"/>
             </Property>
             <Property name="selected" type="boolean" value="true"/>
             <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
@@ -129,7 +129,7 @@
             <Property name="focusable" type="boolean" value="false"/>
             <Property name="horizontalTextPosition" type="int" value="0"/>
             <Property name="selectedIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="2" name="D:\Projekte\mag\mageRep\localmage\Mage.Client\src\main\resources\buttons\color_black.png"/>
+              <Image iconType="3" name="/buttons/color_black.png"/>
             </Property>
             <Property name="verticalTextPosition" type="int" value="3"/>
           </Properties>
@@ -140,7 +140,7 @@
         <Component class="javax.swing.JToggleButton" name="tbWhite">
           <Properties>
             <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="2" name="D:\Projekte\mag\mageRep\localmage\Mage.Client\src\main\resources\buttons\color_white_off.png"/>
+              <Image iconType="3" name="/buttons/color_white_off.png"/>
             </Property>
             <Property name="selected" type="boolean" value="true"/>
             <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
@@ -150,7 +150,7 @@
             <Property name="focusable" type="boolean" value="false"/>
             <Property name="horizontalTextPosition" type="int" value="0"/>
             <Property name="selectedIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="2" name="D:\Projekte\mag\mageRep\localmage\Mage.Client\src\main\resources\buttons\color_white.png"/>
+              <Image iconType="3" name="/buttons/color_white.png"/>
             </Property>
             <Property name="verticalTextPosition" type="int" value="3"/>
           </Properties>
@@ -161,7 +161,7 @@
         <Component class="javax.swing.JToggleButton" name="tbColorless">
           <Properties>
             <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="2" name="D:\Projekte\mag\mageRep\localmage\Mage.Client\src\main\resources\buttons\colorless_off.png"/>
+              <Image iconType="3" name="/buttons/colorless_off.png"/>
             </Property>
             <Property name="selected" type="boolean" value="true"/>
             <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
@@ -171,7 +171,7 @@
             <Property name="focusable" type="boolean" value="false"/>
             <Property name="horizontalTextPosition" type="int" value="0"/>
             <Property name="selectedIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="2" name="D:\Projekte\mag\mageRep\localmage\Mage.Client\src\main\resources\buttons\colorless.png"/>
+              <Image iconType="3" name="/buttons/colorless.png"/>
             </Property>
             <Property name="verticalTextPosition" type="int" value="3"/>
           </Properties>
@@ -382,7 +382,7 @@
               <ComponentRef name="bgView"/>
             </Property>
             <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="2" name="D:\Projekte\mag\mageRep\localmage\Mage.Client\src\main\resources\buttons\list_panel.png"/>
+              <Image iconType="3" name="/buttons/list_panel.png"/>
             </Property>
             <Property name="selected" type="boolean" value="true"/>
             <Property name="toolTipText" type="java.lang.String" value="Shows the cards as a list."/>
@@ -412,7 +412,7 @@
               <ComponentRef name="bgView"/>
             </Property>
             <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="2" name="D:\Projekte\mag\mageRep\localmage\Mage.Client\src\main\resources\buttons\card_panel.png"/>
+              <Image iconType="3" name="/buttons/card_panel.png"/>
             </Property>
             <Property name="toolTipText" type="java.lang.String" value="Shows the card as images."/>
             <Property name="borderPainted" type="boolean" value="false"/>
@@ -504,7 +504,7 @@
         <Component class="javax.swing.JButton" name="jButtonAddToMain">
           <Properties>
             <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="2" name="D:\Projekte\mag\mageRep\localmage\Mage.Client\src\main\resources\buttons\deck_in.png"/>
+              <Image iconType="3" name="/buttons/deck_in.png"/>
             </Property>
             <Property name="toolTipText" type="java.lang.String" value="Add selected cards to deck"/>
             <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
@@ -527,7 +527,7 @@
         <Component class="javax.swing.JButton" name="jButtonAddToSideboard">
           <Properties>
             <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="2" name="D:\Projekte\mag\mageRep\localmage\Mage.Client\src\main\resources\buttons\sideboard_in.png"/>
+              <Image iconType="3" name="/buttons/sideboard_in.png"/>
             </Property>
             <Property name="toolTipText" type="java.lang.String" value="Add selected cards to sideboard."/>
             <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
@@ -596,7 +596,7 @@
         <Component class="javax.swing.JButton" name="jButtonRemoveFromMain">
           <Properties>
             <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="2" name="D:\Projekte\mag\mageRep\localmage\Mage.Client\src\main\resources\buttons\deck_out.png"/>
+              <Image iconType="3" name="/buttons/deck_out.png"/>
             </Property>
             <Property name="toolTipText" type="java.lang.String" value="Remove selected cards from deck"/>
             <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
@@ -619,7 +619,7 @@
         <Component class="javax.swing.JButton" name="jButtonRemoveFromSideboard">
           <Properties>
             <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="2" name="D:\Projekte\mag\mageRep\localmage\Mage.Client\src\main\resources\buttons\sideboard_out.png"/>
+              <Image iconType="3" name="/buttons/sideboard_out.png"/>
             </Property>
             <Property name="toolTipText" type="java.lang.String" value="Remove selected cards from sideboard."/>
             <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
diff --git a/Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.java b/Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.java
index 283ee7e0034..1d4348443b7 100644
--- a/Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.java
+++ b/Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.java
@@ -465,18 +465,18 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene
 
         tbColor.setFloatable(false);
         tbColor.setRollover(true);
-        tbColor.setToolTipText("Click with ALT to deselct all other colors or CTRL for invert selection.");
+        tbColor.setToolTipText("Click with ALT to deselect all other colors or with CTRL to invert selection.");
         tbColor.setBorderPainted(false);
         tbColor.setName(""); // NOI18N
 
-        tbRed.setIcon(new javax.swing.ImageIcon("D:\\Projekte\\mag\\mageRep\\localmage\\Mage.Client\\src\\main\\resources\\buttons\\color_red_off.png")); // NOI18N
+        tbRed.setIcon(new javax.swing.ImageIcon(getClass().getResource("/buttons/color_red_off.png"))); // NOI18N
         tbRed.setSelected(true);
-        tbRed.setToolTipText("<html><font color='red'><strong>Red</strong><font/><br/>" 
+        tbRed.setToolTipText("<html><font color='red'><strong>Red</strong></font><br/>" 
             + tbColor.getToolTipText());
         tbRed.setActionCommand("Red");
         tbRed.setFocusable(false);
         tbRed.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
-        tbRed.setSelectedIcon(new javax.swing.ImageIcon("D:\\Projekte\\mag\\mageRep\\localmage\\Mage.Client\\src\\main\\resources\\buttons\\color_red.png")); // NOI18N
+        tbRed.setSelectedIcon(new javax.swing.ImageIcon(getClass().getResource("/buttons/color_red.png"))); // NOI18N
         tbRed.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
         tbRed.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -485,13 +485,13 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene
         });
         tbColor.add(tbRed);
 
-        tbGreen.setIcon(new javax.swing.ImageIcon("D:\\Projekte\\mag\\mageRep\\localmage\\Mage.Client\\src\\main\\resources\\buttons\\color_green_off.png")); // NOI18N
+        tbGreen.setIcon(new javax.swing.ImageIcon(getClass().getResource("/buttons/color_green_off.png"))); // NOI18N
         tbGreen.setSelected(true);
-        tbGreen.setToolTipText("<html>Green<br/>" + tbColor.getToolTipText());
+        tbGreen.setToolTipText("<html><font color='Green'><strong>Green</strong></font><br/>" + tbColor.getToolTipText());
         tbGreen.setActionCommand("Green");
         tbGreen.setFocusable(false);
         tbGreen.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
-        tbGreen.setSelectedIcon(new javax.swing.ImageIcon("D:\\Projekte\\mag\\mageRep\\localmage\\Mage.Client\\src\\main\\resources\\buttons\\color_green.png")); // NOI18N
+        tbGreen.setSelectedIcon(new javax.swing.ImageIcon(getClass().getResource("/buttons/color_green.png"))); // NOI18N
         tbGreen.setVerifyInputWhenFocusTarget(false);
         tbGreen.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
         tbGreen.addActionListener(new java.awt.event.ActionListener() {
@@ -501,13 +501,13 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene
         });
         tbColor.add(tbGreen);
 
-        tbBlue.setIcon(new javax.swing.ImageIcon("D:\\Projekte\\mag\\mageRep\\localmage\\Mage.Client\\src\\main\\resources\\buttons\\color_blueOff.png")); // NOI18N
+        tbBlue.setIcon(new javax.swing.ImageIcon(getClass().getResource("/buttons/color_blueOff.png"))); // NOI18N
         tbBlue.setSelected(true);
-        tbBlue.setToolTipText("<html>Blue<br/>" + tbColor.getToolTipText());
+        tbBlue.setToolTipText("<html><font color='blue'><strong>Blue</strong></font><br/>" + tbColor.getToolTipText());
         tbBlue.setActionCommand("Blue");
         tbBlue.setFocusable(false);
         tbBlue.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
-        tbBlue.setSelectedIcon(new javax.swing.ImageIcon("D:\\Projekte\\mag\\mageRep\\localmage\\Mage.Client\\src\\main\\resources\\buttons\\color_blue.png")); // NOI18N
+        tbBlue.setSelectedIcon(new javax.swing.ImageIcon(getClass().getResource("/buttons/color_blue.png"))); // NOI18N
         tbBlue.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
         tbBlue.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -516,13 +516,13 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene
         });
         tbColor.add(tbBlue);
 
-        tbBlack.setIcon(new javax.swing.ImageIcon("D:\\Projekte\\mag\\mageRep\\localmage\\Mage.Client\\src\\main\\resources\\buttons\\color_black_off.png")); // NOI18N
+        tbBlack.setIcon(new javax.swing.ImageIcon(getClass().getResource("/buttons/color_black_off.png"))); // NOI18N
         tbBlack.setSelected(true);
         tbBlack.setToolTipText("<html>Black<br/>" + tbColor.getToolTipText());
         tbBlack.setActionCommand("Black");
         tbBlack.setFocusable(false);
         tbBlack.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
-        tbBlack.setSelectedIcon(new javax.swing.ImageIcon("D:\\Projekte\\mag\\mageRep\\localmage\\Mage.Client\\src\\main\\resources\\buttons\\color_black.png")); // NOI18N
+        tbBlack.setSelectedIcon(new javax.swing.ImageIcon(getClass().getResource("/buttons/color_black.png"))); // NOI18N
         tbBlack.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
         tbBlack.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -531,13 +531,13 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene
         });
         tbColor.add(tbBlack);
 
-        tbWhite.setIcon(new javax.swing.ImageIcon("D:\\Projekte\\mag\\mageRep\\localmage\\Mage.Client\\src\\main\\resources\\buttons\\color_white_off.png")); // NOI18N
+        tbWhite.setIcon(new javax.swing.ImageIcon(getClass().getResource("/buttons/color_white_off.png"))); // NOI18N
         tbWhite.setSelected(true);
         tbWhite.setToolTipText("<html>White<br/>" + tbColor.getToolTipText());
         tbWhite.setActionCommand("White");
         tbWhite.setFocusable(false);
         tbWhite.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
-        tbWhite.setSelectedIcon(new javax.swing.ImageIcon("D:\\Projekte\\mag\\mageRep\\localmage\\Mage.Client\\src\\main\\resources\\buttons\\color_white.png")); // NOI18N
+        tbWhite.setSelectedIcon(new javax.swing.ImageIcon(getClass().getResource("/buttons/color_white.png"))); // NOI18N
         tbWhite.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
         tbWhite.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -546,13 +546,13 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene
         });
         tbColor.add(tbWhite);
 
-        tbColorless.setIcon(new javax.swing.ImageIcon("D:\\Projekte\\mag\\mageRep\\localmage\\Mage.Client\\src\\main\\resources\\buttons\\colorless_off.png")); // NOI18N
+        tbColorless.setIcon(new javax.swing.ImageIcon(getClass().getResource("/buttons/colorless_off.png"))); // NOI18N
         tbColorless.setSelected(true);
         tbColorless.setToolTipText("<html>Colorless<br/>" + tbColor.getToolTipText());
         tbColorless.setActionCommand("Colorless");
         tbColorless.setFocusable(false);
         tbColorless.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
-        tbColorless.setSelectedIcon(new javax.swing.ImageIcon("D:\\Projekte\\mag\\mageRep\\localmage\\Mage.Client\\src\\main\\resources\\buttons\\colorless.png")); // NOI18N
+        tbColorless.setSelectedIcon(new javax.swing.ImageIcon(getClass().getResource("/buttons/colorless.png"))); // NOI18N
         tbColorless.setVerticalTextPosition(javax.swing.SwingConstants.BOTTOM);
         tbColorless.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -713,7 +713,7 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene
         tbTypes.add(jSeparator4);
 
         bgView.add(jToggleListView);
-        jToggleListView.setIcon(new javax.swing.ImageIcon("D:\\Projekte\\mag\\mageRep\\localmage\\Mage.Client\\src\\main\\resources\\buttons\\list_panel.png")); // NOI18N
+        jToggleListView.setIcon(new javax.swing.ImageIcon(getClass().getResource("/buttons/list_panel.png"))); // NOI18N
         jToggleListView.setSelected(true);
         jToggleListView.setToolTipText("Shows the cards as a list.");
         jToggleListView.setBorderPainted(false);
@@ -731,7 +731,7 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene
         tbTypes.add(jToggleListView);
 
         bgView.add(jToggleCardView);
-        jToggleCardView.setIcon(new javax.swing.ImageIcon("D:\\Projekte\\mag\\mageRep\\localmage\\Mage.Client\\src\\main\\resources\\buttons\\card_panel.png")); // NOI18N
+        jToggleCardView.setIcon(new javax.swing.ImageIcon(getClass().getResource("/buttons/card_panel.png"))); // NOI18N
         jToggleCardView.setToolTipText("Shows the card as images.");
         jToggleCardView.setBorderPainted(false);
         jToggleCardView.setFocusable(false);
@@ -752,7 +752,7 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene
         cardSelectorBottomPanel.setOpaque(false);
         cardSelectorBottomPanel.setPreferredSize(new java.awt.Dimension(897, 40));
 
-        jButtonAddToMain.setIcon(new javax.swing.ImageIcon("D:\\Projekte\\mag\\mageRep\\localmage\\Mage.Client\\src\\main\\resources\\buttons\\deck_in.png")); // NOI18N
+        jButtonAddToMain.setIcon(new javax.swing.ImageIcon(getClass().getResource("/buttons/deck_in.png"))); // NOI18N
         jButtonAddToMain.setToolTipText("Add selected cards to deck");
         jButtonAddToMain.setMargin(null);
         jButtonAddToMain.setMaximumSize(new java.awt.Dimension(42, 23));
@@ -764,7 +764,7 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene
             }
         });
 
-        jButtonAddToSideboard.setIcon(new javax.swing.ImageIcon("D:\\Projekte\\mag\\mageRep\\localmage\\Mage.Client\\src\\main\\resources\\buttons\\sideboard_in.png")); // NOI18N
+        jButtonAddToSideboard.setIcon(new javax.swing.ImageIcon(getClass().getResource("/buttons/sideboard_in.png"))); // NOI18N
         jButtonAddToSideboard.setToolTipText("Add selected cards to sideboard.");
         jButtonAddToSideboard.setMargin(new java.awt.Insets(2, 0, 2, 0));
         jButtonAddToSideboard.setMaximumSize(new java.awt.Dimension(100, 30));
@@ -802,7 +802,7 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene
 
         cardCount.setText("0");
 
-        jButtonRemoveFromMain.setIcon(new javax.swing.ImageIcon("D:\\Projekte\\mag\\mageRep\\localmage\\Mage.Client\\src\\main\\resources\\buttons\\deck_out.png")); // NOI18N
+        jButtonRemoveFromMain.setIcon(new javax.swing.ImageIcon(getClass().getResource("/buttons/deck_out.png"))); // NOI18N
         jButtonRemoveFromMain.setToolTipText("Remove selected cards from deck");
         jButtonRemoveFromMain.setMargin(null);
         jButtonRemoveFromMain.setMaximumSize(new java.awt.Dimension(42, 23));
@@ -814,7 +814,7 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene
             }
         });
 
-        jButtonRemoveFromSideboard.setIcon(new javax.swing.ImageIcon("D:\\Projekte\\mag\\mageRep\\localmage\\Mage.Client\\src\\main\\resources\\buttons\\sideboard_out.png")); // NOI18N
+        jButtonRemoveFromSideboard.setIcon(new javax.swing.ImageIcon(getClass().getResource("/buttons/sideboard_out.png"))); // NOI18N
         jButtonRemoveFromSideboard.setToolTipText("Remove selected cards from sideboard.");
         jButtonRemoveFromSideboard.setMargin(new java.awt.Insets(2, 0, 2, 0));
         jButtonRemoveFromSideboard.setMaximumSize(new java.awt.Dimension(10, 30));
@@ -890,7 +890,7 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene
                 .addGap(0, 0, 0)
                 .addComponent(tbTypes, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addComponent(cardSelectorScrollPane, javax.swing.GroupLayout.DEFAULT_SIZE, 232, Short.MAX_VALUE)
+                .addComponent(cardSelectorScrollPane, javax.swing.GroupLayout.DEFAULT_SIZE, 230, Short.MAX_VALUE)
                 .addGap(0, 0, 0)
                 .addComponent(cardSelectorBottomPanel, javax.swing.GroupLayout.PREFERRED_SIZE, 31, javax.swing.GroupLayout.PREFERRED_SIZE))
         );
diff --git a/Mage.Server.Plugins/Mage.Game.TwoPlayerDuel/src/mage/game/TwoPlayerDuel.java b/Mage.Server.Plugins/Mage.Game.TwoPlayerDuel/src/mage/game/TwoPlayerDuel.java
index 74753a032bc..7024f0ad56e 100644
--- a/Mage.Server.Plugins/Mage.Game.TwoPlayerDuel/src/mage/game/TwoPlayerDuel.java
+++ b/Mage.Server.Plugins/Mage.Game.TwoPlayerDuel/src/mage/game/TwoPlayerDuel.java
@@ -76,7 +76,7 @@ public class TwoPlayerDuel extends GameImpl<TwoPlayerDuel> {
 
     @Override
     public Set<UUID> getOpponents(UUID playerId) {
-        Set<UUID> opponents = new HashSet<UUID>();
+        Set<UUID> opponents = new HashSet<>();
         for (UUID opponentId: this.getPlayer(playerId).getInRange()) {
             if (!opponentId.equals(playerId)) {
                 opponents.add(opponentId);