diff --git a/webapp/src/components/boardComponent.tsx b/webapp/src/components/boardComponent.tsx
index 6636d4733..ac55cea07 100644
--- a/webapp/src/components/boardComponent.tsx
+++ b/webapp/src/components/boardComponent.tsx
@@ -511,7 +511,9 @@ class BoardComponent extends React.Component<Props, State> {
             }
         }
         card.properties = {...card.properties, ...propertiesThatMeetFilters}
-        card.icon = BlockIcons.shared.randomIcon()
+        if (!card.icon) {
+            card.icon = BlockIcons.shared.randomIcon()
+        }
         await mutator.insertBlocks(
             blocksToInsert,
             'add card',
diff --git a/webapp/src/components/tableComponent.tsx b/webapp/src/components/tableComponent.tsx
index 325c27d1a..01cd2b9cc 100644
--- a/webapp/src/components/tableComponent.tsx
+++ b/webapp/src/components/tableComponent.tsx
@@ -327,7 +327,9 @@ class TableComponent extends React.Component<Props, State> {
         }
 
         card.parentId = boardTree.board.id
-        card.icon = BlockIcons.shared.randomIcon()
+        if (!card.icon) {
+            card.icon = BlockIcons.shared.randomIcon()
+        }
         await mutator.insertBlocks(
             blocksToInsert,
             'add card',
diff --git a/webapp/src/components/viewHeader.tsx b/webapp/src/components/viewHeader.tsx
index 44603c7ed..cb8868b52 100644
--- a/webapp/src/components/viewHeader.tsx
+++ b/webapp/src/components/viewHeader.tsx
@@ -399,11 +399,15 @@ class ViewHeader extends React.Component<Props, State> {
                         <Menu.Separator/>
 
                         {boardTree.cardTemplates.map((cardTemplate) => {
+                            let displayName = cardTemplate.title || intl.formatMessage({id: 'ViewHeader.untitled', defaultMessage: 'Untitled'})
+                            if (cardTemplate.icon) {
+                                displayName = `${cardTemplate.icon} ${displayName}`
+                            }
                             return (
                                 <Menu.Text
                                     key={cardTemplate.id}
                                     id={cardTemplate.id}
-                                    name={cardTemplate.title || intl.formatMessage({id: 'ViewHeader.untitled', defaultMessage: 'Untitled'})}
+                                    name={displayName}
                                     onClick={() => {
                                         this.props.addCardFromTemplate(cardTemplate.id)
                                     }}