diff --git a/webapp/src/components/sidebar_right/gitlab_items.tsx b/webapp/src/components/sidebar_right/gitlab_items.tsx
index 486bebd0..a9b5f427 100644
--- a/webapp/src/components/sidebar_right/gitlab_items.tsx
+++ b/webapp/src/components/sidebar_right/gitlab_items.tsx
@@ -2,17 +2,13 @@
 // See LICENSE.txt for license information.
 
 import React from 'react';
-import {GitPullRequestIcon, IssueOpenedIcon, IconProps} from '@primer/octicons-react';
+import {GitPullRequestIcon, IssueOpenedIcon, DotFillIcon, XIcon, MilestoneIcon, CheckIcon, IconProps} from '@primer/octicons-react';
 import {makeStyleFromTheme, changeOpacity} from 'mattermost-redux/utils/theme_utils';
 import {Badge, Tooltip, OverlayTrigger} from 'react-bootstrap';
 import * as CSS from 'csstype';
 
 import {useSelector} from 'react-redux';
 
-import CrossIcon from 'src/images/icons/cross';
-import DotIcon from 'src/images/icons/dot';
-import TickIcon from 'src/images/icons/tick';
-import SignIcon from 'src/images/icons/sign';
 import {formatTimeSince} from 'src/utils/date_utils';
 import {GitlabItemsProps, Label} from 'src/types/gitlab_items';
 import {getSidebarExpanded} from 'src/selectors';
@@ -103,7 +99,7 @@ function GitlabItems({item, theme}: GitlabItemsProps) {
                 }),
             }}
         >
-            <SignIcon/>
+            <MilestoneIcon size='small'/>
             {item.milestone.title}
         </span>
     );
@@ -140,7 +136,7 @@ function GitlabItems({item, theme}: GitlabItemsProps) {
                 <span
                     style={{...style.icon, ...style.iconSuccess}}
                 >
-                    <TickIcon/>
+                    <CheckIcon size='small'/>
                 </span>
             );
             break;
@@ -149,7 +145,7 @@ function GitlabItems({item, theme}: GitlabItemsProps) {
                 <span
                     style={{...style.icon, ...style.iconPending}}
                 >
-                    <DotIcon/>
+                    <DotFillIcon size='small'/>
                 </span>
             );
             break;
@@ -158,7 +154,7 @@ function GitlabItems({item, theme}: GitlabItemsProps) {
                 <span
                     style={{...style.icon, ...style.iconFailed}}
                 >
-                    <CrossIcon/>
+                    <XIcon size='small'/>
                 </span>
             );
         }
diff --git a/webapp/src/images/icons/changes_requested.jsx b/webapp/src/images/icons/changes_requested.jsx
deleted file mode 100644
index 31fdf404..00000000
--- a/webapp/src/images/icons/changes_requested.jsx
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright (c) 2019-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-import React from 'react';
-import {FileDiffIcon} from '@primer/octicons-react';
-
-export default () => (
-    <FileDiffIcon size='small'/>
-);
diff --git a/webapp/src/images/icons/cross.jsx b/webapp/src/images/icons/cross.jsx
deleted file mode 100644
index 2aa29b5f..00000000
--- a/webapp/src/images/icons/cross.jsx
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright (c) 2019-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-import React from 'react';
-import {XIcon} from '@primer/octicons-react';
-
-export default () => (
-    <XIcon size='small'/>
-);
diff --git a/webapp/src/images/icons/dot.jsx b/webapp/src/images/icons/dot.jsx
deleted file mode 100644
index 9efd106e..00000000
--- a/webapp/src/images/icons/dot.jsx
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright (c) 2019-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-import React from 'react';
-import {DotFillIcon} from '@primer/octicons-react';
-
-export default () => (
-    <DotFillIcon size='small'/>
-);
diff --git a/webapp/src/images/icons/sign.jsx b/webapp/src/images/icons/sign.jsx
deleted file mode 100644
index b50915cd..00000000
--- a/webapp/src/images/icons/sign.jsx
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright (c) 2019-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-import React from 'react';
-import {MilestoneIcon} from '@primer/octicons-react';
-
-export default () => (
-    <MilestoneIcon size='small'/>
-);
diff --git a/webapp/src/images/icons/tick.jsx b/webapp/src/images/icons/tick.jsx
deleted file mode 100644
index ee7c1e7e..00000000
--- a/webapp/src/images/icons/tick.jsx
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright (c) 2019-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-import React from 'react';
-import {CheckIcon} from '@primer/octicons-react';
-
-export default () => (
-    <CheckIcon size='small'/>
-);