diff --git a/www/common/common-icons.js b/www/common/common-icons.js
index 8dc492245..68c147e65 100644
--- a/www/common/common-icons.js
+++ b/www/common/common-icons.js
@@ -4,68 +4,151 @@ define([
     const Icons = {};
 
     const map = {
+        // Drive
+        "homepage": "house",
+        "drive": "hard-drive",
+        "drive-search": "search",
+        "drive-shared-folder": "folder-git-2", // XXX change icon
+        "drive-upload-file": "file-up",
+        "drive-upload-folder": "folder-up",
+        "drive-file": "file", // change name
+        "drive-recent": "clock",
+        "drive-owned-document": "id-card",
+        "drive-password-document": "file-lock",
+        "drive-folder": "folder", // change name
+        "folder-open": "folder-open",
+        "folder-nocolor": "folder-minus",
+        "folder-check": "folder-check",
+        "file-template": "file-type", // XXX
+        "file-pad": "file-text",
+        "grid": "layout-grid",
+        "list": "list",
+        "owner": "id-card-lanyard",
+        // Teams
+        "promote": "chevrons-up",
+        "downgrade": "chevrons-down",
+        // CryptPad apps - icon to be changed
+        // Pad
+        "pad": "file",
+        "pad-settings": "file-cog",
+        "expand-pad": "maximize-2",
+        "shrink-pad": "minimize-2",
+        "slide": "file",
+        "poll": "file",
+        // Form
+        "form": "file",
+        "form-text": "minus",
+        "form-paragraph": "text",
+        "form-grid-radio": "list-todo", // XXX
+        "form-grid-check": "list-todo",
+        "form-list-check": "list-todo",
+        "form-list-radio": "list-todo",
+        "form-list-ordered": "list-ordered",
+        "form-poll": "vote",
+        "form-page-break": "chevrons-left-right-ellipsis",
+        "form-conditional": "workflow",
+        "form-poll-maybe": "circle-slash",
+        "form-poll-switch": "arrow-right-left",
+        "whiteboard": "file",
+        "diagram": "file",
+        "todo": "file",
+        // Kanban
+        "kanban": "file",
+        "kanban-tags": "tags",
+        "kanban-minimize": "minus",
+        "kanban-maximize": "menu",
+        "touch-mode": "hand",
+        "kanban-add-top": "between-horizontal-end", // TEMP, TO BE UPDATED
+        "kanban-add-bottom": "between-horizontal-start",
+        // Doc
+        "doc": "file",
+        // Presentation
+        "presentation": "file",
+        // Actions
+        "add": "plus",
+        "check": "check",
+        "filter": "list-filter-plus",
+        "share": "share-2",
+        "download": "hard-drive-download",
+        "destroy": "shredder",
+        "donate": "hand-coins",
+        "send": "send",
+        "cloud-upload": "cloud-upload",
+        "print": "printer",
+        "play": "circle-play",
+        "grip-move": "grip-horizontal",
+        "grip-move-vertical": "grip-vertical",
+        "refresh": "refresh-ccw",
+        "select": "move",
+        // General
         "trash-empty": "trash", // XXX change name
         "trash-full": "trash-2", // XXX
-        "drive-search": "search",
-        "add": "plus",
         "features": "info", // XXX
         "documentation": "book-open-text",
         "user-profile": "circle-user-round",
         "language": "languages",
         "link": "link",
         "external-link": "external-link",
-        "donate": "hand-coins",
-        "login": "log-in",
-        "logout": "log-out",
-        "logout-everywhere": "unplug",
-        "register-homepage": "user", // XXX change name
-        "register": "user-round-plus",
         "chevron-left": "chevron-left",
         "chevron-right": "chevron-right",
         "chevron-down": "chevron-down",
         "chevron-up": "chevron-up",
-        "check": "check",
-        "drive": "hard-drive",
-        "grid": "layout-grid",
-        "list": "list",
+        "copy": "files",
+        "close": "x",
+        "teams": "users-round", // XXX change name, multiple usages
+        "square": "square",
+        "timer": "hourglass",
+        "map-pin": "map-pin",
+        "checked-box": "square-check",
+        "unchecked-box": "square",
+        "table": "table",
+        "inbox": "inbox",
+        "server": "server",
+        "minus": "minus",
+        "alert": "triangle-alert",
+        "sort-amount-desc": "arrow-down-wide-narrow",
+        "sheet": "sheet", // change name
+        "announcement": "megaphone",
+        "reply": "message-square-reply",
+        "comment": "message-square",
+        "file-image": "file-image",
+        "snapshot": "camera",
+        "certificate": "shield-check",
+        "secret-user": "venetian-mask",
+        "circle-question": "circle-question-mark",
         "list-ol": "list-ordered",
         "list-todo": "list-todo",
-        "filter": "list-filter-plus",
-        "folder-open": "folder-open",
-        "drive-recent": "clock",
-        "drive-owned-document": "id-card",
-        "share": "share-2",
-        "drive-password-document": "file-lock",
         "ellipsis-vertical": "ellipsis-vertical",
         "ellipsis-horizontal": 'ellipsis',
         "toolbar-insert": "image-plus",
+        // Login + Register
+        "login": "log-in",
+        "logout": "log-out",
+        "logout-everywhere": "unplug",
+        "register": "user-round-plus",
+        "register-homepage": "user", // XXX change name
+        // History
+        "history": "history",
         "history-prev": 'arrow-left',
         "history-next": "arrow-right",
         "history-fast-next": "arrow-right-to-line",
         "history-fast-prev": "arrow-left-to-line",
         "history-timeline-position": "flag-triangle-right",
         "history-restore": "archive-restore",
-        "close": "x",
-        "drive-folder": "folder",
-        "folder-nocolor": "folder-minus",
-        "folder-check": "folder-check",
-        "drive-shared-folder": "folder-git-2", // XXX
-        "drive-upload-file": "file-up",
-        "drive-upload-folder": "folder-up",
-        "drive-file": "file",
-        "teams": "users-round", // XXX change name, multiple usages
+        "remove-history": "eraser",
+        // Calendar
         "calendar": "calendar-days",
         "calendar-inactive": "calendar",
         "calendar-add": "calendar-plus-2",
+        "calendar-repeat": "calendar-sync",
+        "calendar-reminder": "bell-ring",
+        "calendar-location": "map-pin",
+        "calendar-description": "align-justify",
+        // Contacts
         "contacts": "contact-round",
         "contact-request": "book-user", // XXX change name
-        "settings": "settings",
-        "administration": "monitor-cog",
-        "support": "life-buoy",
-        "support-mailbox": "ambulance", // XXX
-        "homepage": "house",
-        "file-template": "file-type", // XXX
-        "file-pad": "file-text",
+        "unfriend": "user-round-x",
+        "add-friend": "user-round-plus",
         "sort-asc": "chevron-down",
         "sort-desc": "chevron-up",
         "access": "lock-open",
@@ -73,14 +156,10 @@ define([
         "color-palette": "palette",
         "customize": "brush",
         "upload": "hard-drive-upload",
-        "download": "hard-drive-download",
-        "destroy": "shredder",
         "read-only": "pen-off", // XXX
         "preview": "eye",
         "tag": "hash",
-        "copy": "files",
         "default-error": "circle-x",
-        "owner": "id-card-lanyard",
         "password-reveal": "eye",
         "password-hide": "eye-closed",
         "arrow-left": "arrow-left",
@@ -99,28 +178,30 @@ define([
         "renamed": "flag", // XXX
         "restore": "restore", // XXX
         "all": "menu",
-        "history": "history",
         "chat": "message-circle-more",
         "mail": "mail", // XXX
         "upload-avatar": "image-up",
         "edit": "pencil",
-        "calendar-repeat": "calendar-sync",
-        "calendar-reminder": "bell-ring",
-        "calendar-location": "map-pin",
-        "calendar-description": "align-justify",
         "save": "save",
         "loading": "loader", // XXX
         "notification" : "bell",
         "mute": "bell-off",
         "cursor": "text-cursor",
+        // Settings + Admin
+        "settings": "settings",
+        "administration": "monitor-cog",
+        "support": "life-buoy",
+        "support-mailbox": "ambulance", // XXX
         "broadcast": "radio",
         "apps-settings": "wrench", // XXX multiple usages
+        "support-ticket": "ticket",
         "user-directory": "id-card",
         "database": "database",
         "stats": "chart-line",
         "performance": "heart-pulse",
         "network": "network",
-        "select": "move",
+        "survey": "graduation-cap",
+        // Markdown toolbar
         "undo": "undo",
         "redo": "redo",
         "type": "type",
@@ -133,76 +214,11 @@ define([
         "quote": "quote",
         "toc": "newspaper",
         "embed": "image-plus",
-        "expand-pad": "maximize-2",
-        "shrink-pad": "minimize-2",
-        "pad-settings": "file-cog",
-        "play": "circle-play",
-        "kanban-tags": "tags",
-        "kanban-minimize": "minus",
-        "kanban-maximize": "menu",
-        "touch-mode": "hand",
-        "kanban-add-top": "between-horizontal-end", // TEMP, TO BE UPDATED
-        "kanban-add-bottom": "between-horizontal-start",
-        "form-responses": "chart-no-axes-combined",
-        "grip-move": "grip-horizontal",
-        "grip-move-vertical": "grip-vertical",
-        "form-text": "minus",
-        "form-paragraph": "text",
-        "form-grid-radio": "list-todo", // XXX
-        "form-grid-check": "list-todo",
-        "form-list-check": "list-todo",
-        "form-list-radio": "list-todo",
-        "form-list-ordered": "list-ordered",
-        "form-poll": "vote",
-        "form-page-break": "chevrons-left-right-ellipsis",
-        "form-conditional": "workflow",
-        "form-poll-maybe": "circle-slash",
-        "form-poll-switch": "arrow-right-left",
-        "inbox": "inbox",
-        "server": "server",
-        "support-ticket": "ticket",
-        "refresh": "refresh-ccw",
-        "send": "send",
-        "minus": "minus",
-        "alert": "triangle-alert",
-        "cloud-upload": "cloud-upload",
-        "sort-amount-desc": "arrow-down-wide-narrow",
-        "unfriend": "user-round-x",
-        "add-friend": "user-round-plus",
-        "sheet": "sheet",
-        "announcement": "megaphone",
-        "reply": "message-square-reply",
-        "comment": "message-square",
-        "file-image": "file-image",
-        "snapshot": "camera",
-        "promote": "chevrons-up",
-        "downgrade": "chevrons-down",
-        "certificate": "shield-check",
-        "secret-user": "venetian-mask",
-        "circle-question": "circle-question-mark",
-        "print": "printer",
-        "pad": "file",
-        "slide": "file",
-        "poll": "file",
-        "form": "file",
-        "whiteboard": "file",
-        "diagram": "file",
-        "todo": "file",
-        "kanban": "file",
-        "doc": "file",
-        "presentation": "file",
+        // Badges
         "badge-admin": "star",
         "badge-moderator": "life-buoy",
         "badge-premium": "ticket-check",
         "badge-error": "circle-alert",
-        "remove-history": "eraser",
-        "square": "square",
-        "timer": "hourglass",
-        "map-pin": "map-pin",
-        "checked-box": "square-check",
-        "unchecked-box": "square",
-        "table": "table",
-        "survey": "graduation-cap"
     };
 
     Icons.get = (name, attrs = {}) => {