diff --git a/src/main/java/io/github/dsheirer/audio/AudioPanel.java b/src/main/java/io/github/dsheirer/audio/AudioPanel.java
index fda419c4..83adc861 100644
--- a/src/main/java/io/github/dsheirer/audio/AudioPanel.java
+++ b/src/main/java/io/github/dsheirer/audio/AudioPanel.java
@@ -29,10 +29,19 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.sound.sampled.FloatControl;
-import javax.swing.*;
+import javax.swing.ImageIcon;
+import javax.swing.JButton;
+import javax.swing.JMenu;
+import javax.swing.JMenuItem;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JPopupMenu;
+import javax.swing.JSlider;
+import javax.swing.SwingUtilities;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
-import java.awt.*;
+import java.awt.Color;
+import java.awt.EventQueue;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.MouseEvent;
@@ -44,10 +53,8 @@ public class AudioPanel extends JPanel implements Listener<AudioEvent>
 
     private static final Logger mLog = LoggerFactory.getLogger(AudioPanel.class);
 
-    private static ImageIcon MUTED_ICON = IconManager.getScaledIcon(
-        new ImageIcon("images/audio_muted.png"), 20);
-    private static ImageIcon UNMUTED_ICON = IconManager.getScaledIcon(
-        new ImageIcon("images/audio_unmuted.png"), 20);
+    private static ImageIcon MUTED_ICON = IconManager.getScaledIcon("/images/audio_muted.png", 20);
+    private static ImageIcon UNMUTED_ICON = IconManager.getScaledIcon("/images/audio_unmuted.png", 20);
 
     private IconManager mIconManager;
     private SettingsManager mSettingsManager;
diff --git a/src/main/java/io/github/dsheirer/audio/broadcast/BroadcastModel.java b/src/main/java/io/github/dsheirer/audio/broadcast/BroadcastModel.java
index f942411b..fc7c9eac 100644
--- a/src/main/java/io/github/dsheirer/audio/broadcast/BroadcastModel.java
+++ b/src/main/java/io/github/dsheirer/audio/broadcast/BroadcastModel.java
@@ -29,7 +29,7 @@ import io.github.dsheirer.util.ThreadPool;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.swing.*;
+import javax.swing.ImageIcon;
 import javax.swing.table.AbstractTableModel;
 import java.io.IOException;
 import java.nio.file.DirectoryStream;
@@ -519,7 +519,7 @@ public class BroadcastModel extends AbstractTableModel implements Listener<Audio
 
                             if(iconPath != null && mIconManager != null)
                             {
-                                return mIconManager.getScaledIcon(new ImageIcon(iconPath), 14);
+                                return mIconManager.getScaledIcon(iconPath, 14);
                             }
                             break;
                         case COLUMN_STREAM_NAME:
diff --git a/src/main/java/io/github/dsheirer/audio/broadcast/BroadcastPanel.java b/src/main/java/io/github/dsheirer/audio/broadcast/BroadcastPanel.java
index f1455618..74eeb3cc 100644
--- a/src/main/java/io/github/dsheirer/audio/broadcast/BroadcastPanel.java
+++ b/src/main/java/io/github/dsheirer/audio/broadcast/BroadcastPanel.java
@@ -27,7 +27,12 @@ import net.miginfocom.swing.MigLayout;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.swing.*;
+import javax.swing.JButton;
+import javax.swing.JMenuItem;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JPopupMenu;
+import javax.swing.ListSelectionModel;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 import java.awt.event.ActionEvent;
@@ -227,7 +232,7 @@ public class BroadcastPanel extends JPanel implements ActionListener, ListSelect
 
         public AddBroadcastConfigurationItem(BroadcastServerType type)
         {
-            super(type.toString(), mIconManager.getScaledIcon(new ImageIcon(type.getIconPath()), 14));
+            super(type.toString(), mIconManager.getScaledIcon(type.getIconPath(), 14));
 
             mBroadcastServerType = type;
 
diff --git a/src/main/java/io/github/dsheirer/audio/broadcast/BroadcastServerType.java b/src/main/java/io/github/dsheirer/audio/broadcast/BroadcastServerType.java
index a4cced40..584a90eb 100644
--- a/src/main/java/io/github/dsheirer/audio/broadcast/BroadcastServerType.java
+++ b/src/main/java/io/github/dsheirer/audio/broadcast/BroadcastServerType.java
@@ -20,11 +20,11 @@ package io.github.dsheirer.audio.broadcast;
 
 public enum BroadcastServerType
 {
-    BROADCASTIFY("Broadcastify", "images/broadcastify.png"), //Icecast Server 2.3.2
-    ICECAST_HTTP("Icecast 2 (v2.4+)", "images/icecast.png"),
-    ICECAST_TCP("Icecast (v2.3)", "images/icecast.png"),
-    SHOUTCAST_V1("Shoutcast v1.x", "images/shoutcast.png"),
-    SHOUTCAST_V2("Shoutcast v2.x", "images/shoutcast.png"),
+    BROADCASTIFY("Broadcastify", "/images/broadcastify.png"), //Icecast Server 2.3.2
+    ICECAST_HTTP("Icecast 2 (v2.4+)", "/images/icecast.png"),
+    ICECAST_TCP("Icecast (v2.3)", "/images/icecast.png"),
+    SHOUTCAST_V1("Shoutcast v1.x", "/images/shoutcast.png"),
+    SHOUTCAST_V2("Shoutcast v2.x", "/images/shoutcast.png"),
     UNKNOWN("Unknown", null);
 
     private String mLabel;
diff --git a/src/main/java/io/github/dsheirer/audio/broadcast/broadcastify/BroadcastifyConfigurationEditor.java b/src/main/java/io/github/dsheirer/audio/broadcast/broadcastify/BroadcastifyConfigurationEditor.java
index 3b74585d..f90ab827 100644
--- a/src/main/java/io/github/dsheirer/audio/broadcast/broadcastify/BroadcastifyConfigurationEditor.java
+++ b/src/main/java/io/github/dsheirer/audio/broadcast/broadcastify/BroadcastifyConfigurationEditor.java
@@ -31,10 +31,17 @@ import net.miginfocom.swing.MigLayout;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.swing.*;
+import javax.swing.ImageIcon;
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JSlider;
+import javax.swing.JTextField;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
-import java.awt.*;
+import java.awt.Dimension;
+import java.awt.EventQueue;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
@@ -74,8 +81,7 @@ public class BroadcastifyConfigurationEditor extends BroadcastConfigurationEdito
 
         JLabel channelLabel = new JLabel("Broadcastify Stream");
 
-        ImageIcon broadcastifyIcon = mIconManager.getScaledIcon(
-            new ImageIcon(BroadcastServerType.BROADCASTIFY.getIconPath()), 25);
+        ImageIcon broadcastifyIcon = mIconManager.getScaledIcon(BroadcastServerType.BROADCASTIFY.getIconPath(), 25);
         channelLabel.setIcon(broadcastifyIcon);
         add(channelLabel, "span, align center");
 
diff --git a/src/main/java/io/github/dsheirer/audio/broadcast/icecast/IcecastHTTPConfigurationEditor.java b/src/main/java/io/github/dsheirer/audio/broadcast/icecast/IcecastHTTPConfigurationEditor.java
index 399e6096..a9e545e7 100644
--- a/src/main/java/io/github/dsheirer/audio/broadcast/icecast/IcecastHTTPConfigurationEditor.java
+++ b/src/main/java/io/github/dsheirer/audio/broadcast/icecast/IcecastHTTPConfigurationEditor.java
@@ -29,10 +29,16 @@ import net.miginfocom.swing.MigLayout;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.swing.*;
+import javax.swing.ImageIcon;
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JSlider;
+import javax.swing.JTextField;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
-import java.awt.*;
+import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
@@ -73,7 +79,7 @@ public class IcecastHTTPConfigurationEditor extends BroadcastConfigurationEditor
 
         JLabel channelLabel = new JLabel("Icecast 2 (v2.4+) Stream");
 
-        ImageIcon icon = mIconManager.getScaledIcon(new ImageIcon(BroadcastServerType.ICECAST_HTTP.getIconPath()), 25);
+        ImageIcon icon = mIconManager.getScaledIcon(BroadcastServerType.ICECAST_HTTP.getIconPath(), 25);
         channelLabel.setIcon(icon);
 
         add(channelLabel, "span, align center");
diff --git a/src/main/java/io/github/dsheirer/audio/broadcast/icecast/IcecastTCPConfigurationEditor.java b/src/main/java/io/github/dsheirer/audio/broadcast/icecast/IcecastTCPConfigurationEditor.java
index 4223a0d9..5c734ab9 100644
--- a/src/main/java/io/github/dsheirer/audio/broadcast/icecast/IcecastTCPConfigurationEditor.java
+++ b/src/main/java/io/github/dsheirer/audio/broadcast/icecast/IcecastTCPConfigurationEditor.java
@@ -29,10 +29,16 @@ import net.miginfocom.swing.MigLayout;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.swing.*;
+import javax.swing.ImageIcon;
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JSlider;
+import javax.swing.JTextField;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
-import java.awt.*;
+import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
@@ -72,7 +78,7 @@ public class IcecastTCPConfigurationEditor extends BroadcastConfigurationEditor
 
         JLabel channelLabel = new JLabel("Icecast (v2.3) Stream");
 
-        ImageIcon icon = mIconManager.getScaledIcon(new ImageIcon(BroadcastServerType.ICECAST_TCP.getIconPath()), 25);
+        ImageIcon icon = mIconManager.getScaledIcon(BroadcastServerType.ICECAST_TCP.getIconPath(), 25);
         channelLabel.setIcon(icon);
 
         add(channelLabel, "span, align center");
diff --git a/src/main/java/io/github/dsheirer/audio/broadcast/shoutcast/v1/ShoutcastV1ConfigurationEditor.java b/src/main/java/io/github/dsheirer/audio/broadcast/shoutcast/v1/ShoutcastV1ConfigurationEditor.java
index 79f0a0e4..552c65e0 100644
--- a/src/main/java/io/github/dsheirer/audio/broadcast/shoutcast/v1/ShoutcastV1ConfigurationEditor.java
+++ b/src/main/java/io/github/dsheirer/audio/broadcast/shoutcast/v1/ShoutcastV1ConfigurationEditor.java
@@ -29,10 +29,16 @@ import net.miginfocom.swing.MigLayout;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.swing.*;
+import javax.swing.ImageIcon;
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JSlider;
+import javax.swing.JTextField;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
-import java.awt.*;
+import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
@@ -71,7 +77,7 @@ public class ShoutcastV1ConfigurationEditor extends BroadcastConfigurationEditor
 
         JLabel channelLabel = new JLabel("Shoutcast (v1.x) Stream");
 
-        ImageIcon icon = mIconManager.getScaledIcon(new ImageIcon(BroadcastServerType.SHOUTCAST_V1.getIconPath()), 25);
+        ImageIcon icon = mIconManager.getScaledIcon(BroadcastServerType.SHOUTCAST_V1.getIconPath(), 25);
         channelLabel.setIcon(icon);
 
         add(channelLabel, "span, align center");
diff --git a/src/main/java/io/github/dsheirer/audio/broadcast/shoutcast/v2/ShoutcastV2ConfigurationEditor.java b/src/main/java/io/github/dsheirer/audio/broadcast/shoutcast/v2/ShoutcastV2ConfigurationEditor.java
index ee8637eb..47eca30f 100644
--- a/src/main/java/io/github/dsheirer/audio/broadcast/shoutcast/v2/ShoutcastV2ConfigurationEditor.java
+++ b/src/main/java/io/github/dsheirer/audio/broadcast/shoutcast/v2/ShoutcastV2ConfigurationEditor.java
@@ -29,10 +29,16 @@ import net.miginfocom.swing.MigLayout;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.swing.*;
+import javax.swing.ImageIcon;
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JSlider;
+import javax.swing.JTextField;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
-import java.awt.*;
+import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
@@ -72,7 +78,7 @@ public class ShoutcastV2ConfigurationEditor extends BroadcastConfigurationEditor
 
         JLabel channelLabel = new JLabel("Shoutcast (v2) Stream");
 
-        ImageIcon icon = mIconManager.getScaledIcon(new ImageIcon(BroadcastServerType.SHOUTCAST_V2.getIconPath()), 25);
+        ImageIcon icon = mIconManager.getScaledIcon(BroadcastServerType.SHOUTCAST_V2.getIconPath(), 25);
         channelLabel.setIcon(icon);
 
         add(channelLabel, "span, align center");
diff --git a/src/main/java/io/github/dsheirer/icon/Icon.java b/src/main/java/io/github/dsheirer/icon/Icon.java
index 6c3024a9..c00935aa 100644
--- a/src/main/java/io/github/dsheirer/icon/Icon.java
+++ b/src/main/java/io/github/dsheirer/icon/Icon.java
@@ -24,7 +24,8 @@ import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.swing.*;
+import javax.swing.ImageIcon;
+import java.net.URL;
 
 @JacksonXmlRootElement(localName = "icon")
 public class Icon implements Comparable<Icon>
@@ -80,7 +81,17 @@ public class Icon implements Comparable<Icon>
         {
             try
             {
-                mImageIcon = new ImageIcon(mPath);
+                URL imageURL = Icon.class.getResource(mPath);
+
+                if(imageURL == null && !mPath.startsWith("/"))
+                {
+                    imageURL = (Icon.class.getResource("/" + mPath));
+                }
+
+                if(imageURL != null)
+                {
+                    mImageIcon = new ImageIcon(imageURL);
+                }
             }
             catch(Exception e)
             {
diff --git a/src/main/java/io/github/dsheirer/icon/IconManager.java b/src/main/java/io/github/dsheirer/icon/IconManager.java
index a5f302df..419a811f 100644
--- a/src/main/java/io/github/dsheirer/icon/IconManager.java
+++ b/src/main/java/io/github/dsheirer/icon/IconManager.java
@@ -25,10 +25,12 @@ import io.github.dsheirer.util.ThreadPool;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.swing.*;
+import javax.swing.ImageIcon;
 import javax.swing.event.TableModelEvent;
 import javax.swing.event.TableModelListener;
-import java.awt.*;
+import java.awt.Component;
+import java.awt.EventQueue;
+import java.awt.Image;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -154,7 +156,7 @@ public class IconManager
             return mResizedIcons.get(scaledIconName);
         }
 
-        io.github.dsheirer.icon.Icon icon = getModel().getIcon(name);
+        Icon icon = getModel().getIcon(name);
 
         ImageIcon scaledIcon = getScaledIcon(icon.getIcon(), height);
         mResizedIcons.put(scaledIconName, scaledIcon);
@@ -181,6 +183,19 @@ public class IconManager
         return new ImageIcon(scaledImage);
     }
 
+    /**
+     * Constructs an icon and scales it to the specified height
+     * @param path
+     * @param height
+     * @return
+     */
+    public static ImageIcon getScaledIcon(String path, int height)
+    {
+        Icon icon = new Icon("", path);
+
+        return getScaledIcon(icon.getIcon(), height);
+    }
+
     /**
      * Folder where icon, backup and lock files are stored
      */
@@ -359,26 +374,26 @@ public class IconManager
     {
         IconSet iconSet = new IconSet();
 
-        io.github.dsheirer.icon.Icon defaultIcon = new io.github.dsheirer.icon.Icon(IconTableModel.DEFAULT_ICON, "images/no_icon.png");
+        Icon defaultIcon = new Icon(IconTableModel.DEFAULT_ICON, "images/no_icon.png");
         iconSet.add(defaultIcon);
         iconSet.setDefaultIcon(defaultIcon.getName());
 
-        iconSet.add(new io.github.dsheirer.icon.Icon("Ambulance", "images/ambulance.png"));
-        iconSet.add(new io.github.dsheirer.icon.Icon("Block Truck", "images/concrete_block_truck.png"));
-        iconSet.add(new io.github.dsheirer.icon.Icon("CWID", "images/cwid.png"));
-        iconSet.add(new io.github.dsheirer.icon.Icon("Dispatcher", "images/dispatcher.png"));
-        iconSet.add(new io.github.dsheirer.icon.Icon("Dump Truck", "images/dump_truck_red.png"));
-        iconSet.add(new io.github.dsheirer.icon.Icon("Fire Truck", "images/fire_truck.png"));
-        iconSet.add(new io.github.dsheirer.icon.Icon("Garbage Truck", "images/garbage_truck.png"));
-        iconSet.add(new io.github.dsheirer.icon.Icon("Loader", "images/loader.png"));
-        iconSet.add(new io.github.dsheirer.icon.Icon("Police", "images/police.png"));
-        iconSet.add(new io.github.dsheirer.icon.Icon("Propane Truck", "images/propane_truck.png"));
-        iconSet.add(new io.github.dsheirer.icon.Icon("Rescue Truck", "images/rescue_truck.png"));
-        iconSet.add(new io.github.dsheirer.icon.Icon("School Bus", "images/school_bus.png"));
-        iconSet.add(new io.github.dsheirer.icon.Icon("Taxi", "images/taxi.png"));
-        iconSet.add(new io.github.dsheirer.icon.Icon("Train", "images/train.png"));
-        iconSet.add(new io.github.dsheirer.icon.Icon("Transport Bus", "images/opt_bus.png"));
-        iconSet.add(new io.github.dsheirer.icon.Icon("Van", "images/van.png"));
+        iconSet.add(new Icon("Ambulance", "images/ambulance.png"));
+        iconSet.add(new Icon("Block Truck", "images/concrete_block_truck.png"));
+        iconSet.add(new Icon("CWID", "images/cwid.png"));
+        iconSet.add(new Icon("Dispatcher", "images/dispatcher.png"));
+        iconSet.add(new Icon("Dump Truck", "images/dump_truck_red.png"));
+        iconSet.add(new Icon("Fire Truck", "images/fire_truck.png"));
+        iconSet.add(new Icon("Garbage Truck", "images/garbage_truck.png"));
+        iconSet.add(new Icon("Loader", "images/loader.png"));
+        iconSet.add(new Icon("Police", "images/police.png"));
+        iconSet.add(new Icon("Propane Truck", "images/propane_truck.png"));
+        iconSet.add(new Icon("Rescue Truck", "images/rescue_truck.png"));
+        iconSet.add(new Icon("School Bus", "images/school_bus.png"));
+        iconSet.add(new Icon("Taxi", "images/taxi.png"));
+        iconSet.add(new Icon("Train", "images/train.png"));
+        iconSet.add(new Icon("Transport Bus", "images/opt_bus.png"));
+        iconSet.add(new Icon("Van", "images/van.png"));
 
         return iconSet;
     }
diff --git a/src/main/java/io/github/dsheirer/icon/IconTableModel.java b/src/main/java/io/github/dsheirer/icon/IconTableModel.java
index ba98bd00..a58c8be1 100644
--- a/src/main/java/io/github/dsheirer/icon/IconTableModel.java
+++ b/src/main/java/io/github/dsheirer/icon/IconTableModel.java
@@ -18,7 +18,7 @@
  ******************************************************************************/
 package io.github.dsheirer.icon;
 
-import javax.swing.*;
+import javax.swing.ImageIcon;
 import javax.swing.table.AbstractTableModel;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -32,10 +32,10 @@ public class IconTableModel extends AbstractTableModel
     public static final int COLUMN_IMAGE_ICON = 0;
     public static final int COLUMN_ICON_NAME = 1;
 
-    private io.github.dsheirer.icon.Icon mDefaultIcon;
+    private Icon mDefaultIcon;
 
-    private Map<String,io.github.dsheirer.icon.Icon> mIconMap = new HashMap<>();
-    private List<io.github.dsheirer.icon.Icon> mIcons = new ArrayList<>();
+    private Map<String,Icon> mIconMap = new HashMap<>();
+    private List<Icon> mIcons = new ArrayList<>();
 
     public IconTableModel()
     {
@@ -49,7 +49,7 @@ public class IconTableModel extends AbstractTableModel
 
         fireTableDataChanged();
 
-        for(io.github.dsheirer.icon.Icon icon: iconSet.getIcons())
+        for(Icon icon: iconSet.getIcons())
         {
             add(icon);
         }
@@ -60,7 +60,7 @@ public class IconTableModel extends AbstractTableModel
     /**
      * Adds the icon to the model
      */
-    public void add(io.github.dsheirer.icon.Icon icon)
+    public void add(Icon icon)
     {
         if(icon != null)
         {
@@ -75,7 +75,7 @@ public class IconTableModel extends AbstractTableModel
     /**
      * Removes the icon from the model
      */
-    public void remove(io.github.dsheirer.icon.Icon icon)
+    public void remove(Icon icon)
     {
         if(icon != null && mIcons.contains(icon))
         {
@@ -89,7 +89,7 @@ public class IconTableModel extends AbstractTableModel
 
     }
 
-    public io.github.dsheirer.icon.Icon get(int row)
+    public Icon get(int row)
     {
         if(row < mIcons.size())
         {
@@ -116,7 +116,7 @@ public class IconTableModel extends AbstractTableModel
     {
         if(rowIndex < mIcons.size() && columnIndex < getColumnCount())
         {
-            io.github.dsheirer.icon.Icon icon = get(rowIndex);
+            Icon icon = get(rowIndex);
 
             switch(columnIndex)
             {
@@ -162,19 +162,19 @@ public class IconTableModel extends AbstractTableModel
     /**
      * Icons in an array - suitable for use in a JComboBox
      */
-    public io.github.dsheirer.icon.Icon[] getIconsAsArray()
+    public Icon[] getIconsAsArray()
     {
-        List<io.github.dsheirer.icon.Icon> icons = new ArrayList<>(mIconMap.values());
+        List<Icon> icons = new ArrayList<>(mIconMap.values());
 
         Collections.sort(icons);
 
-        return icons.toArray(new io.github.dsheirer.icon.Icon[icons.size()]);
+        return icons.toArray(new Icon[icons.size()]);
     }
 
     /**
      * Returns the current default icon
      */
-    public io.github.dsheirer.icon.Icon getDefaultIcon()
+    public Icon getDefaultIcon()
     {
         return mDefaultIcon;
     }
@@ -182,7 +182,7 @@ public class IconTableModel extends AbstractTableModel
     /**
      * Indicates if the icon argument is the current default icon
      */
-    public boolean isDefaultIcon(io.github.dsheirer.icon.Icon icon)
+    public boolean isDefaultIcon(Icon icon)
     {
         return icon == getDefaultIcon();
     }
@@ -198,7 +198,7 @@ public class IconTableModel extends AbstractTableModel
         return name != null && !name.isEmpty() && mIconMap.containsKey(name);
     }
 
-    public void setDefaultIcon(io.github.dsheirer.icon.Icon icon)
+    public void setDefaultIcon(Icon icon)
     {
         if(icon != null)
         {
@@ -223,7 +223,7 @@ public class IconTableModel extends AbstractTableModel
             name = DEFAULT_ICON;
         }
 
-        io.github.dsheirer.icon.Icon defaultIcon = mIconMap.get(name);
+        Icon defaultIcon = mIconMap.get(name);
 
         if(defaultIcon != null)
         {
@@ -231,7 +231,7 @@ public class IconTableModel extends AbstractTableModel
         }
         else
         {
-            defaultIcon = new io.github.dsheirer.icon.Icon(DEFAULT_ICON, "images/no_icon.png");
+            defaultIcon = new Icon(DEFAULT_ICON, "images/no_icon.png");
             add(defaultIcon);
             setDefaultIcon(defaultIcon);
         }
@@ -240,14 +240,14 @@ public class IconTableModel extends AbstractTableModel
     /**
      * Returns the named icon or the default icon if the named icon does not exist
      */
-    public io.github.dsheirer.icon.Icon getIcon(String name)
+    public Icon getIcon(String name)
     {
         if(name == null || name.isEmpty())
         {
             return mDefaultIcon;
         }
 
-        io.github.dsheirer.icon.Icon icon = mIconMap.get(name);
+        Icon icon = mIconMap.get(name);
 
         if(icon == null)
         {
@@ -263,7 +263,7 @@ public class IconTableModel extends AbstractTableModel
     public IconSet getIconSet()
     {
         IconSet iconSet = new IconSet();
-        iconSet.setIcons(new ArrayList<io.github.dsheirer.icon.Icon>(mIconMap.values()));
+        iconSet.setIcons(new ArrayList<Icon>(mIconMap.values()));
         iconSet.setDefaultIcon(getDefaultIcon().getName());
         return iconSet;
     }
diff --git a/src/main/java/io/github/dsheirer/map/MapIcon.java b/src/main/java/io/github/dsheirer/map/MapIcon.java
index d1be4647..dd23b2bd 100644
--- a/src/main/java/io/github/dsheirer/map/MapIcon.java
+++ b/src/main/java/io/github/dsheirer/map/MapIcon.java
@@ -19,14 +19,20 @@ package io.github.dsheirer.map;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import io.github.dsheirer.icon.Icon;
 import io.github.dsheirer.settings.Setting;
 import io.github.dsheirer.settings.SettingType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-import javax.swing.*;
-import java.awt.*;
+import javax.swing.ImageIcon;
+import java.awt.Image;
+import java.net.URL;
 
 public class MapIcon extends Setting implements Comparable<MapIcon>
 {
+    private final static Logger mLog = LoggerFactory.getLogger(MapIcon.class);
+
     private static final int sMAX_IMAGE_DIMENSION = 48;
     private String mPath;
     private ImageIcon mImageIcon;
@@ -100,42 +106,58 @@ public class MapIcon extends Setting implements Comparable<MapIcon>
     @JsonIgnore
     public ImageIcon getImageIcon()
     {
-        if(mImageIcon == null)
+        if(mImageIcon == null && mPath != null)
         {
-            mImageIcon = new ImageIcon(mPath);
-
-            /**
-             * If the image is too big, scale it down to max pixel size squared
-             */
-            if(mImageIcon.getIconWidth() > sMAX_IMAGE_DIMENSION ||
-                mImageIcon.getIconHeight() > sMAX_IMAGE_DIMENSION)
+            try
             {
-                /**
-                 * getScaled instance will correct any negative value to the
-                 * correct value, maintaining original aspect ratio.  So, we
-                 * only scale the larger value, and allow the image class to
-                 * determine the correct value for the other measurement
-                 */
-                int height = -1;
-                int width = -1;
+                URL imageURL = Icon.class.getResource(mPath);
 
-                /**
-                 * Use the larger width or height value to determine the
-                 * scaling factor
-                 */
-                if(mImageIcon.getIconHeight() > mImageIcon.getIconWidth())
+                if(imageURL == null && !mPath.startsWith("/"))
                 {
-                    height = sMAX_IMAGE_DIMENSION;
-                }
-                else
-                {
-                    width = sMAX_IMAGE_DIMENSION;
+                    imageURL = (Icon.class.getResource("/" + mPath));
                 }
 
-                mImageIcon = new ImageIcon(mImageIcon.getImage()
-                    .getScaledInstance(width, height, Image.SCALE_SMOOTH));
+                if(imageURL != null)
+                {
+                    mImageIcon = new ImageIcon(imageURL);
+
+                    /**
+                     * If the image is too big, scale it down to max pixel size squared
+                     */
+                    if(mImageIcon.getIconWidth() > sMAX_IMAGE_DIMENSION ||
+                        mImageIcon.getIconHeight() > sMAX_IMAGE_DIMENSION)
+                    {
+                        /**
+                         * getScaled instance will correct any negative value to the
+                         * correct value, maintaining original aspect ratio.  So, we
+                         * only scale the larger value, and allow the image class to
+                         * determine the correct value for the other measurement
+                         */
+                        int height = -1;
+                        int width = -1;
+
+                        /**
+                         * Use the larger width or height value to determine the
+                         * scaling factor
+                         */
+                        if(mImageIcon.getIconHeight() > mImageIcon.getIconWidth())
+                        {
+                            height = sMAX_IMAGE_DIMENSION;
+                        }
+                        else
+                        {
+                            width = sMAX_IMAGE_DIMENSION;
+                        }
+
+                        mImageIcon = new ImageIcon(mImageIcon.getImage()
+                            .getScaledInstance(width, height, Image.SCALE_SMOOTH));
+                    }
+                }
+            }
+            catch(Exception e)
+            {
+                mLog.error("Error loading Icon [" + mPath + "]", e);
             }
-
         }
 
         return mImageIcon;
diff --git a/src/main/java/org/jdesktop/swingx/JXMapViewer.java b/src/main/java/org/jdesktop/swingx/JXMapViewer.java
index d7b05e0e..90f62ae8 100644
--- a/src/main/java/org/jdesktop/swingx/JXMapViewer.java
+++ b/src/main/java/org/jdesktop/swingx/JXMapViewer.java
@@ -20,14 +20,22 @@ import org.jdesktop.swingx.painter.Painter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.swing.*;
-import java.awt.*;
+import javax.swing.ImageIcon;
+import javax.swing.JPanel;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.Image;
+import java.awt.Insets;
+import java.awt.Rectangle;
 import java.awt.geom.Point2D;
 import java.awt.geom.Rectangle2D;
 import java.awt.image.BufferedImage;
 import java.beans.DesignMode;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
+import java.net.URL;
 import java.util.Set;
 
 /**
@@ -117,8 +125,13 @@ public class JXMapViewer extends JPanel implements DesignMode
 		// make a dummy loading image
 		try
 		{
-			ImageIcon imageIcon = new ImageIcon( "images/loading.png" );
-			this.setLoadingImage( imageIcon.getImage() );
+			URL imageURL = JXMapViewer.class.getResource("/images/loading.png");
+
+			if(imageURL != null)
+			{
+				ImageIcon imageIcon = new ImageIcon( imageURL );
+				this.setLoadingImage( imageIcon.getImage() );
+			}
 		}
 		catch (Throwable ex)
 		{
diff --git a/images/Curve-fitted-background.png b/src/main/resources/images/Curve-fitted-background.png
similarity index 100%
rename from images/Curve-fitted-background.png
rename to src/main/resources/images/Curve-fitted-background.png
diff --git a/images/Curve-fitted-chart-background.png b/src/main/resources/images/Curve-fitted-chart-background.png
similarity index 100%
rename from images/Curve-fitted-chart-background.png
rename to src/main/resources/images/Curve-fitted-chart-background.png
diff --git a/images/Curve-fitted-graph-gridlines.png b/src/main/resources/images/Curve-fitted-graph-gridlines.png
similarity index 100%
rename from images/Curve-fitted-graph-gridlines.png
rename to src/main/resources/images/Curve-fitted-graph-gridlines.png
diff --git a/images/acars.png b/src/main/resources/images/acars.png
similarity index 100%
rename from images/acars.png
rename to src/main/resources/images/acars.png
diff --git a/images/action.png b/src/main/resources/images/action.png
similarity index 100%
rename from images/action.png
rename to src/main/resources/images/action.png
diff --git a/images/ais.png b/src/main/resources/images/ais.png
similarity index 100%
rename from images/ais.png
rename to src/main/resources/images/ais.png
diff --git a/images/am.png b/src/main/resources/images/am.png
similarity index 100%
rename from images/am.png
rename to src/main/resources/images/am.png
diff --git a/images/ambulance.png b/src/main/resources/images/ambulance.png
similarity index 100%
rename from images/ambulance.png
rename to src/main/resources/images/ambulance.png
diff --git a/images/aprs.png b/src/main/resources/images/aprs.png
similarity index 100%
rename from images/aprs.png
rename to src/main/resources/images/aprs.png
diff --git a/images/audio_muted.png b/src/main/resources/images/audio_muted.png
similarity index 100%
rename from images/audio_muted.png
rename to src/main/resources/images/audio_muted.png
diff --git a/images/audio_unmuted.png b/src/main/resources/images/audio_unmuted.png
similarity index 100%
rename from images/audio_unmuted.png
rename to src/main/resources/images/audio_unmuted.png
diff --git a/images/broadcastify.png b/src/main/resources/images/broadcastify.png
similarity index 100%
rename from images/broadcastify.png
rename to src/main/resources/images/broadcastify.png
diff --git a/images/concrete_block_truck.png b/src/main/resources/images/concrete_block_truck.png
similarity index 100%
rename from images/concrete_block_truck.png
rename to src/main/resources/images/concrete_block_truck.png
diff --git a/images/control_play.png b/src/main/resources/images/control_play.png
similarity index 100%
rename from images/control_play.png
rename to src/main/resources/images/control_play.png
diff --git a/images/control_stop.png b/src/main/resources/images/control_stop.png
similarity index 100%
rename from images/control_stop.png
rename to src/main/resources/images/control_stop.png
diff --git a/images/cwid.png b/src/main/resources/images/cwid.png
similarity index 100%
rename from images/cwid.png
rename to src/main/resources/images/cwid.png
diff --git a/images/dispatcher.png b/src/main/resources/images/dispatcher.png
similarity index 100%
rename from images/dispatcher.png
rename to src/main/resources/images/dispatcher.png
diff --git a/images/dmr.png b/src/main/resources/images/dmr.png
similarity index 100%
rename from images/dmr.png
rename to src/main/resources/images/dmr.png
diff --git a/images/dump_truck_red.png b/src/main/resources/images/dump_truck_red.png
similarity index 100%
rename from images/dump_truck_red.png
rename to src/main/resources/images/dump_truck_red.png
diff --git a/images/fire_truck.png b/src/main/resources/images/fire_truck.png
similarity index 100%
rename from images/fire_truck.png
rename to src/main/resources/images/fire_truck.png
diff --git a/images/fm.png b/src/main/resources/images/fm.png
similarity index 100%
rename from images/fm.png
rename to src/main/resources/images/fm.png
diff --git a/images/garbage_truck.png b/src/main/resources/images/garbage_truck.png
similarity index 100%
rename from images/garbage_truck.png
rename to src/main/resources/images/garbage_truck.png
diff --git a/images/icecast.png b/src/main/resources/images/icecast.png
similarity index 100%
rename from images/icecast.png
rename to src/main/resources/images/icecast.png
diff --git a/images/loader.png b/src/main/resources/images/loader.png
similarity index 100%
rename from images/loader.png
rename to src/main/resources/images/loader.png
diff --git a/images/loading.png b/src/main/resources/images/loading.png
similarity index 100%
rename from images/loading.png
rename to src/main/resources/images/loading.png
diff --git a/images/ltr.png b/src/main/resources/images/ltr.png
similarity index 100%
rename from images/ltr.png
rename to src/main/resources/images/ltr.png
diff --git a/images/ltr_net.png b/src/main/resources/images/ltr_net.png
similarity index 100%
rename from images/ltr_net.png
rename to src/main/resources/images/ltr_net.png
diff --git a/images/motorola_type_2.png b/src/main/resources/images/motorola_type_2.png
similarity index 100%
rename from images/motorola_type_2.png
rename to src/main/resources/images/motorola_type_2.png
diff --git a/images/mpt1327.png b/src/main/resources/images/mpt1327.png
similarity index 100%
rename from images/mpt1327.png
rename to src/main/resources/images/mpt1327.png
diff --git a/images/no_icon.png b/src/main/resources/images/no_icon.png
similarity index 100%
rename from images/no_icon.png
rename to src/main/resources/images/no_icon.png
diff --git a/images/no_record.png b/src/main/resources/images/no_record.png
similarity index 100%
rename from images/no_record.png
rename to src/main/resources/images/no_record.png
diff --git a/images/nxdn.png b/src/main/resources/images/nxdn.png
similarity index 100%
rename from images/nxdn.png
rename to src/main/resources/images/nxdn.png
diff --git a/images/opt_bus.png b/src/main/resources/images/opt_bus.png
similarity index 100%
rename from images/opt_bus.png
rename to src/main/resources/images/opt_bus.png
diff --git a/images/p25_1.png b/src/main/resources/images/p25_1.png
similarity index 100%
rename from images/p25_1.png
rename to src/main/resources/images/p25_1.png
diff --git a/images/p25_2.png b/src/main/resources/images/p25_2.png
similarity index 100%
rename from images/p25_2.png
rename to src/main/resources/images/p25_2.png
diff --git a/images/passport.png b/src/main/resources/images/passport.png
similarity index 100%
rename from images/passport.png
rename to src/main/resources/images/passport.png
diff --git a/images/police.png b/src/main/resources/images/police.png
similarity index 100%
rename from images/police.png
rename to src/main/resources/images/police.png
diff --git a/images/propane_truck.png b/src/main/resources/images/propane_truck.png
similarity index 100%
rename from images/propane_truck.png
rename to src/main/resources/images/propane_truck.png
diff --git a/images/rescue_truck.png b/src/main/resources/images/rescue_truck.png
similarity index 100%
rename from images/rescue_truck.png
rename to src/main/resources/images/rescue_truck.png
diff --git a/images/school_bus.png b/src/main/resources/images/school_bus.png
similarity index 100%
rename from images/school_bus.png
rename to src/main/resources/images/school_bus.png
diff --git a/images/shoutcast.png b/src/main/resources/images/shoutcast.png
similarity index 100%
rename from images/shoutcast.png
rename to src/main/resources/images/shoutcast.png
diff --git a/images/site.png b/src/main/resources/images/site.png
similarity index 100%
rename from images/site.png
rename to src/main/resources/images/site.png
diff --git a/images/system.png b/src/main/resources/images/system.png
similarity index 100%
rename from images/system.png
rename to src/main/resources/images/system.png
diff --git a/images/taxi.png b/src/main/resources/images/taxi.png
similarity index 100%
rename from images/taxi.png
rename to src/main/resources/images/taxi.png
diff --git a/images/train.png b/src/main/resources/images/train.png
similarity index 100%
rename from images/train.png
rename to src/main/resources/images/train.png
diff --git a/images/van.png b/src/main/resources/images/van.png
similarity index 100%
rename from images/van.png
rename to src/main/resources/images/van.png
diff --git a/images/waypoint_white.png b/src/main/resources/images/waypoint_white.png
similarity index 100%
rename from images/waypoint_white.png
rename to src/main/resources/images/waypoint_white.png