diff --git a/dashboard/divId/divIds.component.html b/dashboard/divId/divIds.component.html
index cfc596db..85f9565a 100644
--- a/dashboard/divId/divIds.component.html
+++ b/dashboard/divId/divIds.component.html
@@ -40,7 +40,7 @@
             </div>
           </div>
           <div>
-            <button class="uk-button uk-button-default uk-text-primary uk-flex uk-flex-middle" (click)="newDivId()">
+            <button class="uk-button uk-button-default uk-flex uk-flex-middle" (click)="newDivId()">
               <icon name="add" [flex]="true"></icon>
               <span class="uk-margin-small-left uk-text-bold uk-text-uppercase">Add class</span>
             </button>
@@ -79,7 +79,7 @@
           <td>
             <div class="actions" href="#">
               <icon class="clickable" name="edit" (click)="editDivId(i)"></icon>
-              <icon class="clickable uk-margin-small-left" [customClass]="'uk-text-danger'" name="remove" (click)="confirmDeleteDivId(check.divId._id)"></icon>
+              <icon class="clickable uk-margin-small-left" [customClass]="'uk-text-danger'" name="delete" (click)="confirmDeleteDivId(check.divId._id)"></icon>
             </div>
           </td>
         </tr>
diff --git a/dashboard/divId/divIds.module.ts b/dashboard/divId/divIds.module.ts
index 24815b02..e379ded4 100644
--- a/dashboard/divId/divIds.module.ts
+++ b/dashboard/divId/divIds.module.ts
@@ -19,8 +19,6 @@ import {PageContentModule} from "../sharedComponents/page-content/page-content.m
 import {ClassesRoutingModule} from "./classes-routing.module";
 import {SearchInputModule} from "../../sharedComponents/search-input/search-input.module";
 import {IconsModule} from "../../utils/icons/icons.module";
-import {IconsService} from "../../utils/icons/icons.service";
-import {add, edit, remove} from "../../utils/icons/icons";
 import {LoadingModule} from "../../utils/loading/loading.module";
 
 @NgModule({
@@ -32,8 +30,4 @@ import {LoadingModule} from "../../utils/loading/loading.module";
     declarations: [DivIdsComponent],
     exports: [DivIdsComponent]
 })
-export class DivIdsModule {
-  constructor(private iconsService: IconsService) {
-    this.iconsService.registerIcons([add, edit, remove]);
-  }
-}
+export class DivIdsModule {}
diff --git a/dashboard/divhelpcontent/class-help-content-form.component.html b/dashboard/divhelpcontent/class-help-content-form.component.html
index fd8fe243..f636529d 100644
--- a/dashboard/divhelpcontent/class-help-content-form.component.html
+++ b/dashboard/divhelpcontent/class-help-content-form.component.html
@@ -4,7 +4,7 @@
       <a routerLink="../" [queryParams]=" {  'pageId': pageId  }"
          class="uk-text-secondary uk-text-uppercase uk-text-bold uk-text-small">
          <span class="uk-icon-button uk-icon small uk-button-secondary">
-            <icon name="arrow_left"></icon>
+            <icon name="west"></icon>
          </span>
         <span class="space">
           Go back to class help texts list
diff --git a/dashboard/divhelpcontent/class-help-content-form.module.ts b/dashboard/divhelpcontent/class-help-content-form.module.ts
index 1765f1fc..5f0bec5c 100644
--- a/dashboard/divhelpcontent/class-help-content-form.module.ts
+++ b/dashboard/divhelpcontent/class-help-content-form.module.ts
@@ -10,8 +10,6 @@ import { MatSlideToggleModule } from '@angular/material/slide-toggle';
 import {IconsModule} from '../../utils/icons/icons.module';
 import {RouterModule} from '@angular/router';
 import {LoadingModule} from '../../utils/loading/loading.module';
-import {IconsService} from '../../utils/icons/icons.service';
-import {arrow_left} from '../../utils/icons/icons';
 import {ClassContentFormComponent} from './class-help-content-form.component';
 import {ClassHelpContentFormRoutingModule} from './class-help-content-form-routing.module';
 import {PageContentModule} from '../sharedComponents/page-content/page-content.module';
@@ -27,8 +25,4 @@ import {PageContentModule} from '../sharedComponents/page-content/page-content.m
     ],
     exports: [ClassContentFormComponent]
 })
-export class ClassHelpContentFormModule {
-  constructor(private iconsService: IconsService) {
-    this.iconsService.registerIcons([arrow_left]);
-  }
-}
+export class ClassHelpContentFormModule {}
diff --git a/dashboard/divhelpcontent/class-help-contents.component.html b/dashboard/divhelpcontent/class-help-contents.component.html
index 80a78f09..9e5fc67d 100644
--- a/dashboard/divhelpcontent/class-help-contents.component.html
+++ b/dashboard/divhelpcontent/class-help-contents.component.html
@@ -17,7 +17,7 @@
       <div class="uk-grid uk-flex-middle uk-margin-top uk-margin-medium-bottom" uk-grid>
         <div>
           <a routerLink="../pages/" class="uk-button uk-button-link uk-text-uppercase uk-flex uk-flex-middle">
-            <icon name="arrow_left"></icon>
+            <icon name="west"></icon>
             <span class="uk-margin-small-left">Back to pages</span>
           </a>
         </div>
@@ -101,7 +101,7 @@
                     </button>
                     <button (click)="confirmDeletePageHelpContent(check.divHelpContent._id)"
                          class="uk-button action uk-margin-top uk-flex uk-flex-middle">
-                      <icon name="remove"></icon>
+                      <icon name="delete"></icon>
                       <span class="uk-margin-small-left">Delete</span>
                     </button>
                   </div>
diff --git a/dashboard/divhelpcontent/class-help-contents.module.ts b/dashboard/divhelpcontent/class-help-contents.module.ts
index 5ab74f17..8e350d1d 100644
--- a/dashboard/divhelpcontent/class-help-contents.module.ts
+++ b/dashboard/divhelpcontent/class-help-contents.module.ts
@@ -6,13 +6,11 @@ import {ConnectAdminLoginGuard} from '../../connect/communityGuard/connectAdminL
 import {FormsModule, ReactiveFormsModule} from '@angular/forms';
 import {AlertModalModule} from '../../utils/modal/alertModal.module';
 import {SafeHtmlPipeModule} from '../../utils/pipes/safeHTMLPipe.module';
-import { MatSlideToggleModule } from '@angular/material/slide-toggle';
+import {MatSlideToggleModule} from '@angular/material/slide-toggle';
 import {AdminToolServiceModule} from '../../services/adminToolService.module';
 import {InputModule} from '../../sharedComponents/input/input.module';
 import {SearchInputModule} from '../../sharedComponents/search-input/search-input.module';
 import {IconsModule} from '../../utils/icons/icons.module';
-import {IconsService} from '../../utils/icons/icons.service';
-import {add, arrow_left, edit, remove} from '../../utils/icons/icons';
 import {LoadingModule} from '../../utils/loading/loading.module';
 import {HTMLToStringPipeModule} from '../../utils/pipes/HTMLToStringPipe.module';
 import {ClassHelpContentsRoutingModule} from './class-help-contents-routing.module';
@@ -31,8 +29,4 @@ import {PageContentModule} from '../sharedComponents/page-content/page-content.m
     providers: [IsCommunity, ConnectAdminLoginGuard],
     exports: [ClassHelpContentsComponent]
 })
-export class ClassHelpContentsModule {
-  constructor(private iconsService: IconsService) {
-    this.iconsService.registerIcons([add, arrow_left, edit, remove])
-  }
-}
+export class ClassHelpContentsModule {}
diff --git a/dashboard/entity/entities.component.html b/dashboard/entity/entities.component.html
index e7c7face..65c0b4cf 100644
--- a/dashboard/entity/entities.component.html
+++ b/dashboard/entity/entities.component.html
@@ -31,7 +31,7 @@
 				<div class="uk-width-2-5@m uk-width-1-1 uk-flex uk-flex-center uk-flex-wrap uk-flex-middle uk-grid" uk-grid>
 					<div search-input [expandable]="true" [searchControl]="filterForm.get('keyword')" searchInputClass="outer" placeholder="Search entity" class="uk-width-expand"></div>
 					<div *ngIf="isPortalAdministrator">
-						<button class="uk-button uk-button-default uk-text-primary uk-flex uk-flex-middle" (click)="newEntity()">
+						<button class="uk-button uk-button-default uk-flex uk-flex-middle" (click)="newEntity()">
 							<icon name="add" [flex]="true"></icon>
 							<span class="uk-margin-small-left uk-text-bold uk-text-uppercase">Add entity</span>
 						</button>
@@ -97,7 +97,7 @@
           <td *ngIf="isPortalAdministrator">
             <div class="actions" href="#">
               <icon class="clickable" name="edit" (click)="editEntity(i)"></icon>
-              <icon class="clickable uk-margin-small-left" [customClass]="'uk-text-danger'" name="remove" (click)="confirmDeleteEntity(check.entity._id)"></icon>
+              <icon class="clickable uk-margin-small-left" [customClass]="'uk-text-danger'" name="delete" (click)="confirmDeleteEntity(check.entity._id)"></icon>
             </div>
           </td>
         </tr>
diff --git a/dashboard/entity/entities.module.ts b/dashboard/entity/entities.module.ts
index 69d8d4a4..3f253302 100644
--- a/dashboard/entity/entities.module.ts
+++ b/dashboard/entity/entities.module.ts
@@ -12,8 +12,6 @@ import {AdminTabsModule} from "../sharedComponents/admin-tabs/admin-tabs.module"
 import {EntitiesRoutingModule} from "./entities-routing.module";
 import {SearchInputModule} from "../../sharedComponents/search-input/search-input.module";
 import {IconsModule} from "../../utils/icons/icons.module";
-import {IconsService} from "../../utils/icons/icons.service";
-import {add, edit, remove} from "../../utils/icons/icons";
 import {LoadingModule} from "../../utils/loading/loading.module";
 
 @NgModule({
@@ -25,7 +23,4 @@ import {LoadingModule} from "../../utils/loading/loading.module";
     exports: [EntitiesComponent]
 })
 export class EntitiesModule {
-  constructor(private iconsService: IconsService) {
-    this.iconsService.registerIcons([add, edit, remove]);
-  }
 }
diff --git a/dashboard/helpTexts/page-help-content-form.component.html b/dashboard/helpTexts/page-help-content-form.component.html
index d7a4e68c..e5c3b93a 100644
--- a/dashboard/helpTexts/page-help-content-form.component.html
+++ b/dashboard/helpTexts/page-help-content-form.component.html
@@ -4,7 +4,7 @@
       <a routerLink="../" [queryParams]=" {  'pageId': pageId  }"
          class="uk-text-secondary uk-text-uppercase uk-text-bold uk-text-small">
          <span class="uk-icon-button uk-icon small uk-button-secondary">
-            <icon name="arrow_left"></icon>
+            <icon name="west"></icon>
          </span>
         <span class="space">
           Go back to page help texts list
diff --git a/dashboard/helpTexts/page-help-content-form.module.ts b/dashboard/helpTexts/page-help-content-form.module.ts
index dfad8378..243a11d7 100644
--- a/dashboard/helpTexts/page-help-content-form.module.ts
+++ b/dashboard/helpTexts/page-help-content-form.module.ts
@@ -1,4 +1,4 @@
-import { NgModule } from '@angular/core';
+import {NgModule} from '@angular/core';
 import {CommonModule} from '@angular/common';
 import {FormsModule, ReactiveFormsModule} from '@angular/forms';
 import {AlertModalModule} from '../../utils/modal/alertModal.module';
@@ -8,13 +8,11 @@ import {PageContentFormComponent} from './page-help-content-form.component';
 import {PageHelpContentFormRoutingModule} from './page-help-content-form-routing.module';
 import {AdminToolServiceModule} from '../../services/adminToolService.module';
 import {InputModule} from '../../sharedComponents/input/input.module';
-import { MatSlideToggleModule } from '@angular/material/slide-toggle';
+import {MatSlideToggleModule} from '@angular/material/slide-toggle';
 import {IconsModule} from '../../utils/icons/icons.module';
 import {PageContentModule} from '../sharedComponents/page-content/page-content.module';
 import {RouterModule} from '@angular/router';
 import {LoadingModule} from '../../utils/loading/loading.module';
-import {IconsService} from '../../utils/icons/icons.service';
-import {arrow_left} from '../../utils/icons/icons';
 
 @NgModule({
   imports: [
@@ -27,8 +25,4 @@ import {arrow_left} from '../../utils/icons/icons';
     ],
     exports: [PageContentFormComponent]
 })
-export class PageHelpContentFormModule {
-  constructor(private iconsService: IconsService) {
-    this.iconsService.registerIcons([arrow_left]);
-  }
-}
+export class PageHelpContentFormModule {}
diff --git a/dashboard/helpTexts/page-help-contents.component.html b/dashboard/helpTexts/page-help-contents.component.html
index 6758cf75..9de3c368 100644
--- a/dashboard/helpTexts/page-help-contents.component.html
+++ b/dashboard/helpTexts/page-help-contents.component.html
@@ -6,7 +6,7 @@
     <div class="uk-margin-top">
       <a routerLink="../pages/" class="uk-text-secondary uk-text-uppercase uk-text-bold uk-text-small">
          <span class="uk-icon-button small uk-icon uk-button-secondary">
-          <icon name="arrow_left"></icon>
+          <icon name="west"></icon>
          </span>
         <span class="space">
           Back to pages list
@@ -101,7 +101,7 @@
                         <span class="uk-margin-small-left">Edit</span>
                       </button>
                       <button (click)="confirmDeletePageHelpContent(check.pageHelpContent._id)" class="uk-button action uk-margin-top uk-flex uk-flex-middle">
-                        <icon name="remove"></icon>
+                        <icon name="delete"></icon>
                         <span class="uk-margin-small-left">Delete</span>
                       </button>
                     </div>
diff --git a/dashboard/helpTexts/page-help-contents.module.ts b/dashboard/helpTexts/page-help-contents.module.ts
index ad23dd57..10bc383f 100644
--- a/dashboard/helpTexts/page-help-contents.module.ts
+++ b/dashboard/helpTexts/page-help-contents.module.ts
@@ -5,15 +5,13 @@ import {FormsModule, ReactiveFormsModule} from '@angular/forms';
 import {AlertModalModule} from '../../utils/modal/alertModal.module';
 import {PageHelpContentsComponent} from './page-help-contents.component';
 import {SafeHtmlPipeModule} from '../../utils/pipes/safeHTMLPipe.module';
-import { MatSlideToggleModule } from '@angular/material/slide-toggle';
+import {MatSlideToggleModule} from '@angular/material/slide-toggle';
 import {AdminToolServiceModule} from '../../services/adminToolService.module';
 import {InputModule} from '../../sharedComponents/input/input.module';
 import {PageHelpContentsRoutingModule} from './page-help-contents-routing.module';
 import {PageContentModule} from '../sharedComponents/page-content/page-content.module';
 import {SearchInputModule} from '../../sharedComponents/search-input/search-input.module';
 import {IconsModule} from '../../utils/icons/icons.module';
-import {IconsService} from '../../utils/icons/icons.service';
-import {add, arrow_left, edit, remove} from '../../utils/icons/icons';
 import {LoadingModule} from '../../utils/loading/loading.module';
 import {HTMLToStringPipeModule} from '../../utils/pipes/HTMLToStringPipe.module';
 
@@ -28,8 +26,4 @@ import {HTMLToStringPipeModule} from '../../utils/pipes/HTMLToStringPipe.module'
     ],
     exports: [PageHelpContentsComponent]
 })
-export class PageHelpContentsModule {
-  constructor(private iconsService: IconsService) {
-    this.iconsService.registerIcons([add, arrow_left, edit, remove])
-  }
-}
+export class PageHelpContentsModule {}
diff --git a/dashboard/menu/menu.component.html b/dashboard/menu/menu.component.html
index 7ce22cb9..cc561703 100644
--- a/dashboard/menu/menu.component.html
+++ b/dashboard/menu/menu.component.html
@@ -96,7 +96,7 @@
                     </button>
                     <button class="uk-button action uk-margin-top uk-flex uk-flex-middle"
                          (click)="confirmDeleteMenuItem(child._id, true)">
-                      <icon name="remove"></icon>
+                      <icon name="delete"></icon>
                       <span class="uk-margin-small-left"> Delete</span>
                     </button>
                   </div>
diff --git a/dashboard/menu/menu.module.ts b/dashboard/menu/menu.module.ts
index a57d6f90..d32339c4 100644
--- a/dashboard/menu/menu.module.ts
+++ b/dashboard/menu/menu.module.ts
@@ -12,8 +12,6 @@ import {AdminTabsModule} from "../sharedComponents/admin-tabs/admin-tabs.module"
 import {MenuRoutingModule} from "./menu-routing.module";
 import {SearchInputModule} from "../../sharedComponents/search-input/search-input.module";
 import {IconsModule} from "../../utils/icons/icons.module";
-import {IconsService} from "../../utils/icons/icons.service";
-import {add, edit, remove} from "../../utils/icons/icons";
 import {LoadingModule} from "../../utils/loading/loading.module";
 
 @NgModule({
@@ -25,7 +23,4 @@ import {LoadingModule} from "../../utils/loading/loading.module";
     exports: [MenuComponent]
 })
 export class MenuModule {
-  constructor(private iconsService: IconsService) {
-    this.iconsService.registerIcons([add, edit, remove]);
-  }
 }
diff --git a/dashboard/page/pages.component.html b/dashboard/page/pages.component.html
index ef4c4209..a50e141e 100644
--- a/dashboard/page/pages.component.html
+++ b/dashboard/page/pages.component.html
@@ -29,7 +29,7 @@
 				<div class="uk-width-2-5@m uk-width-1-1 uk-flex uk-flex-center uk-flex-wrap uk-flex-middle uk-grid" uk-grid>
 					<div search-input [expandable]="true" [searchControl]="filterForm.get('keyword')" searchInputClass="outer" placeholder="Search page" class="uk-width-expand"></div>
 					<div *ngIf="isPortalAdministrator">
-						<button class="uk-button uk-button-default uk-text-primary uk-flex uk-flex-middle" (click)="newPage()">
+						<button class="uk-button uk-button-default uk-flex uk-flex-middle" (click)="newPage()">
 							<icon name="add" [flex]="true"></icon>
 							<span class="uk-margin-small-left uk-text-bold uk-text-uppercase">Add page</span>
 						</button>
@@ -123,7 +123,7 @@
 											<span class="uk-margin-small-left"> Edit</span>
 										</button>
 										<button class="uk-button action uk-margin-top uk-flex uk-flex-middle" (click)="confirmDeletePage(check.page._id)">
-											<icon name="remove"></icon>
+											<icon name="delete"></icon>
 											<span class="uk-margin-small-left"> Delete</span>
 										</button>
 									</div>
diff --git a/dashboard/page/pages.module.ts b/dashboard/page/pages.module.ts
index ba6a54a5..95366fe9 100644
--- a/dashboard/page/pages.module.ts
+++ b/dashboard/page/pages.module.ts
@@ -4,10 +4,10 @@ import {CommonModule} from '@angular/common';
 import {FormsModule, ReactiveFormsModule} from '@angular/forms';
 import {AlertModalModule} from '../../utils/modal/alertModal.module';
 import {PagesComponent} from './pages.component';
-import { MatAutocompleteModule } from '@angular/material/autocomplete';
-import { MatChipsModule } from '@angular/material/chips';
-import { MatFormFieldModule } from '@angular/material/form-field';
-import { MatSlideToggleModule } from '@angular/material/slide-toggle';
+import {MatAutocompleteModule} from '@angular/material/autocomplete';
+import {MatChipsModule} from '@angular/material/chips';
+import {MatFormFieldModule} from '@angular/material/form-field';
+import {MatSlideToggleModule} from '@angular/material/slide-toggle';
 import {AdminToolServiceModule} from "../../services/adminToolService.module";
 import {InputModule} from "../../sharedComponents/input/input.module";
 import {AdminTabsModule} from "../sharedComponents/admin-tabs/admin-tabs.module";
@@ -15,8 +15,6 @@ import {PageContentModule} from "../sharedComponents/page-content/page-content.m
 import {PagesRoutingModule} from "./pages-routing.module";
 import {SearchInputModule} from "../../sharedComponents/search-input/search-input.module";
 import {IconsModule} from "../../utils/icons/icons.module";
-import {IconsService} from "../../utils/icons/icons.service";
-import {add, edit, remove} from "../../utils/icons/icons";
 import {LoadingModule} from "../../utils/loading/loading.module";
 
 @NgModule({
@@ -28,7 +26,4 @@ import {LoadingModule} from "../../utils/loading/loading.module";
     exports: [PagesComponent]
 })
 export class PagesModule {
-  constructor(private iconsService: IconsService) {
-    this.iconsService.registerIcons([add, edit, remove]);
-  }
 }
diff --git a/dashboard/portal/portals.component.html b/dashboard/portal/portals.component.html
index 03f75b98..f364e494 100644
--- a/dashboard/portal/portals.component.html
+++ b/dashboard/portal/portals.component.html
@@ -41,7 +41,7 @@
             </div>
           </div>
           <div>
-            <button class="uk-button uk-button-default uk-text-primary uk-flex uk-flex-middle" (click)="newPortal()">
+            <button class="uk-button uk-button-default uk-flex uk-flex-middle" (click)="newPortal()">
               <icon name="add" [flex]="true"></icon>
               <span class="uk-margin-small-left uk-text-bold uk-text-uppercase">Add portal</span>
             </button>
@@ -71,7 +71,7 @@
           <td>
             <div class="actions" href="#">
               <icon class="clickable" name="edit" (click)="editPortal(i)"></icon>
-              <icon class="clickable uk-margin-small-left" [customClass]="'uk-text-danger'" name="remove" (click)="confirmDeletePortal(check.portal._id)"></icon>
+              <icon class="clickable uk-margin-small-left" [customClass]="'uk-text-danger'" name="delete" (click)="confirmDeletePortal(check.portal._id)"></icon>
             </div>
           </td>
 
diff --git a/dashboard/portal/portals.module.ts b/dashboard/portal/portals.module.ts
index 98f55248..3c6ff447 100644
--- a/dashboard/portal/portals.module.ts
+++ b/dashboard/portal/portals.module.ts
@@ -9,8 +9,6 @@ import {InputModule} from "../../sharedComponents/input/input.module";
 import {AdminTabsModule} from "../sharedComponents/admin-tabs/admin-tabs.module";
 import {PageContentModule} from "../sharedComponents/page-content/page-content.module";
 import {PortalsRoutingModule} from "./portals-routing.module";
-import {IconsService} from "../../utils/icons/icons.service";
-import {add, edit, remove} from "../../utils/icons/icons";
 import {IconsModule} from "../../utils/icons/icons.module";
 import {SearchInputModule} from "../../sharedComponents/search-input/search-input.module";
 import {LoadingModule} from "../../utils/loading/loading.module";
@@ -25,7 +23,4 @@ import {LoadingModule} from "../../utils/loading/loading.module";
   exports: [PortalsComponent]
 })
 export class PortalsModule {
-  constructor(private iconsService: IconsService) {
-    this.iconsService.registerIcons([add, edit, remove]);
-  }
 }
diff --git a/dashboard/sharedComponents/page-content/page-content.component.ts b/dashboard/sharedComponents/page-content/page-content.component.ts
index b71cc0b0..897a917b 100644
--- a/dashboard/sharedComponents/page-content/page-content.component.ts
+++ b/dashboard/sharedComponents/page-content/page-content.component.ts
@@ -7,12 +7,10 @@ declare var UIkit;
   selector: '[page-content]',
   template: `
     <div id="page_content">
-      <div id="header">
-        <div id="page_content_header" [attr.uk-sticky]="shouldSticky?'media: @m':null" [attr.offset]="offset">
-          <div class="uk-container uk-container-large uk-padding-remove-vertical">
-            <div class="uk-padding-small uk-padding-remove-vertical">
-              <ng-content select="[header]"></ng-content>
-            </div>
+      <div id="page_content_header" class="uk-display-block" [attr.uk-sticky]="shouldSticky?'media: @m':null" [attr.offset]="offset">
+        <div class="uk-container uk-container-large uk-padding-remove-vertical">
+          <div class="uk-padding-small uk-padding-remove-vertical">
+            <ng-content select="[header]"></ng-content>
           </div>
         </div>
       </div>
@@ -38,6 +36,7 @@ export class PageContentComponent implements OnInit, AfterViewInit, OnDestroy {
   
   ngOnInit() {
     if (typeof document !== "undefined") {
+      this.offset = Number.parseInt(getComputedStyle(document.documentElement).getPropertyValue('--structure-header-height'));
       this.initSticky();
     }
   }
@@ -58,7 +57,6 @@ export class PageContentComponent implements OnInit, AfterViewInit, OnDestroy {
   }
   
   initSticky() {
-    this.offset = Number.parseInt(getComputedStyle(document.documentElement).getPropertyValue('--structure-header-height'));
     this.clear();
     if(this.shouldSticky) {
       this.subscriptions.push(UIkit.util.on(document, 'active', '#page_content_header', () => {
diff --git a/dashboard/users/role-users/role-users.component.html b/dashboard/users/role-users/role-users.component.html
index 08a575a1..be3f468e 100644
--- a/dashboard/users/role-users/role-users.component.html
+++ b/dashboard/users/role-users/role-users.component.html
@@ -25,12 +25,12 @@
 						 [searchControl]="filterForm.get('pending')" [expandable]="true" [placeholder]="'Search invitations'" searchInputClass="outer">
 				</div>
 				<div>
-					<button *ngIf="exists" class="uk-button uk-button-default uk-text-primary uk-flex uk-flex-middle" [attr.uk-tooltip]="inviteDisableMessage"
+					<button *ngIf="exists" class="uk-button uk-button-default uk-flex uk-flex-middle" [attr.uk-tooltip]="inviteDisableMessage"
 									[disabled]="loadPending || !!inviteDisableMessage" (click)="openInviteModal()">
 						<icon name="person_add" [flex]="true" type="filled"></icon>
 						<span class="uk-margin-small-left uk-text-bold uk-text-uppercase">Invite {{role}}</span>
 					</button>
-					<button *ngIf="!exists && isPortalAdmin" class="uk-button uk-button-default uk-text-primary uk-flex uk-flex-middle"
+					<button *ngIf="!exists && isPortalAdmin" class="uk-button uk-button-default uk-flex uk-flex-middle"
 									(click)="openCreateRoleModal()">
 						<icon name="person_add" [flex]="true" type="filled"></icon>
 						<span class="uk-margin-small-left uk-text-bold uk-text-uppercase">Create Group</span>
diff --git a/dashboard/users/role-users/role-users.module.ts b/dashboard/users/role-users/role-users.module.ts
index e3502093..0005deaf 100644
--- a/dashboard/users/role-users/role-users.module.ts
+++ b/dashboard/users/role-users/role-users.module.ts
@@ -4,8 +4,6 @@ import {RoleUsersComponent} from './role-users.component';
 import {ReactiveFormsModule} from '@angular/forms';
 import {AlertModalModule} from "../../../utils/modal/alertModal.module";
 import {LoadingModule} from "../../../utils/loading/loading.module";
-import {IconsService} from "../../../utils/icons/icons.service";
-import {person_add, remove_circle_outline} from "../../../utils/icons/icons";
 import {IconsModule} from "../../../utils/icons/icons.module";
 import {InputModule} from "../../../sharedComponents/input/input.module";
 import {PageContentModule} from "../../sharedComponents/page-content/page-content.module";
@@ -19,8 +17,4 @@ import {SearchInputModule} from "../../../sharedComponents/search-input/search-i
   declarations: [RoleUsersComponent],
   exports: [RoleUsersComponent]
 })
-export class RoleUsersModule {
-  constructor(private iconsService: IconsService) {
-    this.iconsService.registerIcons([remove_circle_outline, person_add]);
-  }
-}
+export class RoleUsersModule {}
diff --git a/dashboard/users/subscribers/subscribers.module.ts b/dashboard/users/subscribers/subscribers.module.ts
index 3b5941c4..db17bb57 100644
--- a/dashboard/users/subscribers/subscribers.module.ts
+++ b/dashboard/users/subscribers/subscribers.module.ts
@@ -4,8 +4,6 @@ import {SubscribersComponent} from './subscribers.component';
 import {ReactiveFormsModule} from '@angular/forms';
 import {AlertModalModule} from "../../../utils/modal/alertModal.module";
 import {LoadingModule} from "../../../utils/loading/loading.module";
-import {IconsService} from "../../../utils/icons/icons.service";
-import {person_add, remove_circle_outline} from "../../../utils/icons/icons";
 import {IconsModule} from "../../../utils/icons/icons.module";
 import {InputModule} from "../../../sharedComponents/input/input.module";
 import {PageContentModule} from "../../sharedComponents/page-content/page-content.module";
@@ -19,8 +17,4 @@ import {SubscriberInviteModule} from "../../../sharedComponents/subscriber-invit
   declarations: [SubscribersComponent],
   exports: [SubscribersComponent]
 })
-export class SubscribersModule {
-  constructor(private iconsService: IconsService) {
-    this.iconsService.registerIcons([remove_circle_outline, person_add]);
-  }
-}
+export class SubscribersModule {}
diff --git a/notifications/notifications-sidebar/notifications-sidebar.component.ts b/notifications/notifications-sidebar/notifications-sidebar.component.ts
index 9e9aaeb2..890319aa 100644
--- a/notifications/notifications-sidebar/notifications-sidebar.component.ts
+++ b/notifications/notifications-sidebar/notifications-sidebar.component.ts
@@ -57,7 +57,7 @@ declare var UIkit;
         <div *ngIf="notification" class="notification">
           <div class="uk-flex uk-flex-middle uk-margin-medium-bottom">
             <span class="uk-text-secondary clickable" (click)="back($event)">
-              <icon ratio="1.5" name="arrow_left" visuallyHidden="back"></icon>
+              <icon ratio="1.5" name="west" visuallyHidden="back"></icon>
             </span>
             <h4 *ngIf="notification.title" class="uk-text-bold uk-margin-left">{{notification.title}}</h4>
           </div>
diff --git a/notifications/notifications-sidebar/notifications-sidebar.module.ts b/notifications/notifications-sidebar/notifications-sidebar.module.ts
index 98aa7f83..ed93eed7 100644
--- a/notifications/notifications-sidebar/notifications-sidebar.module.ts
+++ b/notifications/notifications-sidebar/notifications-sidebar.module.ts
@@ -2,8 +2,6 @@ import {NgModule} from "@angular/core";
 import {CommonModule} from "@angular/common";
 import {NotificationsSidebarComponent} from "./notifications-sidebar.component";
 import {IconsModule} from "../../utils/icons/icons.module";
-import {IconsService} from "../../utils/icons/icons.service";
-import {arrow_left, bullet, close, mail} from "../../utils/icons/icons";
 import {NotificationUserModule} from "../notification-user/notification-user.module";
 import {NotifyFormModule} from "../notify-form/notify-form.module";
 import {SafeHtmlPipeModule} from "../../utils/pipes/safeHTMLPipe.module";
@@ -13,6 +11,4 @@ import {SafeHtmlPipeModule} from "../../utils/pipes/safeHTMLPipe.module";
   declarations: [NotificationsSidebarComponent],
   exports: [NotificationsSidebarComponent]
 })
-export class NotificationsSidebarModule {
-  constructor() {}
-}
+export class NotificationsSidebarModule {}
diff --git a/utils/icons/icons-preview/icons-preview.component.ts b/utils/icons/icons-preview/icons-preview.component.ts
index e668948c..7737b71e 100644
--- a/utils/icons/icons-preview/icons-preview.component.ts
+++ b/utils/icons/icons-preview/icons-preview.component.ts
@@ -6,22 +6,6 @@ import {Component} from "@angular/core";
     <div class="uk-section uk-container uk-container-large" style="font-size: 14px;">
       <h4 class="uk-text-bold">Icons</h4>
       <div class="uk-grid uk-grid-small uk-child-width-1-6" uk-grid>
-        <div class="uk-text-center">
-          <icon name="arrow_left"></icon>
-          <div class="uk-text-bold uk-margin-small-top">arrow_left</div>
-        </div>
-        <div class="uk-text-center">
-          <icon name="arrow_right"></icon>
-          <div class="uk-text-bold uk-margin-small-top">arrow_right</div>
-        </div>
-        <div class="uk-text-center">
-          <icon name="arrow_up"></icon>
-          <div class="uk-text-bold uk-margin-small-top">arrow_up</div>
-        </div>
-        <div class="uk-text-center">
-          <icon name="arrow_down"></icon>
-          <div class="uk-text-bold uk-margin-small-top">arrow_down</div>
-        </div>
         <div class="uk-text-center">
           <icon name="book"></icon>
           <div class="uk-text-bold uk-margin-small-top">book</div>
@@ -39,88 +23,20 @@ import {Component} from "@angular/core";
           <div class="uk-text-bold uk-margin-small-top">earth</div>
         </div>
         <div class="uk-text-center">
-          <icon name="edit"></icon>
-          <div class="uk-text-bold uk-margin-small-top">edit</div>
+          <icon name="incognito"></icon>
+          <div class="uk-text-bold uk-margin-small-top">incognito</div>
         </div>
         <div class="uk-text-center">
-          <icon name="remove"></icon>
-          <div class="uk-text-bold uk-margin-small-top">remove</div>
+          <icon name="restricted"></icon>
+          <div class="uk-text-bold uk-margin-small-top">restricted</div>
         </div>
         <div class="uk-text-center">
-          <icon name="preview"></icon>
-          <div class="uk-text-bold uk-margin-small-top">preview</div>
+          <icon name="graph"></icon>
+          <div class="uk-text-bold uk-margin-small-top">graph</div>
         </div>
         <div class="uk-text-center">
-          <icon name="bullet"></icon>
-          <div class="uk-text-bold uk-margin-small-top">bullet</div>
-        </div>
-        <div class="uk-text-center">
-          <icon name="remove_circle"></icon>
-          <div class="uk-text-bold uk-margin-small-top">remove_circle</div>
-        </div>
-        <div class="uk-text-center">
-          <icon name="remove_circle_outline"></icon>
-          <div class="uk-text-bold uk-margin-small-top">remove_circle_outline</div>
-        </div>
-        <div class="uk-text-center">
-          <icon name="person_add"></icon>
-          <div class="uk-text-bold uk-margin-small-top">person_add</div>
-        </div>
-        <div class="uk-text-center">
-          <icon name="cloud_upload"></icon>
-          <div class="uk-text-bold uk-margin-small-top">cloud_upload</div>
-        </div>
-        <div class="uk-text-center">
-          <icon name="add"></icon>
-          <div class="uk-text-bold uk-margin-small-top">add</div>
-        </div>
-        <div class="uk-text-center">
-          <icon name="group"></icon>
-          <div class="uk-text-bold uk-margin-small-top">group</div>
-        </div>
-        <div class="uk-text-center">
-          <icon name="lock"></icon>
-          <div class="uk-text-bold uk-margin-small-top">lock</div>
-        </div>
-        <div class="uk-text-center">
-          <icon name="search"></icon>
-          <div class="uk-text-bold uk-margin-small-top">search</div>
-        </div>
-        <div class="uk-text-center">
-          <icon name="refresh"></icon>
-          <div class="uk-text-bold uk-margin-small-top">refresh</div>
-        </div>
-        <div class="uk-text-center">
-          <icon name="close"></icon>
-          <div class="uk-text-bold uk-margin-small-top">close</div>
-        </div>
-        <div class="uk-text-center">
-          <icon name="done"></icon>
-          <div class="uk-text-bold uk-margin-small-top">done</div>
-        </div>
-        <div class="uk-text-center">
-          <icon name="mail"></icon>
-          <div class="uk-text-bold uk-margin-small-top">mail</div>
-        </div>
-        <div class="uk-text-center">
-          <icon name="photo"></icon>
-          <div class="uk-text-bold uk-margin-small-top">photo</div>
-        </div>
-        <div class="uk-text-center">
-          <icon name="check_circle_outlined"></icon>
-          <div class="uk-text-bold uk-margin-small-top">check_circle_outlined</div>
-        </div>
-        <div class="uk-text-center">
-          <icon name="reset"></icon>
-          <div class="uk-text-bold uk-margin-small-top">reset</div>
-        </div>
-        <div class="uk-text-center">
-          <icon name="send"></icon>
-          <div class="uk-text-bold uk-margin-small-top">send</div>
-        </div>
-        <div class="uk-text-center">
-          <icon name="print"></icon>
-          <div class="uk-text-bold uk-margin-small-top">print</div>
+          <icon name="filters"></icon>
+          <div class="uk-text-bold uk-margin-small-top">filters</div>
         </div>
       </div>
       <div class="uk-margin-medium-top">
diff --git a/utils/icons/icons-preview/icons-preview.module.ts b/utils/icons/icons-preview/icons-preview.module.ts
index 45246007..d07afe3c 100644
--- a/utils/icons/icons-preview/icons-preview.module.ts
+++ b/utils/icons/icons-preview/icons-preview.module.ts
@@ -4,20 +4,7 @@ import {RouterModule} from "@angular/router";
 import {IconsPreviewComponent} from "./icons-preview.component";
 import {IconsService} from "../icons.service";
 import {IconsModule} from "../icons.module";
-import {
-  add,
-  arrow_down,
-  arrow_left,
-  arrow_right,
-  arrow_up,
-  book, bullet, check_circle_outlined, close, cloud_upload,
-  cog,
-  database, done,
-  earth,
-  edit, group, lock, mail, person_add, photo,
-  preview, print, refresh,
-  remove, remove_circle, remove_circle_outline, reset, search, send
-} from "../icons";
+import {book, cog, database, earth, filters, graph, incognito, restricted} from "../icons";
 
 @NgModule({
   imports: [CommonModule, RouterModule.forChild([
@@ -28,9 +15,6 @@ import {
 })
 export class IconsPreviewModule {
   constructor(private iconsService: IconsService) {
-    this.iconsService.registerIcons([arrow_left, arrow_right, arrow_up, arrow_down, book, database, cog, earth, edit,
-      remove, preview, bullet, remove_circle, remove_circle_outline, person_add, cloud_upload, add, group, lock, search,
-      refresh, close, done, mail, photo, check_circle_outlined, reset, send, print
-    ])
+    this.iconsService.registerIcons([book, database, cog, earth, incognito, restricted, graph, filters])
   }
 }
diff --git a/utils/icons/icons.ts b/utils/icons/icons.ts
index ffddc3d1..a62ec1b8 100644
--- a/utils/icons/icons.ts
+++ b/utils/icons/icons.ts
@@ -3,21 +3,25 @@ export interface Icon {
   data: string
 }
 
+/** @deprecated */
 export const arrow_left: Icon = {
   name: 'arrow_left',
   data: '<svg xmlns="http://www.w3.org/2000/svg" height="20" viewBox="0 0 24 24" width="20"><path d="M20 11H6.83l2.88-2.88c.39-.39.39-1.02 0-1.41-.39-.39-1.02-.39-1.41 0L3.71 11.3c-.39.39-.39 1.02 0 1.41L8.3 17.3c.39.39 1.02.39 1.41 0 .39-.39.39-1.02 0-1.41L6.83 13H20c.55 0 1-.45 1-1s-.45-1-1-1z"/></svg>'
 }
 
+/** @deprecated */
 export const arrow_right: Icon = {
   name: 'arrow_right',
   data: '<svg height="20" viewBox="0 0 16 16" width="20" xmlns="http://www.w3.org/2000/svg"><path d="M12.578,4.244,5.667,11.155V8.167A.833.833,0,1,0,4,8.167v5A.832.832,0,0,0,4.833,14h5a.833.833,0,0,0,0-1.667H6.845l6.911-6.911a.833.833,0,1,0-1.178-1.178h0Z" transform="translate(7.071 19.799) rotate(-135)"></path></svg>'
 };
 
+/** @deprecated */
 export const arrow_up: Icon = {
   name: 'arrow_up',
   data: '<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 17.155 17.155"><g transform="translate(0)"><path d="M10.405,11.834,2.022,3.451V7.076A1.011,1.011,0,0,1,0,7.076V1.011A1.009,1.009,0,0,1,1.011,0H7.076a1.011,1.011,0,1,1,0,2.022H3.451l8.383,8.383a1.011,1.011,0,1,1-1.429,1.429h0Z" transform="translate(8.578 0) rotate(45)"/></g></svg>'
 }
 
+/** @deprecated */
 export const arrow_down: Icon = {
   name: 'arrow_down',
   data: '<svg height="20" viewBox="0 0 17.155 17.155" width="20" xmlns="http://www.w3.org/2000/svg"><g transform="translate(-1221 -675)"><path d="M14.405,4.3,6.022,12.68V9.055A1.011,1.011,0,0,0,4,9.055V15.12a1.009,1.009,0,0,0,1.011,1.01h6.065a1.011,1.011,0,1,0,0-2.022H7.451l8.383-8.383A1.011,1.011,0,0,0,14.405,4.3h0Z" transform="translate(1215.343 683.578) rotate(-45)"></path></g></svg>'
@@ -43,112 +47,134 @@ export const earth: Icon = {
   data: '<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 30 30"><path id="earth" d="M15,0A15,15,0,1,0,30,15,15,15,0,0,0,15,0Zm0,28.125a13.086,13.086,0,0,1-5.192-1.068l6.831-7.685a.935.935,0,0,0,.237-.622V15.938A.938.938,0,0,0,15.938,15c-3.31,0-6.8-3.442-6.837-3.475a.937.937,0,0,0-.663-.275H4.688a.938.938,0,0,0-.937.937v5.625a.936.936,0,0,0,.518.838L7.5,20.267v5.5A13.132,13.132,0,0,1,3.14,9.375H6.563A.935.935,0,0,0,7.226,9.1l3.75-3.75a.937.937,0,0,0,.275-.663V2.42a13.164,13.164,0,0,1,9.5.779c-.122.1-.24.21-.353.323a5.626,5.626,0,0,0,3.974,9.6c.093,0,.186,0,.278-.007A22.007,22.007,0,0,1,24.4,24.027a.878.878,0,0,0-.024.153A13.084,13.084,0,0,1,15,28.125Z"/></svg>'
 }
 
+/** @deprecated */
 export const edit: Icon = {
   name: 'edit',
   data: '<svg xmlns="http://www.w3.org/2000/svg" height="20" viewBox="0 0 24 24" width="20"><path d="M0 0h24v24H0V0z" fill="none"/><path d="M3 17.46v3.04c0 .28.22.5.5.5h3.04c.13 0 .26-.05.35-.15L17.81 9.94l-3.75-3.75L3.15 17.1c-.1.1-.15.22-.15.36zM20.71 7.04c.39-.39.39-1.02 0-1.41l-2.34-2.34c-.39-.39-1.02-.39-1.41 0l-1.83 1.83 3.75 3.75 1.83-1.83z"/></svg>'
 }
 
+/** @deprecated */
 export const remove: Icon = {
   name: 'remove',
   data: '<svg xmlns="http://www.w3.org/2000/svg" height="20" width="20" viewBox="0 0 9.91 11.01"><g id="Layer_2" data-name="Layer 2"><g id="Layer_1-2" data-name="Layer 1"><path d="M8.83,1.85V9.41A1.58,1.58,0,0,1,7.26,11H2.62a1.6,1.6,0,0,1-1.57-1.6V1.85H.28A.26.26,0,0,1,0,1.57.27.27,0,0,1,.28,1.3H2.59v-1A.26.26,0,0,1,2.87,0H7a.28.28,0,0,1,.27.28v1H9.63a.28.28,0,0,1,.28.27.3.3,0,0,1-.28.28Zm-7.23,0V9.41a1,1,0,0,0,1,1.05H7.26a1,1,0,0,0,1-1.05V1.85ZM6.76,1.3V.55H3.15V1.3Z"/><path class="cls-1" d="M3.06,3.73a.28.28,0,0,1,.28-.28.29.29,0,0,1,.27.28V8.58a.29.29,0,0,1-.27.28.28.28,0,0,1-.28-.28Z"/><path class="cls-1" d="M6.29,3.73a.28.28,0,0,1,.28-.28.29.29,0,0,1,.27.28V8.58a.29.29,0,0,1-.27.28.28.28,0,0,1-.28-.28Z"/><path class="cls-1" d="M4.66,3.73a.3.3,0,0,1,.28-.28.29.29,0,0,1,.28.28V8.58a.29.29,0,0,1-.28.28.3.3,0,0,1-.28-.28Z"/></g></g></svg>'
 }
 
+/** @deprecated
+ * Use visibility
+ * */
 export const preview: Icon = {
   name: 'preview',
   data: '<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24 24" width="24"><path d="M0 0h24v24H0z" fill="none"/><path d="M12 4.5C7 4.5 2.73 7.61 1 12c1.73 4.39 6 7.5 11 7.5s9.27-3.11 11-7.5c-1.73-4.39-6-7.5-11-7.5zM12 17c-2.76 0-5-2.24-5-5s2.24-5 5-5 5 2.24 5 5-2.24 5-5 5zm0-8c-1.66 0-3 1.34-3 3s1.34 3 3 3 3-1.34 3-3-1.34-3-3-3z"/></svg>'
 }
+
+/** @deprecated */
 export const bullet: Icon = {
   name: 'bullet',
   data: '<svg xmlns="http://www.w3.org/2000/svg" height="20" viewBox="0 0 24 24" width="20"><path d="M0 0h24v24H0z" fill="none"/><circle cx="12" cy="12" r="10"/></svg>'
 }
 
+/** @deprecated */
 export const remove_circle = {
   name: 'remove_circle',
   data: '<svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" height="20" viewBox="0 0 24 24" width="20"><g><path d="M0,0h24v24H0V0z" fill="none"/></g><g><path d="M12,2C6.47,2,2,6.47,2,12c0,5.53,4.47,10,10,10s10-4.47,10-10C22,6.47,17.53,2,12,2z M16.29,14.89 c0.39,0.39,0.39,1.02,0,1.41c-0.39,0.39-1.02,0.39-1.41,0L12,13.41l-2.89,2.89c-0.39,0.39-1.02,0.39-1.41,0 c-0.39-0.39-0.39-1.02,0-1.41L10.59,12L7.71,9.11c-0.39-0.39-0.39-1.02,0-1.41c0.39-0.39,1.02-0.39,1.41,0L12,10.59l2.89-2.89 c0.39-0.39,1.02-0.39,1.41,0c0.39,0.39,0.39,1.02,0,1.41L13.41,12L16.29,14.89z"/></g></svg>'
 }
 
+/** @deprecated */
 export const remove_circle_outline = {
   name: 'remove_circle_outline',
   data: '<svg xmlns="http://www.w3.org/2000/svg" height="20" viewBox="0 0 24 24" width="20"><path d="M0 0h24v24H0V0z" fill="none" opacity=".87"/><path d="M12 2C6.47 2 2 6.47 2 12s4.47 10 10 10 10-4.47 10-10S17.53 2 12 2zm0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8zm3.59-13L12 10.59 8.41 7 7 8.41 10.59 12 7 15.59 8.41 17 12 13.41 15.59 17 17 15.59 13.41 12 17 8.41z"/></svg>'
 }
 
+/** @deprecated */
 export const person_add = {
   name: 'person_add',
   data: '<svg xmlns="http://www.w3.org/2000/svg" height="20" viewBox="0 0 24 24" width="20"><path d="M0 0h24v24H0z" fill="none"/><path d="M15 12c2.21 0 4-1.79 4-4s-1.79-4-4-4-4 1.79-4 4 1.79 4 4 4zm-9-2V7H4v3H1v2h3v3h2v-3h3v-2H6zm9 4c-2.67 0-8 1.34-8 4v2h16v-2c0-2.66-5.33-4-8-4z"/></svg>'
 }
 
+/** @deprecated */
 export const cloud_upload = {
   name: 'cloud_upload',
   data: '<svg xmlns="http://www.w3.org/2000/svg" height="20" viewBox="0 0 24 24" width="20"><path d="M0 0h24v24H0V0z" fill="none"/><path d="M19.35 10.04C18.67 6.59 15.64 4 12 4 9.11 4 6.6 5.64 5.35 8.04 2.34 8.36 0 10.91 0 14c0 3.31 2.69 6 6 6h13c2.76 0 5-2.24 5-5 0-2.64-2.05-4.78-4.65-4.96zM14 13v4h-4v-4H7l4.65-4.65c.2-.2.51-.2.71 0L17 13h-3z"/></svg>'
 }
 
+/** @deprecated */
 export const add = {
   name: 'add',
   data: '<svg xmlns="http://www.w3.org/2000/svg" height="20" viewBox="0 0 24 24" width="20"><path d="M0 0h24v24H0V0z" fill="none"/><path d="M18 13h-5v5c0 .55-.45 1-1 1s-1-.45-1-1v-5H6c-.55 0-1-.45-1-1s.45-1 1-1h5V6c0-.55.45-1 1-1s1 .45 1 1v5h5c.55 0 1 .45 1 1s-.45 1-1 1z"/></svg>'
 }
 
+/** @deprecated */
 export const group = {
   name: 'group',
   data: '<svg xmlns="http://www.w3.org/2000/svg" height="20" viewBox="0 0 24 24" width="20"><path d="M0 0h24v24H0V0z" fill="none"/><path d="M16 11c1.66 0 2.99-1.34 2.99-3S17.66 5 16 5s-3 1.34-3 3 1.34 3 3 3zm-8 0c1.66 0 2.99-1.34 2.99-3S9.66 5 8 5 5 6.34 5 8s1.34 3 3 3zm0 2c-2.33 0-7 1.17-7 3.5V18c0 .55.45 1 1 1h12c.55 0 1-.45 1-1v-1.5c0-2.33-4.67-3.5-7-3.5zm8 0c-.29 0-.62.02-.97.05.02.01.03.03.04.04 1.14.83 1.93 1.94 1.93 3.41V18c0 .35-.07.69-.18 1H22c.55 0 1-.45 1-1v-1.5c0-2.33-4.67-3.5-7-3.5z"/></svg>'
 }
 
+/** @deprecated */
 export const lock = {
   name: 'lock',
   data: '<svg xmlns="http://www.w3.org/2000/svg" height="20" viewBox="0 0 24 24" width="20"><g fill="none"><path d="M0 0h24v24H0V0z"/><path d="M0 0h24v24H0V0z" opacity=".87"/></g><path d="M18 8h-1V6c0-2.76-2.24-5-5-5S7 3.24 7 6v2H6c-1.1 0-2 .9-2 2v10c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2V10c0-1.1-.9-2-2-2zm-6 9c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2zM9 8V6c0-1.66 1.34-3 3-3s3 1.34 3 3v2H9z"/></svg>'
 }
 
+/** @deprecated */
 export const search = {
   name: 'search',
   data: '<svg xmlns="http://www.w3.org/2000/svg" height="20" viewBox="0 0 24 24" width="20"><path d="M0 0h24v24H0V0z" fill="none"/><path d="M15.5 14h-.79l-.28-.27c1.2-1.4 1.82-3.31 1.48-5.34-.47-2.78-2.79-5-5.59-5.34-4.23-.52-7.79 3.04-7.27 7.27.34 2.8 2.56 5.12 5.34 5.59 2.03.34 3.94-.28 5.34-1.48l.27.28v.79l4.25 4.25c.41.41 1.08.41 1.49 0 .41-.41.41-1.08 0-1.49L15.5 14zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z"/></svg>'
 }
 
+/** @deprecated */
 export const refresh = {
   name: 'refresh',
   data: '<svg xmlns="http://www.w3.org/2000/svg" height="20" viewBox="0 0 24 24" width="20"><path d="M0 0h24v24H0z" fill="none"/><path d="M17.65 6.35C16.2 4.9 14.21 4 12 4c-4.42 0-7.99 3.58-7.99 8s3.57 8 7.99 8c3.73 0 6.84-2.55 7.73-6h-2.08c-.82 2.33-3.04 4-5.65 4-3.31 0-6-2.69-6-6s2.69-6 6-6c1.66 0 3.14.69 4.22 1.78L13 11h7V4l-2.35 2.35z"/></svg>'
 }
 
+/** @deprecated */
 export const close = {
   name: 'close',
   data: '<svg xmlns="http://www.w3.org/2000/svg" height="20" viewBox="0 0 24 24" width="20"><path d="M0 0h24v24H0V0z" fill="none"/><path d="M18.3 5.71c-.39-.39-1.02-.39-1.41 0L12 10.59 7.11 5.7c-.39-.39-1.02-.39-1.41 0-.39.39-.39 1.02 0 1.41L10.59 12 5.7 16.89c-.39.39-.39 1.02 0 1.41.39.39 1.02.39 1.41 0L12 13.41l4.89 4.89c.39.39 1.02.39 1.41 0 .39-.39.39-1.02 0-1.41L13.41 12l4.89-4.89c.38-.38.38-1.02 0-1.4z"/></svg>'
 }
 
+/** @deprecated */
 export const done = {
   name: 'done',
   data: '<svg xmlns="http://www.w3.org/2000/svg" height="20" viewBox="0 0 24 24" width="20"><path d="M0 0h24v24H0z" fill="none"/><path d="M9 16.2L4.8 12l-1.4 1.4L9 19 21 7l-1.4-1.4L9 16.2z"/></svg>'
 }
 
+/** @deprecated */
 export const mail = {
   name: 'mail',
   data: '<svg xmlns="http://www.w3.org/2000/svg" height="20" viewBox="0 0 24 24" width="20"><path d="M0 0h24v24H0z" fill="none"/><path d="M20 4H4c-1.1 0-1.99.9-1.99 2L2 18c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V6c0-1.1-.9-2-2-2zm0 4l-8 5-8-5V6l8 5 8-5v2z"/></svg>'
 }
 
+/** @deprecated */
 export const photo = {
   name: 'photo',
   data: '<svg xmlns="http://www.w3.org/2000/svg" height="20" viewBox="0 0 24 24" width="20"><path d="M0 0h24v24H0z" fill="none"/><circle cx="12" cy="12" r="3.2"/><path d="M9 2L7.17 4H4c-1.1 0-2 .9-2 2v12c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V6c0-1.1-.9-2-2-2h-3.17L15 2H9zm3 15c-2.76 0-5-2.24-5-5s2.24-5 5-5 5 2.24 5 5-2.24 5-5 5z"/></svg>'
 }
 
+/** @deprecated */
 export const check_circle_outlined = {
   name: 'check_circle_outlined',
   data: '<svg xmlns="http://www.w3.org/2000/svg" height="20" viewBox="0 0 24 24" width="20"><path d="M0 0h24v24H0V0zm0 0h24v24H0V0z" fill="none"/><path d="M16.59 7.58L10 14.17l-3.59-3.58L5 12l5 5 8-8zM12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8z"/></svg>'
 }
 
+/** @deprecated */
 export const reset = {
   name: 'reset',
   data: '<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><polyline fill="#000" points="1 2 2 2 2 6 6 6 6 7 1 7 1 2"></polyline><path fill="none" stroke="#000" stroke-width="1.1" d="M2.1,6.548 C3.391,3.29 6.746,1 10.5,1 C15.5,1 19.5,5 19.5,10 C19.5,15 15.5,19 10.5,19 C5.5,19 1.5,15 1.5,10"></path></svg>'
 }
 
+/** @deprecated */
 export const send = {
   name: 'send',
   data: '<svg xmlns="http://www.w3.org/2000/svg" height="20" viewBox="0 0 24 24" width="20" fill="#000000"><path d="M0 0h24v24H0z" fill="none"/><path d="M2.01 21L23 12 2.01 3 2 10l15 2-15 2z"/></svg>'
 }
 
+/** @deprecated */
 export const print = {
 	name: 'print',
 	data: '<svg xmlns="http://www.w3.org/2000/svg" height="20" viewBox="0 0 24 24" width="240" fill="#000000"><path d="M0 0h24v24H0z" fill="none"/><path d="M19 8H5c-1.66 0-3 1.34-3 3v6h4v4h12v-4h4v-6c0-1.66-1.34-3-3-3zm-3 11H8v-5h8v5zm3-7c-.55 0-1-.45-1-1s.45-1 1-1 1 .45 1 1-.45 1-1 1zm-1-9H6v4h12V3z"/></svg>'
 }
 
-/** Add new icon under this line to be sure that it will be added on preview */
-
 export const incognito = {
   name: 'incognito',
   data: '<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24.51 19.525"><g id="Group_13376" data-name="Group 13376" transform="translate(-428.81 -3863.018)"><path id="Path_104500" data-name="Path 104500" d="M44.68,105.185H43.024a23.507,23.507,0,0,0-9.194-.158V106a3.909,3.909,0,0,1,1.264,1.668c.455,1.119.2,3.05,4.148,3.289s4-4.041,4.034-4.438.577-.372.577-.372.541-.021.579.372.09,4.673,4.034,4.438,3.693-2.17,4.146-3.289A3.9,3.9,0,0,1,53.879,106v-.969A23.686,23.686,0,0,0,44.68,105.185Z" transform="translate(397.218 3771.582)" fill="#2c2c2c"/><path id="Path_104501" data-name="Path 104501" d="M41.867,35.784H40.326s-1.95-6.217-2.207-6.735a2.8,2.8,0,0,0-2.591-2.061c-1.92-.266-2.138,1.225-3.544,1.268-1.406-.049-1.617-1.546-3.542-1.268a2.817,2.817,0,0,0-2.592,2.061c-.246.518-2.205,6.735-2.205,6.735H22.1a2.31,2.31,0,0,0-2.371,2.245H44.24A2.311,2.311,0,0,0,41.867,35.784Z" transform="translate(409.08 3836.064)" fill="#2c2c2c"/></g></svg>'
@@ -166,27 +192,7 @@ export const graph = {
 
 export const filters = {
   name: 'filters',
-  data: '<svg id="Group_13364" data-name="Group 13364" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="24.648" height="21.128" viewBox="0 0 24.648 21.128">\n' +
-    '  <defs>\n' +
-    '    <linearGradient id="linear-gradient" x2="1" y2="0.961" gradientUnits="objectBoundingBox">\n' +
-    '      <stop offset="0" />\n' +
-    '      <stop offset="1" />\n' +
-    '    </linearGradient>\n' +
-    '    <linearGradient id="linear-gradient-2" x1="-0.029" y1="0.037" x2="1" y2="0.928" xlink:href="#linear-gradient"/>\n' +
-    '  </defs>\n' +
-    '  <g id="Group_13361" data-name="Group 13361" transform="translate(0 10.564)">\n' +
-    '    <line id="Line_420" data-name="Line 420" x2="24.648" transform="translate(0 5.774)" fill="none" stroke="#707070" stroke-width="1"/>\n' +
-    '    <g id="Ellipse_515" data-name="Ellipse 515" transform="translate(2.078)" stroke="#fafafa" stroke-width="0.6">\n' +
-    '      <ellipse cx="5.282" cy="5.282" rx="5.282" ry="5.282" stroke="none"/>\n' +
-    '      <ellipse cx="5.282" cy="5.282" rx="4.982" ry="4.982" fill="none"/>\n' +
-    '    </g>\n' +
-    '  </g>\n' +
-    '  <g id="Group_13362" data-name="Group 13362">\n' +
-    '    <line id="Line_418" data-name="Line 418" x2="24.648" transform="translate(0 5.388)" fill="none" stroke="#707070" stroke-width="1"/>\n' +
-    '    <g id="Path_104494" data-name="Path 104494" transform="translate(11.444)">\n' +
-    '      <path d="M 5.281623840332031 10.26361751556396 C 2.534753799438477 10.26361751556396 0.3000038266181946 8.028787612915039 0.3000038266181946 5.281807899475098 C 0.3000038266181946 2.534827947616577 2.534753799438477 0.2999978959560394 5.281623840332031 0.2999978959560394 C 8.028493881225586 0.2999978959560394 10.26324367523193 2.534827947616577 10.26324367523193 5.281807899475098 C 10.26324367523193 8.028787612915039 8.028493881225586 10.26361751556396 5.281623840332031 10.26361751556396 Z" stroke="none"/>\n' +
-    '      <path d="M 5.281623840332031 0.5999975204467773 C 2.700173854827881 0.5999975204467773 0.6000041961669922 2.700247764587402 0.6000041961669922 5.281807899475098 C 0.6000041961669922 7.863368034362793 2.700173854827881 9.963618278503418 5.281623840332031 9.963618278503418 C 7.863073825836182 9.963618278503418 9.96324348449707 7.863368034362793 9.96324348449707 5.281807899475098 C 9.96324348449707 2.700247764587402 7.863073825836182 0.5999975204467773 5.281623840332031 0.5999975204467773 M 5.281623840332031 -1.9073486328125e-06 C 8.198583602905273 -1.9073486328125e-06 10.5632438659668 2.364748001098633 10.5632438659668 5.281807899475098 C 10.5632438659668 8.198867797851562 8.198583602905273 10.56361770629883 5.281623840332031 10.56361770629883 C 2.364664077758789 10.56361770629883 3.814697265625e-06 8.198867797851562 3.814697265625e-06 5.281807899475098 C 3.814697265625e-06 2.364748001098633 2.364664077758789 -1.9073486328125e-06 5.281623840332031 -1.9073486328125e-06 Z" stroke="none" fill="#fafafa"/>\n' +
-    '    </g>\n' +
-    '  </g>\n' +
-    '</svg>'
+  data: '<svg id="Group_13364" data-name="Group 13364" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="20" height="20" viewBox="0 0 24.648 21.128"><defs><linearGradient id="linear-gradient" x2="1" y2="0.961" gradientUnits="objectBoundingBox"><stop offset="0" /><stop offset="1" /></linearGradient><linearGradient id="linear-gradient-2" x1="-0.029" y1="0.037" x2="1" y2="0.928" xlink:href="#linear-gradient"/></defs><g id="Group_13361" data-name="Group 13361" transform="translate(0 10.564)"><line id="Line_420" data-name="Line 420" x2="24.648" transform="translate(0 5.774)" fill="none" stroke="#707070" stroke-width="1"/><g id="Ellipse_515" data-name="Ellipse 515" transform="translate(2.078)" stroke="#fafafa" stroke-width="0.6"><ellipse cx="5.282" cy="5.282" rx="5.282" ry="5.282" stroke="none"/><ellipse cx="5.282" cy="5.282" rx="4.982" ry="4.982" fill="none"/></g></g><g id="Group_13362" data-name="Group 13362"><line id="Line_418" data-name="Line 418" x2="24.648" transform="translate(0 5.388)" fill="none" stroke="#707070" stroke-width="1"/><g id="Path_104494" data-name="Path 104494" transform="translate(11.444)"><path d="M 5.281623840332031 10.26361751556396 C 2.534753799438477 10.26361751556396 0.3000038266181946 8.028787612915039 0.3000038266181946 5.281807899475098 C 0.3000038266181946 2.534827947616577 2.534753799438477 0.2999978959560394 5.281623840332031 0.2999978959560394 C 8.028493881225586 0.2999978959560394 10.26324367523193 2.534827947616577 10.26324367523193 5.281807899475098 C 10.26324367523193 8.028787612915039 8.028493881225586 10.26361751556396 5.281623840332031 10.26361751556396 Z" stroke="none"/><path d="M 5.281623840332031 0.5999975204467773 C 2.700173854827881 0.5999975204467773 0.6000041961669922 2.700247764587402 0.6000041961669922 5.281807899475098 C 0.6000041961669922 7.863368034362793 2.700173854827881 9.963618278503418 5.281623840332031 9.963618278503418 C 7.863073825836182 9.963618278503418 9.96324348449707 7.863368034362793 9.96324348449707 5.281807899475098 C 9.96324348449707 2.700247764587402 7.863073825836182 0.5999975204467773 5.281623840332031 0.5999975204467773 M 5.281623840332031 -1.9073486328125e-06 C 8.198583602905273 -1.9073486328125e-06 10.5632438659668 2.364748001098633 10.5632438659668 5.281807899475098 C 10.5632438659668 8.198867797851562 8.198583602905273 10.56361770629883 5.281623840332031 10.56361770629883 C 2.364664077758789 10.56361770629883 3.814697265625e-06 8.198867797851562 3.814697265625e-06 5.281807899475098 C 3.814697265625e-06 2.364748001098633 2.364664077758789 -1.9073486328125e-06 5.281623840332031 -1.9073486328125e-06 Z" stroke="none" fill="#fafafa"/></g></g></svg>'
 }
+
+/** Add new icon under this line to be sure that it will be added on preview */