diff --git a/wise-webapp/src/main/webapp/css/mindmapList.less b/wise-webapp/src/main/webapp/css/mindmapList.less
index 75b090ba..02d4c859 100644
--- a/wise-webapp/src/main/webapp/css/mindmapList.less
+++ b/wise-webapp/src/main/webapp/css/mindmapList.less
@@ -363,6 +363,8 @@ abbr[title] {
   white-space: nowrap;
 }
 
+/* ----------------------------- Icons ----------------------------------- */
+
 #defaultIcon {
   background: #eee;
   border: 1px solid #ccc !important;
@@ -376,10 +378,6 @@ abbr[title] {
   background-color: #C8C8C8;
 }
 
-.bs-glyphicons {
-  width: 800%;
-}
-
 .bs-glyphicons > ul {
   padding-left: 10px;
   overflow-x: hidden;
@@ -388,7 +386,7 @@ abbr[title] {
 .bs-glyphicons > ul > li {
   float: left;
   width: 12%;
-  height: 25%;
+  height: 20%;
   padding: 10px;
   font-size: 10px;
   line-height: 1.4;
diff --git a/wise-webapp/src/main/webapp/js/mindmapList.js b/wise-webapp/src/main/webapp/js/mindmapList.js
index 70867cb9..5f4dd119 100644
--- a/wise-webapp/src/main/webapp/js/mindmapList.js
+++ b/wise-webapp/src/main/webapp/js/mindmapList.js
@@ -306,6 +306,11 @@ $(function () {
                     }
                 }
             });
+            // Setting sizes to label icon list
+            var dropDownHeight = $(window).height()/3;
+            $("#labelIconItems ul").height(dropDownHeight);
+            var dropDownWidth = $(window).width()/3;
+            $("#labelIconItems ul").width(dropDownWidth);
         }
     );
 
@@ -621,9 +626,10 @@ function prepareLabelList(labels) {
     //append items to dropdown
     $.each(labels, function(index, value) {
         labelList.append(
-            $('<li class="chooseLabel"></li>').attr('value', value.id).attr('color', value.color)
+            $('<li class="chooseLabel"></li>').attr('value', value.id).attr('color', value.color).attr('icon', value.icon)
                 .append(
                     '<a href="#" onclick="return false">' +
+                        "<div class='labelIcon " + value.icon + "'></div>" +
                         "<div class='labelColor' style='background: " +  value.color + "'></div>" +
                         "<div class='labelName'>" + value.title + "</div>" +
                         '</a>')
diff --git a/wise-webapp/src/main/webapp/jsp/mindmapList.jsp b/wise-webapp/src/main/webapp/jsp/mindmapList.jsp
index 39df6061..ca4b429a 100644
--- a/wise-webapp/src/main/webapp/jsp/mindmapList.jsp
+++ b/wise-webapp/src/main/webapp/jsp/mindmapList.jsp
@@ -360,7 +360,7 @@
                                             <i class="glyphicon glyphicon-tag"></i>
                                         </div>
                                         <div id="labelIconList" class="dropdown-menu bs-glyphicons"></div>
-                                        <div class="dropdown-menu bs-glyphicons">
+                                        <div id="labelIconItems" class="dropdown-menu bs-glyphicons">
                                             <ul class="bs-glyphicons-list">
                                                 <li class="glyphicon glyphicon-asterisk"></li>
                                                 <li class="glyphicon glyphicon-plus"></li>