diff --git a/client/src/components/Draftail/decorators/Document.js b/client/src/components/Draftail/decorators/Document.js
index e3d5f0259..2c7357a7d 100644
--- a/client/src/components/Draftail/decorators/Document.js
+++ b/client/src/components/Draftail/decorators/Document.js
@@ -5,6 +5,8 @@ import Icon from '../../Icon/Icon';
 
 import TooltipEntity from '../decorators/TooltipEntity';
 
+const documentIcon = <Icon name="doc-full" />;
+
 const Document = props => {
   const { entityKey, contentState } = props;
   const { url } = contentState.getEntity(entityKey).getData();
@@ -13,7 +15,7 @@ const Document = props => {
   return (
     <TooltipEntity
       {...props}
-      icon={<Icon name="doc-full" />}
+      icon={documentIcon}
       label={filename}
       url={url}
     />
diff --git a/client/src/components/Draftail/decorators/Link.js b/client/src/components/Draftail/decorators/Link.js
index 83eee0f5d..7f33bd6c5 100644
--- a/client/src/components/Draftail/decorators/Link.js
+++ b/client/src/components/Draftail/decorators/Link.js
@@ -8,6 +8,9 @@ import TooltipEntity from '../decorators/TooltipEntity';
 const getEmailAddress = mailto => mailto.replace('mailto:', '').split('?')[0];
 const getDomainName = url => url.replace(/(^\w+:|^)\/\//, '').split('/')[0];
 
+const linkIcon = <Icon name="link" />;
+const mailIcon = <Icon name="mail" />;
+
 const Link = props => {
   const { entityKey, contentState } = props;
   const data = contentState.getEntity(entityKey).getData();
@@ -15,20 +18,20 @@ const Link = props => {
   let label;
 
   if (data.id) {
-    icon = 'link';
+    icon = linkIcon;
     label = data.url;
   } else if (data.url.startsWith('mailto:')) {
-    icon = 'mail';
+    icon = mailIcon;
     label = getEmailAddress(data.url);
   } else {
-    icon = 'link';
+    icon = linkIcon;
     label = getDomainName(data.url);
   }
 
   return (
     <TooltipEntity
       {...props}
-      icon={<Icon name={icon} />}
+      icon={icon}
       label={label}
       url={data.url}
     />