diff --git a/htconfig.php b/htconfig.php
index 63a40c8090..872572654a 100644
--- a/htconfig.php
+++ b/htconfig.php
@@ -69,7 +69,7 @@ $a->config['system']['rino_encrypt'] = true;
 
 // allowed themes (change this from admin panel after installation)
 
-$a->config['system']['allowed_themes'] = 'dispy,quattro,testbubble,vier,darkbubble,darkzero,duepuntozero,greenzero,purplezero,quattro-green,slackr,diabook,diabook-blue';
+$a->config['system']['allowed_themes'] = 'dispy,quattro,vier,darkzero,duepuntozero,greenzero,purplezero,slackr,diabook';
 
 // default system theme
 
diff --git a/include/conversation.php b/include/conversation.php
index 1b869b91e4..521b4623b8 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -553,6 +553,14 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 							'$myphoto' => $a->contact['thumb'],
 							'$comment' => t('Comment'),
 							'$submit' => t('Submit'),
+							'$edbold' => t('Bold'),
+							'$editalic' => t('Italic'),
+							'$eduline' => t('Underline'),
+							'$edquote' => t('Quote'),
+							'$edcode' => t('Code'),
+							'$edimg' => t('Image'),
+							'$edurl' => t('Link'),
+							'$edvideo' => t('Video'),
 							'$preview' => t('Preview'),
 							'$ww' => (($mode === 'network') ? $commentww : '')
 						));
diff --git a/view/theme/duepuntozero/bbedit.png b/view/theme/duepuntozero/bbedit.png
new file mode 100644
index 0000000000..b89f2f7a83
Binary files /dev/null and b/view/theme/duepuntozero/bbedit.png differ
diff --git a/view/theme/duepuntozero/comment_item.tpl b/view/theme/duepuntozero/comment_item.tpl
index 84b9597e85..ea24d95cc3 100755
--- a/view/theme/duepuntozero/comment_item.tpl
+++ b/view/theme/duepuntozero/comment_item.tpl
@@ -13,28 +13,28 @@
 				<div class="comment-edit-photo-end"></div>
 				<ul class="comment-edit-bb-$id">
 					<li><a class="editicon boldbb shadow"
-						style="cursor: pointer;"
+						style="cursor: pointer;" title="$edbold"
 						onclick="insertFormatting('$comment','b', $id);"></a></li>
 					<li><a class="editicon italicbb shadow"
-						style="cursor: pointer;"
+						style="cursor: pointer;" title="$editalic"
 						onclick="insertFormatting('$comment','i', $id);"></a></li>
 					<li><a class="editicon underlinebb shadow"
-						style="cursor: pointer;"
+						style="cursor: pointer;" title="$eduline"
 						onclick="insertFormatting('$comment','u', $id);"></a></li>
 					<li><a class="editicon quotebb shadow"
-						style="cursor: pointer;"
+						style="cursor: pointer;" title="$edquote"
 						onclick="insertFormatting('$comment','quote', $id);"></a></li>
 					<li><a class="editicon codebb shadow"
-						style="cursor: pointer;"
+						style="cursor: pointer;" title="$edcode"
 						onclick="insertFormatting('$comment','code', $id);"></a></li>
 					<li><a class="editicon imagebb shadow"
-						style="cursor: pointer;"
+						style="cursor: pointer;" title="$edimg"
 						onclick="insertFormatting('$comment','img', $id);"></a></li>
 					<li><a class="editicon urlbb shadow"
-						style="cursor: pointer;"
+						style="cursor: pointer;" title="$edurl"
 						onclick="insertFormatting('$comment','url', $id);"></a></li>
 					<li><a class="editicon videobb shadow"
-						style="cursor: pointer;"
+						style="cursor: pointer;" title="$edvideo"
 						onclick="insertFormatting('$comment','video', $id);"></a></li>
 				</ul>	
 				<div class="comment-edit-bb-end"></div>
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index 0429ba5f06..2667c4334a 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -2956,62 +2956,62 @@ aside input[type='text'] {
 }
 .editicon {
     display: inline-block;
-    width: 21px;
-    height: 21px;
-    background: url(editicons.png) no-repeat;
-    border: 0;
+    width: 16px;
+    height: 16px;
+    background-image: url(bbedit.png);
+	background-color: #fff;
     text-decoration: none;
 }
 .editicon:hover {
-	border: 0;
+	background-color: #ccc;
 }
 .boldbb {
 	background-position: 0px 0px;
 }
 .boldbb:hover {
-	background-position: -22px 0px;
+	background-position: 0px -16px;
 }
 .italicbb {
-	background-position: 0px -22px;
+	background-position: -16px 0px;
 }
 .italicbb:hover {
-	background-position: -22px -22px;
+	background-position: -16px -16px;
 }
 .underlinebb {
-	background-position: 0px -44px;
+	background-position: -32px 0px;
 }
 .underlinebb:hover {
-	background-position: -22px -44px;
+	background-position: -32px -16px;
 }
 .quotebb {
-	background-position: 0px -66px;
+	background-position: -48px 0px;
 }
 .quotebb:hover {
-	background-position: -22px -66px;
+	background-position: -48px -16px;
 }
 .codebb {
-	background-position: 0px -88px;
+	background-position: -64px 0px;
 }
 .codebb:hover {
-	background-position: -22px -88px;
+	background-position: -64px -16px;
 }
 .imagebb {
-	background-position: -44px 0px;
+	background-position: -80px 0px;
 }
 .imagebb:hover {
-	background-position: -66px 0px;
+	background-position: -80px -16px;
 }
 .urlbb {
-	background-position: -44px -22px;
+	background-position: -96px 0px;
 }
 .urlbb:hover {
-	background-position: -66px -22px;
+	background-position: -96px -16px;
 }
 .videobb {
-	background-position: -44px -44px;
+	background-position: -112px 0px;
 }
 .videobb:hover {
-	background-position: -66px -44px;
+	background-position: -112px -16px;
 }
 
 .attachtype {