diff --git a/www/common/common-icons.js b/www/common/common-icons.js
index 75172c02a..c00d0b130 100644
--- a/www/common/common-icons.js
+++ b/www/common/common-icons.js
@@ -107,6 +107,7 @@ define([
         "square": "square",
         "timer": "hourglass",
         "map-pin": "map-pin",
+        "pin": "pin",
         "checked-box": "square-check",
         "unchecked-box": "square",
         "table": "table",
diff --git a/www/common/toolbar.js b/www/common/toolbar.js
index 5bf326ac9..3e2b3ca20 100644
--- a/www/common/toolbar.js
+++ b/www/common/toolbar.js
@@ -460,7 +460,6 @@ MessengerUI, Messages, Pages, PadTypes, Lucide, Icons) {
             e.preventDefault();
             e.stopPropagation();
         });
-        //var $closeIcon = $('<span>', {"class": "fa fa-times cp-toolbar-userlist-drawer-close"}).appendTo($content);
         $('<h2>').text(Messages.users).appendTo($content);
         $('<p>', {'class': USERLIST_CLS}).appendTo($content);
 
@@ -552,7 +551,6 @@ MessengerUI, Messages, Pages, PadTypes, Lucide, Icons) {
             e.preventDefault();
             e.stopPropagation();
         });
-        //var $closeIcon = $('<span>', {"class": "fa fa-times cp-toolbar-chat-drawer-close"}).appendTo($content);
         //$('<h2>').text(Messages.users).appendTo($content);
         //$('<p>', {'class': USERLIST_CLS}).appendTo($content);
 
diff --git a/www/poll/render.js b/www/poll/render.js
index 9850f4bf6..37a662659 100644
--- a/www/poll/render.js
+++ b/www/poll/render.js
@@ -9,9 +9,11 @@ define([
     '/components/chainpad/chainpad.dist.js',
     '/common/common-util.js',
     '/customize/messages.js',
+    '/customize/fonts/lucide.js',
+    '/common/common-icons.js',
 
     '/lib/diff-dom/diffDOM.js',
-], function ($, Hyperjson, TextCursor, ChainPad, Util, Messages) {
+], function ($, Hyperjson, TextCursor, ChainPad, Util, Messages, Lucide, Icons) {
     var DiffDOM = window.diffDOM;
 
     var Example = {
@@ -293,8 +295,8 @@ var Renderer = function (APP) {
         return ['SPAN', {
             'data-rt-id': id,
             'title': Messages.poll_locked,
-            class: 'cp-app-poll-table-lock fa fa-lock',
-        }, []];
+            class: 'cp-app-poll-table-lock',
+        }, [Icons.get('lock')]];
     };
 
     var makeBookmarkElement = Render.makeBookmarkElement = function (id) {
@@ -302,8 +304,8 @@ var Renderer = function (APP) {
             'data-rt-id': id,
             'title': Messages.poll_bookmark_col,
             'style': 'visibility: hidden;',
-            class: 'cp-app-poll-table-bookmark fa fa-thumb-tack',
-        }, []];
+            class: 'cp-app-poll-table-bookmark',
+        }, [Icons.get('pin')]];
     };
 
     var makeHeadingCell = Render.makeHeadingCell = function (cell, readOnly) {
diff --git a/www/todo/inner.html b/www/todo/inner.html
index 72b373c53..e9aa27e75 100644
--- a/www/todo/inner.html
+++ b/www/todo/inner.html
@@ -20,7 +20,9 @@ SPDX-License-Identifier: AGPL-3.0-or-later
     <div id="cp-app-todo-container">
         <div class="cp-app-todo-create-form">
             <input type="text" id="cp-app-todo-newtodo" data-localization-placeholder="todo_newTodoNamePlaceholder" />
-            <button class="btn btn-success fa fa-plus" data-localization-title="todo_newTodoNameTitle"></button>
+            <button class="btn btn-success" data-localization-title="todo_newTodoNameTitle">
+                <i data-lucide="plus" aria-hidden="true"></i>
+            </button>
         </div>
         <div id="cp-app-todo-taskslist"></div>
     </div>