@@ -1176,15 +1176,25 @@ public void run() {
     });
   }
 
-/**
-   * Get an image object from the theme folder.
+  
+  /**
+   * Get an ImageIcon object from the mode folder.
+   * @since 3.0a6
    */
-  public Image loadImage(String filename) {
+  public ImageIcon loadIcon(String filename) {
     File file = new File(folder, filename);
     if (!file.exists()) {
       return null;
     }
-    return new ImageIcon(file.getAbsolutePath()).getImage();
+    return new ImageIcon(file.getAbsolutePath());
+  }
+  
+  
+  /**
+   * Get an image object from the mode folder.
+   */
+  public Image loadImage(String filename) {
+    return loadIcon(filename).getImage();
   }
 
 
 
@@ -29,8 +29,6 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import javax.swing.ImageIcon;
-
 import processing.app.*;
 import processing.mode.java.runner.Runner;
 import processing.mode.java.tweak.SketchParser;
@@ -48,7 +46,6 @@ public JavaMode(Base base, File folder) {
 
     initLogger();
     loadPreferences();
-    loadIcons();
   }
 
 
@@ -277,19 +274,15 @@ void initLogger() {
   }
 
 
-  public ImageIcon classIcon, fieldIcon, methodIcon, localVarIcon;
-
-  protected void loadIcons(){
-    String iconPath = getContentFile("data").getAbsolutePath() + File.separator + "icons";
-    classIcon = new ImageIcon(iconPath + File.separator + "class_obj.png");
-    methodIcon = new ImageIcon(iconPath + File.separator
-        + "methpub_obj.png");
-    fieldIcon = new ImageIcon(iconPath + File.separator
-        + "field_protected_obj.png");
-    localVarIcon = new ImageIcon(iconPath + File.separator
-                              + "field_default_obj.png");
-    // log("Icons loaded");
-  }
+  //ImageIcon classIcon, fieldIcon, methodIcon, localVarIcon;
+
+//  protected void loadIcons() {
+//    String iconPath = getContentFile("data").getAbsolutePath() + File.separator + "icons";
+//    classIcon = new ImageIcon(iconPath + File.separator + "class_obj.png");
+//    methodIcon = new ImageIcon(iconPath + File.separator + "methpub_obj.png");
+//    fieldIcon = new ImageIcon(iconPath + File.separator + "field_protected_obj.png");
+//    localVarIcon = new ImageIcon(iconPath + File.separator + "field_default_obj.png");
+//  }
 
 
   static public volatile boolean errorCheckEnabled = true;
 
@@ -33,6 +33,7 @@
 import java.awt.event.MouseEvent;
 
 import javax.swing.DefaultListModel;
+import javax.swing.ImageIcon;
 import javax.swing.JButton;
 import javax.swing.JComponent;
 import javax.swing.JLabel;
@@ -50,6 +51,7 @@
 import javax.swing.text.BadLocationException;
 
 import processing.app.Base;
+import processing.app.Mode;
 import processing.app.syntax.JEditTextArea;
 import processing.mode.java.JavaEditor;
 
@@ -91,6 +93,9 @@ public class CompletionPanel {
 
   public static final int MOUSE_COMPLETION = 10, KEYBOARD_COMPLETION = 20;
 
+  ImageIcon classIcon, fieldIcon, methodIcon, localVarIcon;
+
+
   /**
    * Triggers the completion popup
    * @param textarea
@@ -123,6 +128,12 @@ public CompletionPanel(final JEditTextArea textarea, int position, String subWor
     popupMenu.show(textarea, location.x, textarea.getBaseline(0, 0)
         + location.y);
     //log("Suggestion shown: " + System.currentTimeMillis());
+    
+    Mode mode = editor.getMode();
+    classIcon = mode.loadIcon("theme/icon_class_obj.png");
+    methodIcon = mode.loadIcon("theme/icon_methpub_obj.png");
+    fieldIcon = mode.loadIcon("theme/icon_field_protected_obj.png");
+    localVarIcon = mode.loadIcon("theme/icon_field_default_obj.png");
   }
 
   private void styleScrollPane() {
@@ -199,7 +210,7 @@ private int calcHeight(int itemCount) {
     int maxHeight = 250;
     FontMetrics fm = textarea.getGraphics().getFontMetrics();
     float itemHeight = Math.max((fm.getHeight() + (fm.getDescent()) * 0.5f),
-                                editor.dmode.classIcon.getIconHeight() * 1.2f);
+                                classIcon.getIconHeight() * 1.2f);
 
     if (horizontalScrollBarVisible)
       itemCount++;
@@ -233,7 +244,7 @@ private int calcWidth() {
     int w = Math.min((int) min, maxWidth);
     if(w == maxWidth) 
       horizontalScrollBarVisible = true;
-    w += editor.dmode.classIcon.getIconWidth(); // add icon width too!
+    w += classIcon.getIconWidth(); // add icon width too!
     w += fm.stringWidth("           "); // a bit of offset
     //log("popup width " + w);
     return w; // popup menu width
@@ -545,19 +556,19 @@ public Component getListCellRendererComponent(JList<?> list, Object value,
         CompletionCandidate cc = (CompletionCandidate) value;
         switch (cc.getType()) {
         case CompletionCandidate.LOCAL_VAR:
-          label.setIcon(editor.dmode.localVarIcon);
+          label.setIcon(localVarIcon);
           break;
         case CompletionCandidate.LOCAL_FIELD:
         case CompletionCandidate.PREDEF_FIELD:
-          label.setIcon(editor.dmode.fieldIcon);
+          label.setIcon(fieldIcon);
           break;
         case CompletionCandidate.LOCAL_METHOD:
         case CompletionCandidate.PREDEF_METHOD:
-          label.setIcon(editor.dmode.methodIcon);
+          label.setIcon(methodIcon);
           break;
         case CompletionCandidate.LOCAL_CLASS:
         case CompletionCandidate.PREDEF_CLASS:
-          label.setIcon(editor.dmode.classIcon);
+          label.setIcon(classIcon);
           break;
 
         default:
 
@@ -33,6 +33,7 @@
 
 import javax.swing.BoxLayout;
 import javax.swing.Icon;
+import javax.swing.ImageIcon;
 import javax.swing.JFrame;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
@@ -55,6 +56,7 @@
 import org.eclipse.jdt.core.dom.TypeDeclaration;
 import org.eclipse.jdt.core.dom.VariableDeclarationFragment;
 
+import processing.app.Mode;
 import processing.mode.java.JavaEditor;
 
 
@@ -68,6 +70,8 @@ public class SketchOutline {
   protected JavaEditor editor;
   protected boolean internalSelection = false;
 
+  ImageIcon classIcon, fieldIcon, methodIcon;
+
 
   public SketchOutline(DefaultMutableTreeNode codeTree, ErrorCheckerService ecs) {
     errorCheckerService = ecs;
@@ -77,6 +81,12 @@ public SketchOutline(DefaultMutableTreeNode codeTree, ErrorCheckerService ecs) {
     soNode = (DefaultMutableTreeNode) soNode.getChildAt(0);
     tempNode = soNode;
     soTree = new JTree(soNode);
+    
+    Mode mode = editor.getMode();
+    classIcon = mode.loadIcon("theme/icon_class_obj.png");
+    methodIcon = mode.loadIcon("theme/icon_methpub_obj.png");
+    fieldIcon = mode.loadIcon("theme/icon_field_protected_obj.png");
+
     createGUI();
   }
 
@@ -386,11 +396,11 @@ public Icon getTreeIcon(Object o) {
 
         int type = awrap.getNode().getParent().getNodeType();
         if (type == ASTNode.METHOD_DECLARATION) {
-          return editor.dmode.methodIcon;
+          return methodIcon;
         } else if (type == ASTNode.TYPE_DECLARATION) {
-          return editor.dmode.classIcon;
+          return classIcon;
         } else if (type == ASTNode.VARIABLE_DECLARATION_FRAGMENT) {
-          return editor.dmode.fieldIcon;
+          return fieldIcon;
         }
       }
       return null;