diff --git a/src/components/CodeAssignmentModal/index.jsx b/src/components/CodeAssignmentModal/index.jsx
index 3d56d5d66e..da582a51ca 100644
--- a/src/components/CodeAssignmentModal/index.jsx
+++ b/src/components/CodeAssignmentModal/index.jsx
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { reduxForm, SubmissionError } from 'redux-form';
 import {
-  Button, Icon, ModalDialog, ActionRow, Form,
+  Button, ModalDialog, ActionRow, Form, Spinner,
 } from '@edx/paragon';
 import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 
@@ -423,7 +423,7 @@ export class BaseCodeAssignmentModal extends React.Component {
               data-testid={SUBMIT_BUTTON_TEST_ID}
             >
               <>
-              {mode === MODAL_TYPES.assign && submitting && <Spinner animation="border" className="mr-2" variant="light" size="sm" />}
+                {mode === MODAL_TYPES.assign && submitting && <Spinner animation="border" className="mr-2" variant="light" size="sm" />}
                 {`Assign ${isBulkAssign ? 'Codes' : 'Code'}`}
               </>
             </Button>,
diff --git a/src/components/CodeReminderModal/index.jsx b/src/components/CodeReminderModal/index.jsx
index 7082b021a6..ffc3afe24b 100644
--- a/src/components/CodeReminderModal/index.jsx
+++ b/src/components/CodeReminderModal/index.jsx
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { reduxForm, SubmissionError } from 'redux-form';
 import {
-  Button, Icon, ModalDialog, ActionRow,
+  Button, ModalDialog, ActionRow, Spinner,
 } from '@edx/paragon';
 import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 
diff --git a/src/components/CodeRevokeModal/index.jsx b/src/components/CodeRevokeModal/index.jsx
index 995fec7147..92fff5b65c 100644
--- a/src/components/CodeRevokeModal/index.jsx
+++ b/src/components/CodeRevokeModal/index.jsx
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { Field, reduxForm, SubmissionError } from 'redux-form';
 import {
-  Button, Icon, ModalDialog, ActionRow,
+  Button, ModalDialog, ActionRow, Spinner,
 } from '@edx/paragon';
 import { Info } from '@edx/paragon/icons';
 
diff --git a/src/components/InviteLearnersModal/index.jsx b/src/components/InviteLearnersModal/index.jsx
index 88c773be0c..64c8d61440 100644
--- a/src/components/InviteLearnersModal/index.jsx
+++ b/src/components/InviteLearnersModal/index.jsx
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { Field, reduxForm, SubmissionError } from 'redux-form';
 import {
-  Button, Icon, Alert, ModalDialog, ActionRow,
+  Button, Alert, ModalDialog, ActionRow, Spinner,
 } from '@edx/paragon';
 import { Cancel as ErrorIcon } from '@edx/paragon/icons';
 
@@ -204,7 +204,7 @@ class InviteLearnersModal extends React.Component {
               onClick={handleSubmit(this.handleModalSubmit)}
             >
               <>
-              {submitting && <Spinner animation="border" className="mr-2" variant="primary" size="sm" />}
+                {submitting && <Spinner animation="border" className="mr-2" variant="primary" size="sm" />}
                 Invite learners
               </>
             </Button>,
diff --git a/src/components/settings/SettingsLMSTab/ErrorReporting/tests/ErrorReporting.test.jsx b/src/components/settings/SettingsLMSTab/ErrorReporting/tests/ErrorReporting.test.jsx
index 2a8cf80e1b..6eda3f1724 100644
--- a/src/components/settings/SettingsLMSTab/ErrorReporting/tests/ErrorReporting.test.jsx
+++ b/src/components/settings/SettingsLMSTab/ErrorReporting/tests/ErrorReporting.test.jsx
@@ -9,7 +9,6 @@ import { IntlProvider } from '@edx/frontend-platform/i18n';
 import { getAuthenticatedUser } from '@edx/frontend-platform/auth';
 
 import LmsApiService from '../../../../../data/services/LmsApiService';
-import { features } from '../../../../../config';
 import SyncHistory from '../SyncHistory';
 
 const enterpriseCustomerUuid = 'test-enterprise-id';
diff --git a/src/components/settings/SettingsLMSTab/ErrorReporting/tests/SyncHistory.test.jsx b/src/components/settings/SettingsLMSTab/ErrorReporting/tests/SyncHistory.test.jsx
index 299092d9eb..8f5517e14d 100644
--- a/src/components/settings/SettingsLMSTab/ErrorReporting/tests/SyncHistory.test.jsx
+++ b/src/components/settings/SettingsLMSTab/ErrorReporting/tests/SyncHistory.test.jsx
@@ -9,7 +9,6 @@ import thunk from 'redux-thunk';
 import { Provider } from 'react-redux';
 import { IntlProvider } from '@edx/frontend-platform/i18n';
 import { getAuthenticatedUser } from '@edx/frontend-platform/auth';
-import { features } from '../../../../../config';
 
 import { renderWithRouter } from '../../../../test/testUtils';
 import SettingsLMSTab from '../..';