diff --git a/javacode/README.txt b/javacode/README.txt
index 3c6b1f351dc6857b3f13dacfdbbcdb5de6487a0c..ba5f20f231109c14cab91956a61cd38c3a14dded 100644
--- a/javacode/README.txt
+++ b/javacode/README.txt
@@ -1,3 +1,5 @@
+#Java code generated from TURTLE models
+
 To compile the jttool package, do as follows:
 * go into the jttool directory, and type: javac*.java
-* go up one directory, and do rmic jttool.Transfer
\ No newline at end of file
+* go up one directory, and do rmic jttool.Transfer
diff --git a/src/ui/IconManager.java b/src/ui/IconManager.java
index 8b62baf0315180c67d6e19d7cead1e7ac14d9402..a6df6cfd77e061144dc91a020fe49a5d79a74071 100755
--- a/src/ui/IconManager.java
+++ b/src/ui/IconManager.java
@@ -116,7 +116,7 @@ public class IconManager {
 
     // Attack Tree Diagrams
     public static ImageIcon imgic1070, imgic1072, imgic1074, imgic1076, imgic1078;
-    public static ImageIcon imgic1080, imgic1082;
+    public static ImageIcon imgic1080, imgic1082, imgic1084;
 
     // TMLDD
     public static ImageIcon imgic1100, imgic1102, imgic1104, imgic1106, imgic1108;
@@ -473,6 +473,7 @@ public class IconManager {
     private static String icon1078 = "images/atdcons.gif";
     private static String icon1080 = "images/atdlink.gif";
     private static String icon1082 = "images/atdcountermeasure.gif";
+    private static String icon1084 = "images/atdcountermeasureconnector.gif";
 
     // DIPLODOCUS architecture
     private static String icon1100 = "images/tmlcpunode.gif";
@@ -891,6 +892,7 @@ public class IconManager {
         imgic1078 = getIcon(icon1078);
         imgic1080 = getIcon(icon1080);
 	imgic1082 = getIcon(icon1082);
+	imgic1084 = getIcon(icon1084);
 
         imgic1100 = getIcon(icon1100);
         imgic1102 = getIcon(icon1102);
diff --git a/src/ui/TGUIAction.java b/src/ui/TGUIAction.java
index 3bd0639fd1191eff9389278500cb9468c589711b..aaa242d176c3007ebd6e2633a7f3fb5dd071ce97 100755
--- a/src/ui/TGUIAction.java
+++ b/src/ui/TGUIAction.java
@@ -1076,7 +1076,7 @@ public class TGUIAction extends AbstractAction {
         actions[ATD_COMPOSITION_CONNECTOR] = new TAction("atd-composition-connector", "Add a composition connector between blocks", IconManager.imgic1076, IconManager.imgic1076, "Composition connector", "Add a composition between blocks of the currently opened attack tree diagram", 0);
         actions[ATD_CONSTRAINT] = new TAction("atd-constraint", "Add an constraint", IconManager.imgic1078, IconManager.imgic1078, "Constraint", "Add a constraint to the currently opened attack tree diagram", 0);
 	actions[ATD_COUNTERMEASURE] = new TAction("atd-countermeasure", "Add a countermeasure", IconManager.imgic1082, IconManager.imgic1082, "Countermeasure", "Add a countermeasure to the currently opened attack tree diagram", 0);
-	actions[ATD_COUNTERMEASURE_CONNECTOR] = new TAction("atd-countermeasure-connector", "Add a connector between attacks / countermeasures", IconManager.imgic1080, IconManager.imgic1080, "Connector", "Add a connector between attacks / countermeasures of the currently opened attack tree diagram", 0);
+	actions[ATD_COUNTERMEASURE_CONNECTOR] = new TAction("atd-countermeasure-connector", "Add a connector between attacks / countermeasures", IconManager.imgic1084, IconManager.imgic1084, "Connect countermeasure", "Add a connector between attacks / countermeasures of the currently opened attack tree diagram", 0);
 
         // TURTLE-OS
         actions[TOS_TCLASS] = new TAction("add-tclass-os", "Add Tclass", IconManager.imgic104, IconManager.imgic104, "Tclass", "Add a TClass to the currently opened class diagram", 0);
diff --git a/src/ui/atd/ATDCountermeasure.java b/src/ui/atd/ATDCountermeasure.java
index ef5453f665d9ceddd17148ca9737471d8366c2e5..30625f1e8cdd347b24894036b5c4aaeed57274cf 100755
--- a/src/ui/atd/ATDCountermeasure.java
+++ b/src/ui/atd/ATDCountermeasure.java
@@ -67,6 +67,8 @@ public class ATDCountermeasure extends TGCScalableWithInternalComponent implemen
     protected String description = "";
     private String stereotype = "countermeasure";
 
+    private static int decPar = 20;
+    
     private static int maxFontSize = 14;
     private static int minFontSize = 4;
     private int currentFontSize = -1;
@@ -137,8 +139,9 @@ public class ATDCountermeasure extends TGCScalableWithInternalComponent implemen
                 setValue(value, g);
             }
         }
-        // Core of the attack
+        // Core of the countermeasure
         Color c = g.getColor();
+	Polygon p = new Polygon();
         g.draw3DRect(x, y, width, height, true);
 	g.setColor(ColorManager.ATD_COUNTERMEASURE);
 	
diff --git a/src/ui/images/atdcountermeasureconnector.gif b/src/ui/images/atdcountermeasureconnector.gif
new file mode 100644
index 0000000000000000000000000000000000000000..6e3dd40e04fb457ada621eb78a82a02f1cf54edc
Binary files /dev/null and b/src/ui/images/atdcountermeasureconnector.gif differ
diff --git a/src/ui/images/atdlink.gif b/src/ui/images/atdlink.gif
index 4099aca5da034a2471616a6092606e01b8ffde5e..fa8332a042ac60884c290e2f3db3915a353fad47 100644
Binary files a/src/ui/images/atdlink.gif and b/src/ui/images/atdlink.gif differ