diff --git a/src/main/java/ui/TGUIAction.java b/src/main/java/ui/TGUIAction.java
index 4516382270bb1a02a9a81e26b85a5d5fa6ecc265..621c112c56273e127820dc421ddcb7f17316da45 100755
--- a/src/main/java/ui/TGUIAction.java
+++ b/src/main/java/ui/TGUIAction.java
@@ -371,7 +371,7 @@ public class TGUIAction extends AbstractAction {
     public static final int FTD_COMPOSITION_CONNECTOR = 468;
     public static final int FTD_CONSTRAINT = 469;
     public static final int FTD_COUNTERMEASURE = 470;
-    public static final int FTD_COUNTERMEASURE_CONNECTOR = 470;
+    public static final int FTD_COUNTERMEASURE_CONNECTOR = 473;
 
     // AVATAR Block Diagram
     public static final int ABD_BLOCK = 289;
@@ -629,7 +629,7 @@ public class TGUIAction extends AbstractAction {
     public static final int MOVE_ENABLED = 463;
     public static final int FIRST_DIAGRAM = 464;
     
-    public static final int NB_ACTION = 473;
+    public static final int NB_ACTION = 474;
 
     private static final TAction [] actions = new TAction[NB_ACTION];
 
diff --git a/src/main/java/ui/ftd/FaultTreeDiagramToolbar.java b/src/main/java/ui/ftd/FaultTreeDiagramToolbar.java
index af9079a841fa3647ff9a7bb1e0dadf5f33575081..e57fc9eea09df9a8f755f110b9ca59267bdf063a 100644
--- a/src/main/java/ui/ftd/FaultTreeDiagramToolbar.java
+++ b/src/main/java/ui/ftd/FaultTreeDiagramToolbar.java
@@ -1,26 +1,26 @@
 /* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
- * 
+ *
  * ludovic.apvrille AT enst.fr
- * 
+ *
  * This software is a computer program whose purpose is to allow the
  * edition of TURTLE analysis, design and deployment diagrams, to
  * allow the generation of RT-LOTOS or Java code from this diagram,
  * and at last to allow the analysis of formal validation traces
  * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
  * from INRIA Rhone-Alpes.
- * 
+ *
  * This software is governed by the CeCILL  license under French law and
  * abiding by the rules of distribution of free software.  You can  use,
  * modify and/ or redistribute the software under the terms of the CeCILL
  * license as circulated by CEA, CNRS and INRIA at the following URL
  * "http://www.cecill.info".
- * 
+ *
  * As a counterpart to the access to the source code and  rights to copy,
  * modify and redistribute granted by the license, users are provided only
  * with a limited warranty  and the software's author,  the holder of the
  * economic rights,  and the successive licensors  have only  limited
  * liability.
- * 
+ *
  * In this respect, the user's attention is drawn to the risks associated
  * with loading,  using,  modifying and/or developing or reproducing the
  * software by the user in light of its specific status of free software,
@@ -31,14 +31,12 @@
  * requirements in conditions enabling the security of their systems and/or
  * data to be ensured and,  more generally, to use and operate it in the
  * same conditions as regards security.
- * 
+ *
  * The fact that you are presently reading this means that you have had
  * knowledge of the CeCILL license and that you accept its terms.
  */
 
 
-
-
 package ui.ftd;
 
 import ui.MainGUI;
@@ -51,12 +49,13 @@ import javax.swing.*;
 //import java.awt.event.*;
 
 /**
-   * Class FaultTreeDiagramToolBar
-   * Implements the toolbar to be used in conjunction with the panel of a fault tree diagram
-   * Creation: 03/11/2009
-   * @version 1.0 03/11/2009
-   * @author Ludovic APVRILLE
-   * @see ui.ftd.FaultTreeDiagramPanel
+ * Class FaultTreeDiagramToolBar
+ * Implements the toolbar to be used in conjunction with the panel of a fault tree diagram
+ * Creation: 03/11/2009
+ *
+ * @author Ludovic APVRILLE
+ * @version 1.0 03/11/2009
+ * @see ui.ftd.FaultTreeDiagramPanel
  */
 public class FaultTreeDiagramToolbar extends TToolBar {
 
@@ -85,11 +84,11 @@ public class FaultTreeDiagramToolbar extends TToolBar {
 
         mgui.actions[TGUIAction.FTD_CONSTRAINT].setEnabled(b);
 
-	mgui.actions[TGUIAction.FTD_COUNTERMEASURE].setEnabled(b);
-	mgui.actions[TGUIAction.FTD_COUNTERMEASURE_CONNECTOR].setEnabled(b);
+        mgui.actions[TGUIAction.FTD_COUNTERMEASURE].setEnabled(b);
+        mgui.actions[TGUIAction.FTD_COUNTERMEASURE_CONNECTOR].setEnabled(b);
 
         mgui.actions[TGUIAction.ACT_TOGGLE_ATTR].setEnabled(b);
-	//mgui.actions[TGUIAction.ACT_MODEL_CHECKING].setEnabled(b);
+        //mgui.actions[TGUIAction.ACT_MODEL_CHECKING].setEnabled(b);
 
     }
 
@@ -130,12 +129,13 @@ public class FaultTreeDiagramToolbar extends TToolBar {
         button = this.add(mgui.actions[TGUIAction.FTD_FAULT_CONNECTOR]);
         button.addMouseListener(mgui.mouseHandler);
 
-	this.addSeparator();
-	button = this.add(mgui.actions[TGUIAction.FTD_COUNTERMEASURE]);
+        this.addSeparator();
+        button = this.add(mgui.actions[TGUIAction.FTD_COUNTERMEASURE]);
         button.addMouseListener(mgui.mouseHandler);
-	button = this.add(mgui.actions[TGUIAction.FTD_COUNTERMEASURE_CONNECTOR]);
+
+        button = this.add(mgui.actions[TGUIAction.FTD_COUNTERMEASURE_CONNECTOR]);
         button.addMouseListener(mgui.mouseHandler);
-	
+
         this.addSeparator();
         this.addSeparator();
 
diff --git a/src/main/resources/ui/util/AndFT.png b/src/main/resources/ui/util/AndFT.png
index 7788cb863fca328ffebd3f69551893a2037b3d0f..2b8c1526f2eca2938d282af11300374acd002ae4 100644
Binary files a/src/main/resources/ui/util/AndFT.png and b/src/main/resources/ui/util/AndFT.png differ
diff --git a/src/main/resources/ui/util/OrFT.png b/src/main/resources/ui/util/OrFT.png
index 33778869ea1269a9390e512cce0b8a6c36059ae2..65aac3b7b5335df4f94c78d76c7c5965fad8c0b3 100644
Binary files a/src/main/resources/ui/util/OrFT.png and b/src/main/resources/ui/util/OrFT.png differ