diff --git a/modules/dataquery/jsx/ReplayIcon.tsx b/modules/dataquery/jsx/ReplayIcon.tsx
new file mode 100644
index 00000000000..36b9eb5f317
--- /dev/null
+++ b/modules/dataquery/jsx/ReplayIcon.tsx
@@ -0,0 +1,15 @@
+/* eslint-disable max-len */
+/**
+ *  Replay icon
+ *
+ */
+const ReplayIcon = () => (
+  <svg width="17" height="18" viewBox="0 0 34 31" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M26.4601 4.53984C23.9244 2.00415 20.588 0.426128 17.0192 0.0746371C13.4505 -0.276854 9.8703 0.619939 6.88865 2.61221C3.907 4.60449 1.70839 7.56897 0.667425 11.0006C-0.373537 14.4321 -0.192439 18.1185 1.17986 21.4315C2.55216 24.7446 5.03076 27.4793 8.19333 29.1697C11.3559 30.8602 15.0068 31.4017 18.5239 30.7021C22.041 30.0025 25.2067 28.1051 27.4816 25.3331C29.7565 22.561 30.9999 19.086 30.9999 15.5L28.6749 15.5C28.6749 18.5481 27.6181 21.5019 25.6844 23.8581C23.7507 26.2143 21.0598 27.8271 18.0703 28.4218C15.0807 29.0164 11.9775 28.5561 9.28933 27.1193C6.60114 25.6824 4.49433 23.3579 3.32788 20.5418C2.16142 17.7257 2.00749 14.5923 2.89231 11.6755C3.77712 8.75862 5.64595 6.23881 8.18035 4.54538C10.7148 2.85194 13.7579 2.08967 16.7913 2.38844C19.8248 2.6872 22.6608 4.02853 24.8161 6.18386L26.4601 4.53984Z" fill="#333"/>
+    <path d="M28.8111 11.3382L20.0688 6.56322L29.0193 1.37911L28.8111 11.3382Z" fill="#333"/>
+    <path d="M25 15L10 23L10 7L25 15Z" fill="#333"/>
+  </svg>
+
+);
+
+export default ReplayIcon;
diff --git a/modules/dataquery/jsx/ShareIconA.tsx b/modules/dataquery/jsx/ShareIconA.tsx
new file mode 100644
index 00000000000..b3d48ad557d
--- /dev/null
+++ b/modules/dataquery/jsx/ShareIconA.tsx
@@ -0,0 +1,15 @@
+/* eslint-disable max-len */
+/**
+ * Share IconA
+ */
+const ShareIconA = () => (
+  <svg width="18px" height="19px" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M9 12C9 13.3807 7.88071 14.5 6.5 14.5C5.11929 14.5 4 13.3807 4 12C4 10.6193 5.11929 9.5 6.5 9.5C7.88071 9.5 9 10.6193 9 12Z" stroke="#333" strokeWidth="1.5"/>
+    <path d="M14 6.5L9 10" stroke="#333" strokeWidth="1.5" strokeLinecap="round"/>
+    <path d="M14 17.5L9 14" stroke="#333" strokeWidth="1.5" strokeLinecap="round"/>
+    <path d="M19 18.5C19 19.8807 17.8807 21 16.5 21C15.1193 21 14 19.8807 14 18.5C14 17.1193 15.1193 16 16.5 16C17.8807 16 19 17.1193 19 18.5Z" stroke="#333" strokeWidth="1.5"/>
+    <path d="M19 5.5C19 6.88071 17.8807 8 16.5 8C15.1193 8 14 6.88071 14 5.5C14 4.11929 15.1193 3 16.5 3C17.8807 3 19 4.11929 19 5.5Z" stroke="#333" strokeWidth="1.5"/>
+  </svg>
+);
+
+export default ShareIconA;
diff --git a/modules/dataquery/jsx/welcome.tsx b/modules/dataquery/jsx/welcome.tsx
index 86103fcee4c..4931a9c8a6a 100644
--- a/modules/dataquery/jsx/welcome.tsx
+++ b/modules/dataquery/jsx/welcome.tsx
@@ -12,6 +12,8 @@ import {ButtonElement, CheckboxElement, TextboxElement} from 'jsx/Form';
 import {APIQueryField} from './types';
 import {FullDictionary} from './types';
 import {FlattenedField, FlattenedQuery, VisitOption} from './types';
+import ReplayIcon from './ReplayIcon';
+import ShareIconA from './ShareIconA';
 /**
  * Return the welcome tab for the DQT
  *
@@ -842,7 +844,7 @@ function SingleQueryDisplay(props: {
         props.setNameModalID(query.QueryID);
       }} />;
     msg = <div>{desc}
-            &nbsp;{starredIcon}{sharedIcon}{loadIcon}{nameIcon}{pinIcon}
+            &nbsp;{loadIcon}{nameIcon}{starredIcon}{pinIcon}{sharedIcon}
     </div>;
   } else if (query.SharedBy) {
     const desc = query.Name
@@ -1007,9 +1009,15 @@ function LoadIcon(props: {
 }) {
   return <span onClick={props.onClick}
     title="Reload query"
-    style={{cursor: 'pointer'}}
+    style={{
+      cursor: 'pointer',
+      textAlign: 'center',
+      verticalAlign: 'text-top',
+      width: '35px',
+      height: '28px',
+    }}
     className="fa-stack">
-    <i className="fas fa-sync fa-stack-1x"></i>
+    <ReplayIcon />
   </span>;
 }
 
@@ -1028,11 +1036,16 @@ function ShareIcon(props: {
     isShared?: boolean,
 }) {
   return <span className="fa-stack"
-    style={{cursor: 'pointer'}}
+    style={{
+      cursor: 'pointer',
+      textAlign: 'center',
+      verticalAlign: 'text-top',
+      width: '35px',
+      height: '28px',
+    }}
     title={props.title}
     onClick={props.onClick}>
-    <i style={props.isShared ? {color: 'blue'} : {}}
-      className="fas fa-globe fa-stack-1x" />
+    <ShareIconA />
   </span>;
 }