3 files changed, 36 insertions, 14 deletions
diff --git a/skins/larry/addressbook.css b/skins/larry/addressbook.css
index 54a14da0b..8e17d77f7 100644
--- a/skins/larry/addressbook.css
+++ b/skins/larry/addressbook.css
@@ -71,7 +71,6 @@
 	background-position: -100px 0;
 	background-repeat: no-repeat;
 	overflow: hidden;
-	padding-left: 36px;
 	text-overflow: ellipsis;
 }
 
@@ -83,21 +82,11 @@
 	background-position: 6px -791px;
 }
 
-#directorylist li.addressbook ul li:last-child {
-	border-bottom: 0;
-}
-
-#directorylist li.addressbook ul.groups {
-	margin: 0;
-	padding: 0;
-}
-
 #directorylist li.addressbook ul.groups li {
 	width: 100%;
 }
 
 #directorylist li.contactgroup a {
-	padding-left: 62px;
 	background-position: 32px -1555px;
 }
 
diff --git a/skins/larry/styles.css b/skins/larry/styles.css
index 18ba49ae2..992243f71 100644
--- a/skins/larry/styles.css
+++ b/skins/larry/styles.css
@@ -1175,16 +1175,49 @@ ul.treelist li {
 	position: relative;
 }
 
+ul.treelist li ul {
+	margin: 0;
+	padding: 0;
+}
+
+ul.treelist li ul li:last-child {
+	border-bottom: 0;
+}
+
+ul.treelist li a {
+	display: block;
+	padding-left: 20px;
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
+
+ul.treelist li ul li a {
+	padding-left: 38px;
+}
+
+ul.treelist.iconized li a {
+	padding-left: 36px;
+}
+
+ul.treelist.iconized li ul li a {
+	padding-left: 62px;
+}
+
 ul.treelist li div.treetoggle {
 	position: absolute;
-	top: 13px;
-	left: 19px;
+	top: 7px;
+	left: 4px;
 	width: 13px;
 	height: 13px;
 	background: url(images/listicons.png) -3px -144px no-repeat;
 	cursor: pointer;
 }
 
+ul.treelist.iconized li div.treetoggle {
+	top: 13px;
+	left: 19px;
+}
+
 ul.treelist li div.treetoggle.expanded {
 	background-position: -3px -168px;
 }
diff --git a/skins/larry/templates/addressbook.html b/skins/larry/templates/addressbook.html
index 9f83853b2..ebdce51be 100644
--- a/skins/larry/templates/addressbook.html
+++ b/skins/larry/templates/addressbook.html
@@ -30,7 +30,7 @@
 <div id="directorylistbox" class="uibox listbox">
 <h2 id="directorylist-header" class="boxtitle"><roundcube:label name="groups" /></h2>
 <div id="directorylist-content" class="scroller withfooter">
-	<roundcube:object name="directorylist" id="directorylist" class="treelist listing" />
+	<roundcube:object name="directorylist" id="directorylist" class="treelist listing iconized" />
 </div>
 <div id="directorylist-footer" class="boxfooter">
 	<roundcube:button command="group-create" type="link" title="newcontactgroup" class="listbutton add disabled" classAct="listbutton add" innerClass="inner" content="+" /><roundcube:button name="groupoptions" id="groupoptionslink" type="link" title="moreactions" class="listbutton groupactions" onclick="UI.show_popup('groupoptions');return false" innerClass="inner" content="&#9881;" />