diff --git a/src/Main.java b/src/Main.java
index 04defe4c76869688e0221cdd2a84990a6a6d1c4c..b2d5ccd9eff671fa009881e787cd1032864eefb5 100755
--- a/src/Main.java
+++ b/src/Main.java
@@ -1,4 +1,4 @@
-/**Copyright or � or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
 
 ludovic.apvrille AT enst.fr
 
diff --git a/src/ui/IconManager.java b/src/ui/IconManager.java
index 9350c6982954f3d1d66b47b7e5dbeef504c8ffd3..d8f5a7aefdfbfa5c2556d0a0a2a4e71135038e9b 100755
--- a/src/ui/IconManager.java
+++ b/src/ui/IconManager.java
@@ -1,4 +1,4 @@
-/**Copyright or � or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
 
 ludovic.apvrille AT enst.fr
 
@@ -439,7 +439,7 @@ public class IconManager {
     }
     
     public ImageIcon getIcon(String s){
-        URL url = this.getClass().getResource(s);
+        URL url = this.getClass().getResource("../" + s);
         
         if (url != null)  {
             return new ImageIcon(url);
@@ -463,8 +463,12 @@ public class IconManager {
     public void loadImg() {
         imgic8 = getIcon(icon8);
 		imgic9 = getIcon(icon9);
-		img8 = imgic8.getImage();
-		img9 = imgic9.getImage();
+		if (imgic8 != null) {
+			img8 = imgic8.getImage();
+		}
+		if (img9 != null) {
+			img9 = imgic9.getImage();
+		}
 		
         //Added by Solange
         imgic0 = getIcon(icon0);
diff --git a/src/ui/interactivesimulation/InteractiveSimulationActions.java b/src/ui/interactivesimulation/InteractiveSimulationActions.java
index 1cabd202884553fccd721d7632ba33c25308be02..37cf751d08739a01086f9ffc1ee5fd82ff9a3971 100755
--- a/src/ui/interactivesimulation/InteractiveSimulationActions.java
+++ b/src/ui/interactivesimulation/InteractiveSimulationActions.java
@@ -137,7 +137,7 @@ public class InteractiveSimulationActions extends AbstractAction {
         actions[ACT_RUN_X_TRANSACTIONS] = new TAction("run-x-transactions", "Run x transactions", IconManager.imgic1306, IconManager.imgic1306, "Run x transactions", "Run simulation for x transactions. Works only if the simulator is \"ready\"", 'R');
         actions[ACT_RUN_X_COMMANDS] = new TAction("run-x-commands", "Run x commands", IconManager.imgic1308, IconManager.imgic1308, "Run x commands", "Run simulation for x commands. Works only if the simulator is \"ready\"", 'R');
         
-		actions[ACT_RUN_X_EXPLORATION] = new TAction("run-exploration", "Run exploration", IconManager.imgic1308, IconManager.imgic1308, "Run exploration", "Explore branches of the simulation", 'R');
+		actions[ACT_RUN_EXPLORATION] = new TAction("run-exploration", "Run exploration", IconManager.imgic1308, IconManager.imgic1308, "Run exploration", "Explore branches of the simulation", 'R');
         actions[ACT_RUN_TO_NEXT_BUS_TRANSFER] = new TAction("run-until-bus-transfer", "Run until bus transfer", IconManager.imgic1308, IconManager.imgic1308, "Run until transfer on bus", "Run until a transfer on the indicated bus is performed. Works only if the simulator is \"ready\"", 'R');
         actions[ACT_RUN_UNTIL_CPU_EXECUTES] = new TAction("run-to-cpu", "Run until CPU executes", IconManager.imgic1308, IconManager.imgic1308, "Run until CPU executes", "Run until a CPU, given as parameter, executes. Works only if the simulator is \"ready\"", 'R');
         actions[ACT_RUN_UNTIL_TASK_EXECUTES] = new TAction("run-to-task", "Run until a task executes", IconManager.imgic1308, IconManager.imgic1308, "Run until a task executes", "Run until a task executes. Works only if the simulator is \"ready\"", 'R');
diff --git a/src/ui/interactivesimulation/JFrameInteractiveSimulation.java b/src/ui/interactivesimulation/JFrameInteractiveSimulation.java
index e1b2127fc70fddb06314a4fa5342fbafae19248d..efdcc0025346943f1003ef4435ee4f769764f550 100755
--- a/src/ui/interactivesimulation/JFrameInteractiveSimulation.java
+++ b/src/ui/interactivesimulation/JFrameInteractiveSimulation.java
@@ -1243,12 +1243,12 @@ public	class JFrameInteractiveSimulation extends JFrame implements ActionListene
 		actions[InteractiveSimulationActions.ACT_RESTORE_STATE].setEnabled(b);
 		actions[InteractiveSimulationActions.ACT_SAVE_TXT].setEnabled(b);
 		
-		jfis.actions[InteractiveSimulationActions.ACT_RUN_EXPLORATION].setEnabled(b);
-		jfis.actions[InteractiveSimulationActions.ACT_RUN_TO_NEXT_BUS_TRANSFER].setEnabled(b);
-		jfis.actions[InteractiveSimulationActions.ACT_RUN_UNTIL_CPU_EXECUTES].setEnabled(b);
-		jfis.actions[InteractiveSimulationActions.ACT_RUN_UNTIL_TASK_EXECUTES].setEnabled(b);
-		jfis.actions[InteractiveSimulationActions.ACT_RUN_UNTIL_MEMORY_ACCESS].setEnabled(b);
-		jfis.actions[InteractiveSimulationActions.ACT_RUN_UNTIL_CHANNEL_ACCESS].setEnabled(b);
+		actions[InteractiveSimulationActions.ACT_RUN_EXPLORATION].setEnabled(b);
+		actions[InteractiveSimulationActions.ACT_RUN_TO_NEXT_BUS_TRANSFER].setEnabled(b);
+		actions[InteractiveSimulationActions.ACT_RUN_UNTIL_CPU_EXECUTES].setEnabled(b);
+		actions[InteractiveSimulationActions.ACT_RUN_UNTIL_TASK_EXECUTES].setEnabled(b);
+		actions[InteractiveSimulationActions.ACT_RUN_UNTIL_MEMORY_ACCESS].setEnabled(b);
+		actions[InteractiveSimulationActions.ACT_RUN_UNTIL_CHANNEL_ACCESS].setEnabled(b);
 		
 	}