diff --git a/src/assets/images/friendlist/icons/icon_new_message.png b/src/assets/images/friendlist/icons/icon_new_message.png
deleted file mode 100644
index f7a31fa0..00000000
Binary files a/src/assets/images/friendlist/icons/icon_new_message.png and /dev/null differ
diff --git a/src/assets/images/friends/friends-spritesheet.png b/src/assets/images/friends/friends-spritesheet.png
new file mode 100644
index 00000000..aa72325d
Binary files /dev/null and b/src/assets/images/friends/friends-spritesheet.png differ
diff --git a/src/assets/images/icons/accept.png b/src/assets/images/friends/icon-accept.png
similarity index 100%
rename from src/assets/images/icons/accept.png
rename to src/assets/images/friends/icon-accept.png
diff --git a/src/assets/images/friends/icon-add.png b/src/assets/images/friends/icon-add.png
new file mode 100644
index 00000000..d570c8f5
Binary files /dev/null and b/src/assets/images/friends/icon-add.png differ
diff --git a/src/assets/images/profile/icons/bobba.png b/src/assets/images/friends/icon-bobba.png
similarity index 100%
rename from src/assets/images/profile/icons/bobba.png
rename to src/assets/images/friends/icon-bobba.png
diff --git a/src/assets/images/friendlist/icons/icon_chat.png b/src/assets/images/friends/icon-chat.png
similarity index 100%
rename from src/assets/images/friendlist/icons/icon_chat.png
rename to src/assets/images/friends/icon-chat.png
diff --git a/src/assets/images/icons/deny.png b/src/assets/images/friends/icon-deny.png
similarity index 100%
rename from src/assets/images/icons/deny.png
rename to src/assets/images/friends/icon-deny.png
diff --git a/src/assets/images/friendlist/icons/icon_follow.png b/src/assets/images/friends/icon-follow.png
similarity index 100%
rename from src/assets/images/friendlist/icons/icon_follow.png
rename to src/assets/images/friends/icon-follow.png
diff --git a/src/assets/images/toolbar/icons/friend-bar/chat.png b/src/assets/images/friends/icon-friendbar-chat.png
similarity index 100%
rename from src/assets/images/toolbar/icons/friend-bar/chat.png
rename to src/assets/images/friends/icon-friendbar-chat.png
diff --git a/src/assets/images/toolbar/icons/friend-bar/visit.png b/src/assets/images/friends/icon-friendbar-visit.png
similarity index 100%
rename from src/assets/images/toolbar/icons/friend-bar/visit.png
rename to src/assets/images/friends/icon-friendbar-visit.png
diff --git a/src/assets/images/profile/icons/heart.png b/src/assets/images/friends/icon-heart.png
similarity index 100%
rename from src/assets/images/profile/icons/heart.png
rename to src/assets/images/friends/icon-heart.png
diff --git a/src/assets/images/friends/icon-new-message.png b/src/assets/images/friends/icon-new-message.png
new file mode 100644
index 00000000..46d23f5a
Binary files /dev/null and b/src/assets/images/friends/icon-new-message.png differ
diff --git a/src/assets/images/friendlist/icons/icon_relationship_none.png b/src/assets/images/friends/icon-none.png
similarity index 100%
rename from src/assets/images/friendlist/icons/icon_relationship_none.png
rename to src/assets/images/friends/icon-none.png
diff --git a/src/assets/images/icons/user-profile-hover.png b/src/assets/images/friends/icon-profile-sm-hover.png
similarity index 100%
rename from src/assets/images/icons/user-profile-hover.png
rename to src/assets/images/friends/icon-profile-sm-hover.png
diff --git a/src/assets/images/icons/user-profile.png b/src/assets/images/friends/icon-profile-sm.png
similarity index 100%
rename from src/assets/images/icons/user-profile.png
rename to src/assets/images/friends/icon-profile-sm.png
diff --git a/src/assets/images/toolbar/icons/friend-bar/profile.png b/src/assets/images/friends/icon-profile.png
similarity index 100%
rename from src/assets/images/toolbar/icons/friend-bar/profile.png
rename to src/assets/images/friends/icon-profile.png
diff --git a/src/assets/images/profile/icons/smile.png b/src/assets/images/friends/icon-smile.png
similarity index 100%
rename from src/assets/images/profile/icons/smile.png
rename to src/assets/images/friends/icon-smile.png
diff --git a/src/assets/images/friendlist/icons/icon_warning.png b/src/assets/images/friends/icon-warning.png
similarity index 100%
rename from src/assets/images/friendlist/icons/icon_warning.png
rename to src/assets/images/friends/icon-warning.png
diff --git a/src/assets/styles/icons.scss b/src/assets/styles/icons.scss
index 87fd77ce..a53d7b2b 100644
--- a/src/assets/styles/icons.scss
+++ b/src/assets/styles/icons.scss
@@ -159,18 +159,6 @@
         }
     }
 
-    &.icon-deny {
-        background: url("../images/icons/deny.png");
-        width: 13px;
-        height: 14px;
-    }
-
-    &.icon-accept {
-        background: url("../images/icons/accept.png");
-        width: 13px;
-        height: 14px;
-    }
-
     &.icon-wired-trigger {
         background-image: url("../images/wired/icon_trigger.png");
         width: 13px;
@@ -189,176 +177,6 @@
         height: 14px;
     }
 
-    &.arrow-left-icon {
-        background-image: url("../images/avatareditor/arrow-left-icon.png");
-        width: 28px;
-        height: 21px;
-    }
-
-    &.arrow-right-icon {
-        background-image: url("../images/avatareditor/arrow-right-icon.png");
-        width: 28px;
-        height: 21px;
-    }
-
-    &.clear-icon {
-        background-image: url("../images/avatareditor/clear-icon.png");
-        width: 27px;
-        height: 27px;
-    }
-
-    &.ca-icon {
-        background-image: url("../images/avatareditor/ca-icon.png");
-        width: 25px;
-        height: 25px;
-
-        &.selected {
-            background-image: url("../images/avatareditor/ca-selected-icon.png");
-        }
-    }
-
-    &.cc-icon {
-        background-image: url("../images/avatareditor/cc-icon.png");
-        width: 31px;
-        height: 29px;
-
-        &.selected {
-            background-image: url("../images/avatareditor/cc-selected-icon.png");
-        }
-    }
-
-    &.ch-icon {
-        background-image: url("../images/avatareditor/ch-icon.png");
-        width: 29px;
-        height: 24px;
-
-        &.selected {
-            background-image: url("../images/avatareditor/ch-selected-icon.png");
-        }
-    }
-
-    &.cp-icon {
-        background-image: url("../images/avatareditor/cp-icon.png");
-        width: 30px;
-        height: 24px;
-
-        &.selected {
-            background-image: url("../images/avatareditor/cp-selected-icon.png");
-        }
-    }
-
-    &.ea-icon {
-        background-image: url("../images/avatareditor/ea-icon.png");
-        width: 35px;
-        height: 16px;
-
-        &.selected {
-            background-image: url("../images/avatareditor/ea-selected-icon.png");
-        }
-    }
-
-    &.fa-icon {
-        background-image: url("../images/avatareditor/fa-icon.png");
-        width: 27px;
-        height: 20px;
-
-        &.selected {
-            background-image: url("../images/avatareditor/fa-selected-icon.png");
-        }
-    }
-
-    &.female-icon {
-        background-image: url("../images/avatareditor/female-icon.png");
-        width: 18px;
-        height: 27px;
-
-        &.selected {
-            background-image: url("../images/avatareditor/female-selected-icon.png");
-        }
-    }
-
-    &.ha-icon {
-        background-image: url("../images/avatareditor/ha-icon.png");
-        width: 25px;
-        height: 22px;
-
-        &.selected {
-            background-image: url("../images/avatareditor/ha-selected-icon.png");
-        }
-    }
-
-    &.he-icon {
-        background-image: url("../images/avatareditor/he-icon.png");
-        width: 31px;
-        height: 27px;
-
-        &.selected {
-            background-image: url("../images/avatareditor/he-selected-icon.png");
-        }
-    }
-
-    &.hr-icon {
-        background-image: url("../images/avatareditor/hr-icon.png");
-        width: 29px;
-        height: 25px;
-
-        &.selected {
-            background-image: url("../images/avatareditor/hr-selected-icon.png");
-        }
-    }
-
-    &.lg-icon {
-        background-image: url("../images/avatareditor/lg-icon.png");
-        width: 19px;
-        height: 20px;
-
-        &.selected {
-            background-image: url("../images/avatareditor/lg-selected-icon.png");
-        }
-    }
-
-    &.loading-icon {
-        background-image: url("../images/icons/loading-icon.png");
-        width: 17px;
-        height: 21px;
-    }
-
-    &.male-icon {
-        background-image: url("../images/avatareditor/male-icon.png");
-        width: 21px;
-        height: 21px;
-
-        &.selected {
-            background-image: url("../images/avatareditor/male-selected-icon.png");
-        }
-    }
-
-    &.sh-icon {
-        background-image: url("../images/avatareditor/sh-icon.png");
-        width: 37px;
-        height: 10px;
-
-        &.selected {
-            background-image: url("../images/avatareditor/sh-selected-icon.png");
-        }
-    }
-
-    &.wa-icon {
-        background-image: url("../images/avatareditor/wa-icon.png");
-        width: 36px;
-        height: 18px;
-
-        &.selected {
-            background-image: url("../images/avatareditor/wa-selected-icon.png");
-        }
-    }
-
-    &.sellable-icon {
-        background-image: url("../images/avatareditor/sellable-icon.png");
-        width: 17px;
-        height: 15px;
-    }
-
     &.chatstyles-icon {
         background-image: url("../images/chat/styles-icon.png");
         width: 17px;
@@ -491,12 +309,6 @@
         height: 15px;
     }
 
-    &.icon-fb-profile {
-        background: url("../images/toolbar/icons/friend-bar/profile.png");
-        width: 21px;
-        height: 21px;
-    }
-
     &.icon-camera-colormatrix {
         background: url("../images/icons/camera-colormatrix.png");
         width: 32px;
@@ -509,34 +321,6 @@
         height: 21px;
     }
 
-    &.icon-user-profile {
-        background: url("../images/icons/user-profile.png");
-        width: 13px;
-        height: 11px;
-
-        &:hover {
-            background: url("../images/icons/user-profile-hover.png");
-        }
-    }
-
-    &.icon-fb-profile {
-        background: url("../images/toolbar/icons/friend-bar/profile.png");
-        width: 21px;
-        height: 21px;
-    }
-
-    &.icon-fb-chat {
-        background: url("../images/toolbar/icons/friend-bar/chat.png");
-        width: 20px;
-        height: 21px;
-    }
-
-    &.icon-fb-visit {
-        background: url("../images/toolbar/icons/friend-bar/visit.png");
-        width: 21px;
-        height: 21px;
-    }
-
     &.icon-pf-online {
         background: url("../images/profile/icons/online.gif");
         width: 40px;
@@ -555,30 +339,6 @@
         height: 10px;
     }
 
-    &.icon-relationship-none {
-        background: url("../images/friendlist/icons/icon_relationship_none.png");
-        width: 16px;
-        height: 14px;
-    }
-
-    &.icon-relationship-heart {
-        background: url("../images/profile/icons/heart.png");
-        width: 16px;
-        height: 14px;
-    }
-
-    &.icon-relationship-bobba {
-        background: url("../images/profile/icons/bobba.png");
-        width: 16px;
-        height: 14px;
-    }
-
-    &.icon-relationship-smile {
-        background: url("../images/profile/icons/smile.png");
-        width: 16px;
-        height: 14px;
-    }
-
     &.icon-group-type-0 {
         background: url("../images/groups/icons/grouptype_icon_0.png");
         width: 16px;
@@ -681,18 +441,6 @@
         height: 11px;
     }
 
-    &.icon-friendlist-follow {
-        background: url("../images/friendlist/icons/icon_follow.png");
-        width: 16px;
-        height: 14px;
-    }
-
-    &.icon-friendlist-chat {
-        background: url("../images/friendlist/icons/icon_chat.png");
-        width: 17px;
-        height: 16px;
-    }
-
     &.icon-youtube-next {
         background: url("../images/room-widgets/youtube-widget/next.png");
         width: 21px;
@@ -704,17 +452,6 @@
         width: 21px;
         height: 16px;
     }
-    &.icon-friendlist-warning {
-        background: url("../images/friendlist/icons/icon_warning.png");
-        width: 23px;
-        height: 21px;
-    }
-
-    &.icon-friendlist-new-message {
-        background: url("../images/friendlist/icons/icon_new_message.png");
-        width: 14px;
-        height: 16px;
-    }
 
     &.icon-hc-banner {
         background: url("../images/catalog/hc_big.png");
diff --git a/src/assets/styles/utils.scss b/src/assets/styles/utils.scss
index e90775c4..0d186c72 100644
--- a/src/assets/styles/utils.scss
+++ b/src/assets/styles/utils.scss
@@ -74,3 +74,7 @@ ul {
 .flex-none {
     flex: none;
 }
+
+.z-index-1 {
+    z-index: 1;
+}