diff --git a/public/app/features/serviceaccounts/components/CreateTokenModal.tsx b/public/app/features/serviceaccounts/components/CreateTokenModal.tsx
index ba48c05a717..5a90a71839b 100644
--- a/public/app/features/serviceaccounts/components/CreateTokenModal.tsx
+++ b/public/app/features/serviceaccounts/components/CreateTokenModal.tsx
@@ -8,11 +8,7 @@ import {
   ClipboardButton,
   DatePickerWithInput,
   Field,
-  FieldSet,
-  HorizontalGroup,
-  Icon,
   Input,
-  Label,
   Modal,
   RadioButtonGroup,
   useStyles2,
@@ -76,12 +72,7 @@ export const CreateTokenModal = ({ isOpen, token, serviceAccountLogin, onCreateT
     onClose();
   };
 
-  const modalTitle = (
-    <div className={styles.modalHeaderTitle}>
-      <Icon className={styles.modalHeaderIcon} name="key-skeleton-alt" size="lg" />
-      <span>{!token ? 'Add service account token' : 'Service account token created'}</span>
-    </div>
-  );
+  const modalTitle = !token ? 'Add service account token' : 'Service account token created';
 
   return (
     <Modal
@@ -93,77 +84,73 @@ export const CreateTokenModal = ({ isOpen, token, serviceAccountLogin, onCreateT
     >
       {!token ? (
         <div>
-          <FieldSet>
-            <Field
-              label="Display name"
-              description="Name to easily identify the token"
-              className={styles.modalRow}
-              // for now this is required
-              // need to make this optional in backend as well
-              required={true}
-            >
-              <Input
-                name="tokenName"
-                value={newTokenName}
-                placeholder={defaultTokenName}
-                onChange={(e) => {
-                  setNewTokenName(e.currentTarget.value);
-                }}
-              />
-            </Field>
+          <Field
+            label="Display name"
+            description="Name to easily identify the token"
+            // for now this is required
+            // need to make this optional in backend as well
+            required={true}
+          >
+            <Input
+              name="tokenName"
+              value={newTokenName}
+              placeholder={defaultTokenName}
+              onChange={(e) => {
+                setNewTokenName(e.currentTarget.value);
+              }}
+            />
+          </Field>
+          <Field label="Expiration">
             <RadioButtonGroup
-              className={styles.modalRow}
               options={EXPIRATION_OPTIONS}
               value={isWithExpirationDate}
               onChange={setIsWithExpirationDate}
               size="md"
             />
-            {isWithExpirationDate && (
-              <Field label="Expiration date" className={styles.modalRow}>
-                <DatePickerWithInput
-                  onChange={onExpirationDateChange}
-                  value={newTokenExpirationDate}
-                  placeholder=""
-                  minDate={tomorrow}
-                />
-              </Field>
-            )}
-          </FieldSet>
-          <Button onClick={onGenerateToken} disabled={isWithExpirationDate && !isExpirationDateValid}>
-            Generate token
-          </Button>
+          </Field>
+          {isWithExpirationDate && (
+            <Field label="Expiration date">
+              <DatePickerWithInput
+                onChange={onExpirationDateChange}
+                value={newTokenExpirationDate}
+                placeholder=""
+                minDate={tomorrow}
+              />
+            </Field>
+          )}
+          <Modal.ButtonRow>
+            <Button onClick={onGenerateToken} disabled={isWithExpirationDate && !isExpirationDateValid}>
+              Generate token
+            </Button>
+          </Modal.ButtonRow>
         </div>
       ) : (
         <>
-          <FieldSet>
-            <Label
-              description="You will not be able to see or generate it again. Loosing a token requires creating new one."
-              className={styles.modalRow}
-            >
-              Copy the token. It will be showed only once.
-            </Label>
-            <Field label="Token" className={styles.modalRow}>
-              <div className={styles.modalTokenRow}>
-                <Input name="tokenValue" value={token} readOnly />
-                <ClipboardButton
-                  className={styles.modalCopyToClipboardButton}
-                  variant="secondary"
-                  size="md"
-                  getText={() => token}
-                >
-                  <Icon name="copy" /> Copy to clipboard
-                </ClipboardButton>
-              </div>
-            </Field>
-          </FieldSet>
-          <HorizontalGroup>
+          <Field
+            label="Token"
+            description="Copy the token now as you will not be able to see it again. Loosing a token requires creating a new one."
+          >
+            <div className={styles.modalTokenRow}>
+              <Input name="tokenValue" value={token} readOnly />
+              <ClipboardButton
+                className={styles.modalCopyToClipboardButton}
+                variant="secondary"
+                size="md"
+                icon="copy"
+                getText={() => token}
+              >
+                Copy clipboard
+              </ClipboardButton>
+            </div>
+          </Field>
+          <Modal.ButtonRow>
             <ClipboardButton variant="primary" getText={() => token} onClipboardCopy={onCloseInternal}>
               Copy to clipboard and close
             </ClipboardButton>
             <Button variant="secondary" onClick={onCloseInternal}>
               Close
             </Button>
-          </HorizontalGroup>
+          </Modal.ButtonRow>
         </>
       )}
     </Modal>
@@ -185,29 +172,11 @@ const getStyles = (theme: GrafanaTheme2) => {
     modalContent: css`
       overflow: visible;
     `,
-    modalRow: css`
-      margin-bottom: ${theme.spacing(4)};
-    `,
     modalTokenRow: css`
       display: flex;
     `,
     modalCopyToClipboardButton: css`
       margin-left: ${theme.spacing(0.5)};
     `,
-    modalHeaderTitle: css`
-      font-size: ${theme.typography.size.lg};
-      margin: ${theme.spacing(0, 4, 0, 1)};
-      display: flex;
-      align-items: center;
-      position: relative;
-      top: 2px;
-    `,
-    modalHeaderIcon: css`
-      margin-right: ${theme.spacing(2)};
-      font-size: inherit;
-      &:before {
-        vertical-align: baseline;
-      }
-    `,
   };
 };