From ef47ef605bf92e6db2046a2ff0fef92fd5a7584f Mon Sep 17 00:00:00 2001
From: Martin Schoeler <martin.schoeler@rocket.chat>
Date: Wed, 24 Jun 2020 23:55:03 -0300
Subject: [PATCH] Regression: Reset section button (#18007)

Co-authored-by: Tasso Evangelista <tasso.evangelista@rocket.chat>
---
 client/admin/settings/Section.js           | 14 +++++++-------
 packages/rocketchat-i18n/i18n/en.i18n.json |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/client/admin/settings/Section.js b/client/admin/settings/Section.js
index 8f7cc4ee8c0..c1f9d30b46b 100644
--- a/client/admin/settings/Section.js
+++ b/client/admin/settings/Section.js
@@ -58,16 +58,16 @@ export function Section({ children, groupId, hasReset = true, help, sectionName,
 		<FieldGroup>
 			{editableSettings.map((setting) => <Setting key={setting._id} settingId={setting._id} sectionChanged={changed} />)}
 
-			{hasReset && canReset && <Button
-				children={t('Reset_section_settings')}
-				danger
-				data-section={sectionName}
-				ghost
-				onClick={handleResetSectionClick}
-			/>}
 
 			{children}
 		</FieldGroup>
+		{hasReset && canReset && <Button
+			children={t('Reset_section_settings')}
+			danger
+			marginBlockStart={'x16'}
+			data-section={sectionName}
+			onClick={handleResetSectionClick}
+		/>}
 	</Accordion.Item>;
 }
 
diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index 2dd260bb9bb..2b74e061856 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -2962,7 +2962,7 @@
   "Reset": "Reset",
   "Reset_E2E_Key": "Reset E2E Key",
   "Reset_password": "Reset password",
-  "Reset_section_settings": "Reset Section Settings",
+  "Reset_section_settings": "Reset Section to Default",
   "Reset_Connection": "Reset Connection",
   "Responding": "Responding",
   "Response_description_pre": "If the handler wishes to post a response back into the channel, the following JSON should be returned as the body of the response:",