diff --git a/www/code/inner.js b/www/code/inner.js
index f8b6043f0..ff4bd3148 100644
--- a/www/code/inner.js
+++ b/www/code/inner.js
@@ -99,7 +99,7 @@ define([
         var $showAuthorColorsButton = framework._.sfCommon.createButton('', true, {
             text: Messages.cba_hide,
             name: 'authormarks',
-            icon: 'fa-paint-brush',
+            icon: 'customize',
         }).hide();
         var $showAuthorColors = UIElements.getEntryFromButton($showAuthorColorsButton).hide();
         $showAuthorColors.find('span').addClass('cp-toolbar-name cp-toolbar-drawer-element');
@@ -421,7 +421,7 @@ define([
     var mkColorByAuthor = function (framework, markers) {
         var common = framework._.sfCommon;
         var $cbaButton = framework._.sfCommon.createButton(null, true, {
-            icon: 'fa-paint-brush',
+            icon: 'customize',
             text: Messages.cba_title,
             name: 'cba'
         }, function () {
diff --git a/www/common/common-icons.js b/www/common/common-icons.js
index 78ab0f656..14c9f7d09 100644
--- a/www/common/common-icons.js
+++ b/www/common/common-icons.js
@@ -168,8 +168,10 @@ define([
         "sort-amount-desc": "arrow-down-wide-narrow",
         "unfriend": "user-round-x",
         "add-friend": "user-round-plus",
-        "sheet": "sheet"
-
+        "sheet": "sheet",
+        "announcement": "megaphone",
+        "reply": "message-square-reply",
+        "comment": "message-square"
 
     };
 
diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 72b8da826..5dfd38082 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -433,7 +433,7 @@ define([
         var linkForm, linkSpin, linkResult, linkUses, linkRole;
         var linkWarning;
         // Invite from link
-        var dismissButton = h('span.fa.fa-times');
+        var dismissButton = Icons.get('close');
 
         var roleViewer = UI.createRadio('cp-team-role', 'cp-team-role-viewer',
                 Messages.team_viewers, true, {
diff --git a/www/common/messenger-ui.js b/www/common/messenger-ui.js
index 16b1120d4..a4c61999c 100644
--- a/www/common/messenger-ui.js
+++ b/www/common/messenger-ui.js
@@ -11,7 +11,9 @@ define([
     '/common/inner/badges.js',
     '/common/hyperscript.js',
     '/common/diffMarked.js',
-], function ($, Messages, Util, UI, UIElements, Badges, h, DiffMd) {
+    '/customize/fonts/lucide.js',
+    '/common/common-icons.js',
+], function ($, Messages, Util, UI, UIElements, Badges, h, DiffMd, Lucide, Icons) {
     'use strict';
 
     var debug = console.log;
@@ -76,7 +78,7 @@ define([
             ]),
             h('div.cp-app-contacts-friends.cp-app-contacts-category', [
                 h('button.btn.btn-default.cp-app-contacts-muted-button', {tabindex:0},[
-                    h('i.fa.fa-bell-slash'),
+                    Icons.get('mute'),
                     Messages.contacts_manageMuted
                 ]), 
                 h('div.cp-app-contacts-category-content.cp-contacts-friends')
@@ -904,7 +906,7 @@ define([
                     var button = h('button.btn', {
                         'data-user': curve
                     }, [
-                        h('i.fa.fa-bell'),
+                        Icons.get('notification'),
                         Messages.contacts_unmute || 'unmute'
                     ]);
                     common.displayAvatar($(avatar), data.avatar, data.name, Util.noop, data.uid, data.badge);
diff --git a/www/common/sframe-common-mailbox.js b/www/common/sframe-common-mailbox.js
index 5d44b7609..c6c5263e7 100644
--- a/www/common/sframe-common-mailbox.js
+++ b/www/common/sframe-common-mailbox.js
@@ -67,7 +67,7 @@ define([
                 return;
             }
             if (data.type === 'broadcast') {
-                avatar = h('i.fa.fa-bullhorn.cp-broadcast');
+                avatar = Icons.get('announcement', {'class': 'cp-broadcast'});
                 if (/^LOCAL\|/.test(data.content.hash)) {
                     $(avatar).addClass('preview');
                 }
diff --git a/www/debug/inner.js b/www/debug/inner.js
index 6547f5515..385e61d3e 100644
--- a/www/debug/inner.js
+++ b/www/debug/inner.js
@@ -21,6 +21,8 @@ define([
     '/customize/application_config.js',
     '/common/common-ui-elements.js',
     '/debug/chainpad.dist.js',
+    '/customize/fonts/lucide.js',
+    '/common/common-icons.js',
 
     'css!/components/bootstrap/dist/css/bootstrap.min.css',
     'css!/components/components-font-awesome/css/font-awesome.min.css',
@@ -43,7 +45,9 @@ define([
     Messages,
     AppConfig,
     UIElements,
-    ChainWalk)
+    ChainWalk,
+    Lucide,
+    Icons)
 {
     var APP = window.APP = {
         $: $,
@@ -426,12 +430,12 @@ define([
                 var replay, input, left, right;
                 var content = h('div.cp-app-debug-progress.cp-loading-progress', [
                     h('p', [
-                        left = h('span.fa.fa-chevron-left'),
+                        left = Icons.get('chevron-left'),
                         h('label', 'Start'),
                         start = h('input', {type: 'number', value: 0}),
                         h('label', 'State'),
                         input = h('input', {type: 'number', min: 1}),
-                        right = h('span.fa.fa-chevron-right'),
+                        right = Icons.get('chevron-right'),
                     ]),
                     h('br'),
                     replay = h('pre.cp-debug-replay'),
@@ -709,7 +713,7 @@ define([
             toolbar.$drawer.append($histEntry);
 
             var $content = common.createButton(null, true, {
-                icon: 'fa-clock-o',
+                icon: 'drive-recent',
                 title: 'Get debugging graph', // TODO
                 name: 'graph',
                 text: 'Replay',
@@ -722,7 +726,7 @@ define([
             var priv = metadataMgr.getPrivateData();
             if (priv.debugDrive) {
                 var $drive = common.createButton(null, true, {
-                    icon: 'fa-hdd-o',
+                    icon: 'drive',
                     title: 'Get Shared Folder content', // TODO
                     text: 'SF channel list',
                     id: 'cp-app-debug-get-channels'
diff --git a/www/pad/comments.js b/www/pad/comments.js
index a41401c55..7e18f0a44 100644
--- a/www/pad/comments.js
+++ b/www/pad/comments.js
@@ -167,13 +167,13 @@ define([
         var cancel = h('button.btn.btn-cancel', {
             tabindex: 1
         }, [
-            h('i.fa.fa-times'),
+            Icons.get('close'),
             Messages.cancel
         ]);
         var submit = h('button.btn.btn-primary', {
             tabindex: 1
         }, [
-            h('i.fa.fa-paper-plane-o'),
+            Icons.get('send'),
             Messages.comments_submit
         ]);
 
@@ -262,7 +262,7 @@ define([
             deleteButton = h('button.btn.btn-danger', {
                 tabindex: 1
             }, [
-                h('i.fa.fa-times'),
+                Icons.get('close'),
                 Messages.kanban_delete
             ]);
             $(deleteButton).click(function(e) {
@@ -442,7 +442,7 @@ define([
                     edit = h('span.cp-comment-edit', {
                         tabindex: 1,
                         title: Messages.clickToEdit
-                    }, h('i.fa.fa-pencil'));
+                    }, Icons.get('edit'));
                     $(edit).click(function(e) {
                         Env.$container.find('.cp-comment-active').removeClass('cp-comment-active');
                         $div.addClass('cp-comment-active');
@@ -505,13 +505,13 @@ define([
             var reply = h('button.btn.btn-secondary', {
                 tabindex: 1
             }, [
-                h('i.fa.fa-reply'),
+                Icons.get('reply'),
                 Messages.comments_reply
             ]);
             var resolve = h('button.btn.btn-primary', {
                 tabindex: 1
             }, [
-                h('i.fa.fa-check'),
+                Icons.get('check'),
                 Messages.comments_resolve
             ]);
 
@@ -783,7 +783,7 @@ define([
 
         var button = h('button.btn.btn-secondary', {
             title: Messages.comments_comment
-        }, h('i.fa.fa-commenting'));
+        }, Icons.get('comment'));
         Env.bubble = {
             range: ranges[ranges.length-1],
             button: button
diff --git a/www/poll/inner.js b/www/poll/inner.js
index ab900f716..0601e89f5 100644
--- a/www/poll/inner.js
+++ b/www/poll/inner.js
@@ -23,6 +23,8 @@ define([
     '/customize/messages.js',
     '/common/sframe-common-codemirror.js',
     'cm/lib/codemirror',
+    '/customize/fonts/lucide.js',
+    '/common/common-icons.js',
     '/common/test.js',
 
     'cm/addon/display/placeholder',
@@ -54,7 +56,9 @@ define([
     h,
     Messages,
     SFCodeMirror,
-    CMeditor/*,
+    CMeditor,
+    Lucide,
+    Icons/*,
     Test*/)
 {
     var saveAs = window.saveAs;
@@ -1282,7 +1286,7 @@ define([
                             }, Messages.poll_commit),
                             h('button#cp-app-poll-create-option.btn.btn-default', {
                                 title: Messages.poll_create_option
-                            }, h('span.fa.fa-plus')),
+                            }, Icons.get('add')),
                         ]),
                         h('div#cp-app-poll-comments', [
                             h('h2#cp-app-poll-comments-add-title', Messages.poll_comment_add),