diff --git a/source/org/jivesoftware/smackx/debugger/EnhancedDebugger.java b/source/org/jivesoftware/smackx/debugger/EnhancedDebugger.java
index 137be3dd6..1f3c655ea 100644
--- a/source/org/jivesoftware/smackx/debugger/EnhancedDebugger.java
+++ b/source/org/jivesoftware/smackx/debugger/EnhancedDebugger.java
@@ -92,27 +92,32 @@ public class EnhancedDebugger implements SmackDebugger {
     {
         URL url;
         // Load the image icons 
-        url = ClassLoader.getSystemClassLoader().getResource("images/nav_left_blue.png");
+        url =
+            Thread.currentThread().getContextClassLoader().getResource("images/nav_left_blue.png");
         if (url != null) {
             packetReceivedIcon = new ImageIcon(url);
-        }            
-        url = ClassLoader.getSystemClassLoader().getResource("images/nav_right_red.png");
+        }
+        url =
+            Thread.currentThread().getContextClassLoader().getResource("images/nav_right_red.png");
         if (url != null) {
             packetSentIcon = new ImageIcon(url);
         }
-        url = ClassLoader.getSystemClassLoader().getResource("images/photo_portrait.png");
+        url =
+            Thread.currentThread().getContextClassLoader().getResource("images/photo_portrait.png");
         if (url != null) {
             presencePacketIcon = new ImageIcon(url);
         }
-        url = ClassLoader.getSystemClassLoader().getResource("images/question_and_answer.png");
+        url =
+            Thread.currentThread().getContextClassLoader().getResource(
+                "images/question_and_answer.png");
         if (url != null) {
             iqPacketIcon = new ImageIcon(url);
         }
-        url = ClassLoader.getSystemClassLoader().getResource("images/message.png");
+        url = Thread.currentThread().getContextClassLoader().getResource("images/message.png");
         if (url != null) {
             messagePacketIcon = new ImageIcon(url);
         }
-        url = ClassLoader.getSystemClassLoader().getResource("images/unknown.png");
+        url = Thread.currentThread().getContextClassLoader().getResource("images/unknown.png");
         if (url != null) {
             unknownPacketTypeIcon = new ImageIcon(url);
         }
diff --git a/source/org/jivesoftware/smackx/debugger/EnhancedDebuggerWindow.java b/source/org/jivesoftware/smackx/debugger/EnhancedDebuggerWindow.java
index 2494c241a..cfc948e3e 100644
--- a/source/org/jivesoftware/smackx/debugger/EnhancedDebuggerWindow.java
+++ b/source/org/jivesoftware/smackx/debugger/EnhancedDebuggerWindow.java
@@ -84,19 +84,25 @@ class EnhancedDebuggerWindow {
     {
         URL url;
         
-        url = ClassLoader.getSystemClassLoader().getResource("images/trafficlight_off.png");
+        url =
+            Thread.currentThread().getContextClassLoader().getResource(
+                "images/trafficlight_off.png");
         if (url != null) {
             connectionCreatedIcon = new ImageIcon(url);
-        }            
-        url = ClassLoader.getSystemClassLoader().getResource("images/trafficlight_green.png");
+        }
+        url =
+            Thread.currentThread().getContextClassLoader().getResource(
+                "images/trafficlight_green.png");
         if (url != null) {
             connectionActiveIcon = new ImageIcon(url);
         }
-        url = ClassLoader.getSystemClassLoader().getResource("images/trafficlight_red.png");
+        url =
+            Thread.currentThread().getContextClassLoader().getResource(
+                "images/trafficlight_red.png");
         if (url != null) {
             connectionClosedIcon = new ImageIcon(url);
         }
-        url = ClassLoader.getSystemClassLoader().getResource("images/warning.png");
+        url = Thread.currentThread().getContextClassLoader().getResource("images/warning.png");
         if (url != null) {
             connectionClosedOnErrorIcon = new ImageIcon(url);
         }