Index: /applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/JMapViewer.java
===================================================================
--- /applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/JMapViewer.java	(revision 29186)
+++ /applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/JMapViewer.java	(revision 29187)
@@ -144,5 +144,5 @@
         int size = 18;
         try {
-            ImageIcon icon = new ImageIcon(getClass().getResource("images/plus.png"));
+            ImageIcon icon = new ImageIcon(JMapViewer.class.getResource("images/plus.png"));
             zoomInButton = new JButton(icon);
         } catch (Exception e) {
@@ -160,5 +160,5 @@
         add(zoomInButton);
         try {
-            ImageIcon icon = new ImageIcon(getClass().getResource("images/minus.png"));
+            ImageIcon icon = new ImageIcon(JMapViewer.class.getResource("images/minus.png"));
             zoomOutButton = new JButton(icon);
         } catch (Exception e) {
Index: /applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/BingAerialTileSource.java
===================================================================
--- /applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/BingAerialTileSource.java	(revision 29186)
+++ /applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/BingAerialTileSource.java	(revision 29187)
@@ -29,4 +29,5 @@
 
 import org.openstreetmap.gui.jmapviewer.Coordinate;
+import org.openstreetmap.gui.jmapviewer.JMapViewer;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
@@ -175,5 +176,5 @@
     public Image getAttributionImage() {
         try {
-            return ImageIO.read(getClass().getResourceAsStream("/org/openstreetmap/gui/jmapviewer/images/bing_maps.png"));
+            return ImageIO.read(JMapViewer.class.getResourceAsStream("images/bing_maps.png"));
         } catch (IOException e) {
             return null;