diff --git a/src/views/password-reset-view.jsx b/src/views/password-reset-view.jsx
index ddbaefab..2e511f84 100644
--- a/src/views/password-reset-view.jsx
+++ b/src/views/password-reset-view.jsx
@@ -57,7 +57,7 @@ export default class PasswordResetView extends React.PureComponent {
               onChange={this.handlePasswordChange} />
           }</FormattedMessage>
           :
-          <React.Fragment>
+          <>
             <label htmlFor="inputEmail">
               <FormattedMessage id="label_reset_password"
                 defaultMessage="Send a password reset email:"
@@ -72,7 +72,7 @@ export default class PasswordResetView extends React.PureComponent {
                 onChange={this.handleEmailChange}
                 required autoFocus />
             }</FormattedMessage>
-          </React.Fragment>
+          </>
         }
         <div className="dialog-buttons">
           <button className="blue" type="submit">{reset ?
diff --git a/src/widgets/chat-message.jsx b/src/widgets/chat-message.jsx
index adb11ee6..1382bb5d 100644
--- a/src/widgets/chat-message.jsx
+++ b/src/widgets/chat-message.jsx
@@ -98,10 +98,10 @@ export default class ChatMessage extends React.Component {
       }, this);
       content = React.createElement('span', null, Drafty.format(content, draftyFormatter, this));
     } else if (typeof content != 'string') {
-      content = <span><i className="material-icons">error_outline</i> <i>
+      content = <><i className="material-icons">error_outline</i> <i>
         <FormattedMessage id="invalid_content"
           defaultMessage="invalid content" description="Shown when message is unreadable" />
-      </i></span>
+      </i></>
     }
 
     return (
diff --git a/src/widgets/contact-badges.jsx b/src/widgets/contact-badges.jsx
index fa54d46e..9b3cdf68 100644
--- a/src/widgets/contact-badges.jsx
+++ b/src/widgets/contact-badges.jsx
@@ -16,7 +16,7 @@ export default class ContactBadges extends React.PureComponent {
             badges.push(<span className={style} key={b.key || b.name}>{b.name}</span>);
           }
         });
-        return <React.Fragment>{badges}</React.Fragment>;
+        return <>{badges}</>;
       }
       return null;
     }
diff --git a/src/widgets/contact.jsx b/src/widgets/contact.jsx
index ba7dd8b8..7a59c312 100644
--- a/src/widgets/contact.jsx
+++ b/src/widgets/contact.jsx
@@ -70,7 +70,7 @@ export default class Contact extends React.Component {
             <UnreadBadge count={this.props.unread} /><ContactBadges badges={icon_badges} />
           </div>
           {this.props.comment ? <div className="contact-comment">{this.props.comment}</div> : null}
-          <span><ContactBadges badges={badges} /></span>
+          <><ContactBadges badges={badges} /></>
         </div>
         {this.props.showContextMenu ?
           <span className="menuTrigger">
diff --git a/src/widgets/error-panel.jsx b/src/widgets/error-panel.jsx
index 9e47121c..c4d91845 100644
--- a/src/widgets/error-panel.jsx
+++ b/src/widgets/error-panel.jsx
@@ -35,14 +35,14 @@ export default class ErrorPanel extends React.PureComponent {
     return (
       <div className={className}>
         <div className="icon"><i className="material-icons">{level}</i></div>
-        <span>
+        <>
           <span dangerouslySetInnerHTML={{__html: this.props.text}} />
           {this.props.action ?
             <a href="#" onClick={(e) => {e.preventDefault(); this.props.action();}}>
               {this.props.actionText}
             </a>
           : null}
-        </span>
+        </>
         <div className="cancel"><MenuCancel onCancel={this.hide} /></div>
       </div>
     );
diff --git a/src/widgets/tag-manager.jsx b/src/widgets/tag-manager.jsx
index 3bd0181d..a4c67fca 100644
--- a/src/widgets/tag-manager.jsx
+++ b/src/widgets/tag-manager.jsx
@@ -137,7 +137,7 @@ export default class TagManager extends React.Component {
             <i className="material-icons">edit</i> &nbsp;<FormattedMessage id="title_manage_tags" defaultMessage="Manage"
               description="Section title for the list of tags" />
           </a>
-          <span>{tags}</span>
+          <>{tags}</>
         </div>
       }
       </div>