diff --git a/include/group.php b/include/group.php
index e3c7d33d4..084cddcac 100644
--- a/include/group.php
+++ b/include/group.php
@@ -188,7 +188,7 @@ EOT;
 			$selected = (($group_id == $rr['id']) ? ' group-selected' : '');
 			$o .= '	<li class="sidebar-group-li">' 
 			. (($edit) ? "<a href=\"group/{$rr['id']}\" title=\"" . t('Edit') 
-				. "\" class=\"groupsideedit\" ><img src=\"images/spencil.gif\" alt=\"" . t('Edit') . "\"></a> " : "") 
+				. "\" class=\"groupsideedit\" ><span class=\"icon small-pencil\"></span></a> " : "") 
 			. (($cid) ? '<input type="checkbox" class="' . (($selected) ? 'ticked' : 'unticked') . '" onclick="contactgroupChangeMember(' . $rr['id'] . ',' . $cid . ');return true;" '
 				. ((in_array($rr['id'],$member_of)) ? ' checked="checked" ' : '') . '/>' : '')
 			. "<a href=\"$each/{$rr['id']}\" class=\"sidebar-group-element" . $selected ."\"  >{$rr['name']}</a></li>\r\n";
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index f1f217059..98b8cd43e 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -1788,6 +1788,12 @@ a.mail-list-link {
 	list-style-type: none;
 }
 
+#sidebar-group-list .icon {
+	display: inline-block;
+	height: 12px;
+	width: 12px;
+}
+
 #sidebar-group-list li {
 	margin-top: 10px;
 }
diff --git a/view/theme/loozah/style.css b/view/theme/loozah/style.css
index c978e140a..222edc166 100644
--- a/view/theme/loozah/style.css
+++ b/view/theme/loozah/style.css
@@ -1878,6 +1878,11 @@ a.mail-list-link {
 	margin-top: 10px;
 }
 
+#sidebar-group-list .icon {
+	display: inline-block;
+	height: 12px;
+	width: 12px;
+}
 
 #search-save {
     margin-left: 5px;
diff --git a/view/theme/testbubble/style.css b/view/theme/testbubble/style.css
index bce4a9c71..56af0dcda 100644
--- a/view/theme/testbubble/style.css
+++ b/view/theme/testbubble/style.css
@@ -615,6 +615,7 @@ h3#search:before {
 	text-align: center;
 }
 
+
 #sidebar-new-group:hover {
 	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) );
 	background:-moz-linear-gradient( center top, #b20202 5%, #d60808 100% );
@@ -627,6 +628,25 @@ h3#search:before {
 	top:1px;
 }
 
+.group-selected {
+	padding-bottom: 0px;
+	padding-left: 2px;
+	padding-right: 2px;
+	-moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
+	-webkit-box-shadow:inset 0px 1px 0px 0px #cfcfcf;
+	box-shadow:inset 0px 1px 0px 0px #cfcfcf;
+	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) );
+	background:-moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% );
+	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2');
+	background-color:#bdbdbd;
+	-moz-border-radius:5px;
+	-webkit-border-radius:5px;
+	border-radius:5px;
+	display:inline-block;
+	color:#efefef;
+	text-decoration:none;
+}
+
 #sidebar-new-group a {
 	color: #efefef;
 	font-size: 14px;
@@ -640,8 +660,10 @@ ul .sidebar-group-li{
 	padding-bottom: 5px;
 }
 
-ul .sidebar-group-li img{
-	display: none;
+ul .sidebar-group-li .icon{
+	display: inline-block;
+	height: 12px;
+	width: 12px;
 }
 
 .widget h3{