diff --git a/view/de/jot.tpl b/view/de/jot.tpl
index d86d8f8470..545bbdadd2 100644
--- a/view/de/jot.tpl
+++ b/view/de/jot.tpl
@@ -13,10 +13,6 @@
 		<input type="hidden" name="location" id="jot-location" value="$defloc" />
 		<input type="hidden" name="coord" id="jot-coord" value="" />
 
-<div id="profile-jot-plugin-wrapper" >
-	$jotplugins
-</div>
-<div id="profile-jot-plugin-end"></div>
 
 		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" ></textarea>
 
@@ -37,6 +33,12 @@
 	<div id="profile-nolocation-wrapper" style="display: none;" >
 		<img id="profile-nolocation" src="images/noglobe.gif" alt="Browser Standort leeren" title="Browser Standort leeren" onclick="jotClearLocation();" />
 	</div> 
+
+	<div id="profile-jot-plugin-wrapper" >
+	$jotplugins
+	</div>
+
+
 	<div id="profile-rotator-wrapper" style="display: $visitor;" >
 		<img id="profile-rotator" src="images/rotator.gif" alt="Bitte warten" title="Bitte warten" style="display: none;" />
 	</div> 
diff --git a/view/en/jot.tpl b/view/en/jot.tpl
index d2a1014e72..5f99357780 100644
--- a/view/en/jot.tpl
+++ b/view/en/jot.tpl
@@ -15,10 +15,6 @@
 
 		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" ></textarea>
 
-<div id="profile-jot-plugin-wrapper" >
-  $jotplugins
-</div>
-<div id="profile-jot-plugin-end"></div>
 
 <div id="profile-jot-submit-wrapper" >
 <input type="submit" id="profile-jot-submit" name="submit" value="Share" />
@@ -37,6 +33,10 @@
 	<div id="profile-nolocation-wrapper" style="display: none;" >
 		<img id="profile-nolocation" src="images/noglobe.gif" alt="Clear Browser Location" title="Clear Browser Location" onclick="jotClearLocation();" />
 	</div> 
+	<div id="profile-jot-plugin-wrapper">
+  	$jotplugins
+	</div>
+
 	<div id="profile-rotator-wrapper" style="display: $visitor;" >
 		<img id="profile-rotator" src="images/rotator.gif" alt="Please wait" title="Please wait" style="display: none;" />
 	</div> 
diff --git a/view/fr/jot.tpl b/view/fr/jot.tpl
index 7c49d771da..720cb0d1bc 100644
--- a/view/fr/jot.tpl
+++ b/view/fr/jot.tpl
@@ -15,10 +15,6 @@
 
 		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" ></textarea>
 
-<div id="profile-jot-plugin-wrapper" >
-  $jotplugins
-</div>
-<div id="profile-jot-plugin-end"></div>
 
 
 <div id="profile-jot-submit-wrapper" >
@@ -38,6 +34,11 @@
 	<div id="profile-nolocation-wrapper" style="display: none;" >
 		<img id="profile-nolocation" src="images/noglobe.gif" alt="Clear Browser Location" title="Clear Browser Location" onclick="jotClearLocation();" />
 	</div> 
+
+	<div id="profile-jot-plugin-wrapper" >
+  	$jotplugins
+	</div>
+
 	<div id="profile-rotator-wrapper" style="display: $visitor;" >
 		<img id="profile-rotator" src="images/rotator.gif" alt="Please wait" title="Please wait" style="display: none;" />
 	</div> 
diff --git a/view/it/jot.tpl b/view/it/jot.tpl
index 7153c341c7..eae3ecba8b 100644
--- a/view/it/jot.tpl
+++ b/view/it/jot.tpl
@@ -15,10 +15,6 @@
 
 		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" ></textarea>
 
-<div id="profile-jot-plugin-wrapper" >
-  $jotplugins
-</div>
-<div id="profile-jot-plugin-end"></div>
 
 <div id="profile-jot-submit-wrapper" >
 <input type="submit" id="profile-jot-submit" name="submit" value="Condividi" />
@@ -37,6 +33,11 @@
 	<div id="profile-nolocation-wrapper" style="display: none;" >
 		<img id="profile-nolocation" src="images/noglobe.gif" alt="Cancella la tua posizione data dal browser" title="Cancella la tua posizione data dal browser" onclick="jotClearLocation();" />
 	</div> 
+
+	<div id="profile-jot-plugin-wrapper" >
+	$jotplugins
+	</div>
+
 	<div id="profile-rotator-wrapper" style="display: $visitor;" >
 		<img id="profile-rotator" src="images/rotator.gif" alt="Attendi" title="Attendi" style="display: none;" />
 	</div> 
diff --git a/view/theme/default/style.css b/view/theme/default/style.css
index ae45a42449..a60ea9db6d 100644
--- a/view/theme/default/style.css
+++ b/view/theme/default/style.css
@@ -2010,7 +2010,7 @@ a.mail-list-link {
 
 .tool-wrapper {
   float: left;
-  margin-left: 5px;
+  margin-left: 20px;
 }
 .tool-link {
   cursor: pointer;
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index d6a1744a6b..d27a894b76 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -1900,8 +1900,9 @@ a.mail-list-link {
 
 .tool-wrapper {
   float: left;
-  margin-left: 5px;
+  margin-left: 20px;
 }
+
 .tool-link {
   cursor: pointer;
 }