diff --git a/src/pages-and-resources/discussions/DiscussionsSettings.jsx b/src/pages-and-resources/discussions/DiscussionsSettings.jsx
index ebcd2bff5..e2c11c9a6 100644
--- a/src/pages-and-resources/discussions/DiscussionsSettings.jsx
+++ b/src/pages-and-resources/discussions/DiscussionsSettings.jsx
@@ -76,9 +76,9 @@ function DiscussionsSettings({ courseId, intl }) {
                   </PageRoute>
                 </Switch>
               </Stepper.Body>
-              <Stepper.Footer className="d-flex justify-content-end align-items-center">
+              <Stepper.Footer className={`d-flex ${isFirstStep ? 'justify-content-end' : 'justify-content-between'} align-items-center`}>
                 {!isFirstStep && (
-                  <Button variant="outline-primary" className="mr-2" onClick={handleBack}>
+                  <Button variant="outline-primary" className="ml-2" onClick={handleBack}>
                     {intl.formatMessage(messages.backButton)}
                   </Button>
                 )}
diff --git a/src/pages-and-resources/discussions/app-config-form/AppConfigFormApplyButton.jsx b/src/pages-and-resources/discussions/app-config-form/AppConfigFormApplyButton.jsx
index 9b76d0c7b..3806ace2c 100644
--- a/src/pages-and-resources/discussions/app-config-form/AppConfigFormApplyButton.jsx
+++ b/src/pages-and-resources/discussions/app-config-form/AppConfigFormApplyButton.jsx
@@ -26,7 +26,7 @@ function AppConfigFormApplyButton({ intl }) {
         complete: intl.formatMessage(messages.appliedButton),
       }}
       state={submitButtonState}
-      className="mr-3"
+      className="mr-2"
       onClick={handleApply}
     />
   );
diff --git a/src/pages-and-resources/discussions/app-list/AppListNextButton.jsx b/src/pages-and-resources/discussions/app-list/AppListNextButton.jsx
index c425c15e1..0a98e1b69 100644
--- a/src/pages-and-resources/discussions/app-list/AppListNextButton.jsx
+++ b/src/pages-and-resources/discussions/app-list/AppListNextButton.jsx
@@ -17,7 +17,7 @@ function AppListNextButton({ intl }) {
   }, [discussionsPath, selectedAppId]);
 
   return (
-    <Button variant="primary" onClick={handleStartConfig}>
+    <Button variant="primary" onClick={handleStartConfig} className="mr-2">
       {intl.formatMessage(messages.nextButton)}
     </Button>
   );