Minor tweaks, button fixes

Signed-off-by: Tim Hansen <timbonicus@gmail.com>

packages/core-components/src/components/SupportButton/SupportButton.tsx

@@ -28,7 +28,7 @@ import {
   makeStyles,
   Popover,
 } from '@material-ui/core';
-import React, { Fragment, MouseEventHandler, useState } from 'react';
+import React, { MouseEventHandler, useState } from 'react';
 import { SupportItem, SupportItemLink, useSupportConfig } from '../../hooks';
 import { Link } from '../Link';
 
@@ -94,17 +94,17 @@ export const SupportButton = ({ title, children }: SupportButtonProps) => {
   };
 
   return (
-    <Fragment>
-      <Button
-        data-testid="support-button"
-        color="primary"
-        onClick={onClickHandler}
-      >
-        <Box mr={1} height={24}>
-          <HelpIcon />
-        </Box>
-        Support
-      </Button>
+    <>
+      <Box ml={1}>
+        <Button
+          data-testid="support-button"
+          color="primary"
+          onClick={onClickHandler}
+          startIcon={<HelpIcon />}
+        >
+          Support
+        </Button>
+      </Box>
       <Popover
         data-testid="support-button-popover"
         open={popoverOpen}
@@ -141,6 +141,6 @@ export const SupportButton = ({ title, children }: SupportButtonProps) => {
           </Button>
         </DialogActions>
       </Popover>
-    </Fragment>
+    </>
   );
 };

packages/core-components/src/layout/ContentHeader/ContentHeader.tsx

@@ -18,7 +18,7 @@
  * TODO favoriteable capability
  */
 
-import React, { ComponentType, Fragment, PropsWithChildren } from 'react';
+import React, { ComponentType, PropsWithChildren } from 'react';
 import { Typography, makeStyles } from '@material-ui/core';
 import { Helmet } from 'react-helmet';
 
@@ -98,7 +98,7 @@ export const ContentHeader = ({
     <ContentHeaderTitle title={title} className={classes.title} />
   );
   return (
-    <Fragment>
+    <>
       <Helmet title={title} />
       <div className={classes.container}>
         <div className={classes.leftItemsBox}>
@@ -111,6 +111,6 @@ export const ContentHeader = ({
         </div>
         <div className={classes.rightItemsBox}>{children}</div>
       </div>
-    </Fragment>
+    </>
   );
 };