diff --git a/src/components/Select.js b/src/components/Select.js
index 73752a9fc..49b6af251 100644
--- a/src/components/Select.js
+++ b/src/components/Select.js
@@ -18,6 +18,13 @@ const portalStyle = css`
   position: relative;
 `;
 
+const iconStyling = css`
+  display: inline-block;
+  margin-right: ${theme.size.small};
+  max-height: 20px;
+  width: 30px;
+`;
+
 /* Override LG mobile style of enlarged mobile font */
 const selectStyle = css`
   @media ${theme.screenSize.upToLarge} {
@@ -83,10 +90,11 @@ const Select = ({
           <Option
             className={cx(optionStyling)}
             key={choice.value}
-            glyph={choice.icon}
             value={choice.value}
+            glyph={choice.icon}
             role="option"
           >
+            {choice.tabSelectorIcon && <choice.tabSelectorIcon className={cx(iconStyling)} />}
             {choice.text}
           </Option>
         ))}
diff --git a/src/components/Tabs/TabSelectors.js b/src/components/Tabs/TabSelectors.js
index d310903b8..436b5fe54 100644
--- a/src/components/Tabs/TabSelectors.js
+++ b/src/components/Tabs/TabSelectors.js
@@ -24,7 +24,7 @@ const makeChoices = ({ name, iconMapping, options }) =>
   Object.entries(options).map(([tabId, title]) => ({
     text: getPlaintext(title),
     value: tabId,
-    ...(name === 'drivers' && { icon: iconMapping[tabId] }),
+    ...(name === 'drivers' && { tabSelectorIcon: iconMapping[tabId] }),
   }));
 
 const TabSelector = ({ activeTab, handleClick, iconMapping, name, options }) => {