diff --git a/src/settings/App.scss b/src/settings/App.scss
index 9089e6483..665674370 100644
--- a/src/settings/App.scss
+++ b/src/settings/App.scss
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 #groupfolders-wrapper {
-	padding: 30px;
+	padding: calc(var(--default-grid-baseline) * 10) calc(var(--default-grid-baseline) * 10) calc(var(--default-grid-baseline) * 20);
 }
 
 #groupfolders-react-root, #groupfolders-root {
@@ -22,12 +22,12 @@
 	}
 
 	th {
-		border-bottom: 1px #ddd solid;
+		border-bottom: 2px solid var(--color-border);
 		cursor: pointer;
 
 		.sort_arrow {
 			padding-left: 10px;
-			color: #888;
+			color: var(--color-text-maxcontrast);
 		}
 	}
 
@@ -126,6 +126,10 @@
 		max-width: calc(100% - 40px);
 	}
 
+	.newgroup-permissions-default {
+		padding: calc(var(--default-grid-baseline) * 2);
+	}
+
 	thead {
 		tr {
 			th {
@@ -141,11 +145,9 @@
 	tbody {
 		tr {
 			&:not(:last-child) {
-				td {
-					border-bottom: var(--color-border) 1px solid;
-				}
+				border-bottom: 1px solid var(--color-border);
 			}
-			&:not(:last-child):hover {
+			&:hover {
 				td {
 					background-color: var(--color-background-dark);
 					&:first-child {
@@ -156,14 +158,6 @@
 					}
 				}
 			}
-			&:last-child {
-				td {
-					padding: 35px 0;
-				}
-			}
-			&:last-child:hover {
-				background-color: transparent;
-			}
 			td {
 				a {
 					color: var(--color-text-lighter);
@@ -181,16 +175,23 @@
     .groupfolders-pagination {
       display: flex;
       align-items: center;
+	  position: absolute;
+	  bottom: calc(var(--default-grid-baseline) * 2);
+	  right: calc(var(--default-grid-baseline) * 2);
 
       .groupfolders-pagination__list {
         display: flex;
         gap: var(--default-grid-baseline);
         justify-content: center;
+		background-color: var(--color-main-background);
+		border-radius: var(--border-radius-container);
+		padding: var(--default-grid-baseline);
       }
 
-      .groupfolders-pagination__button {
+      .groupfolders-pagination__list button {
         height: var(--default-clickable-area);
         line-height: var(--default-clickable-area);
+		margin: var(--default-grid-baseline);
       }
 
       .groupfolders-pagination__goto-page {
diff --git a/src/settings/App.tsx b/src/settings/App.tsx
index 2cc002e99..7af9e072d 100644
--- a/src/settings/App.tsx
+++ b/src/settings/App.tsx
@@ -377,6 +377,31 @@ export class App extends Component<unknown, AppState> implements OC.Plugin<OC.Se
 				this.setState({ editingGroup: 0, editingMountPoint: 0 })
 			}}>
 			{this.showAdminDelegationForms()}
+
+			<form action="#" onSubmit={this.createRow}>
+				<input
+					className="newgroup-name"
+					value={this.state.newMountPoint}
+					placeholder={t('groupfolders', 'Folder name')}
+					onChange={(event) => {
+						this.setState({ newMountPoint: event.target.value })
+					}}/>
+				<input type="submit"
+					value={t('groupfolders', 'Create')}/>
+				<label className="newgroup-permissions-default">
+					<input
+						type="checkbox"
+						style={{ 'vertical-align': 'middle' } as React.CSSProperties}
+						value={this.state.newACLDefaultNoPermission ? 'true' : 'false'}
+						onChange={(event) => {
+							this.setState({ newACLDefaultNoPermission: event.target.checked })
+						}}/>
+					<span
+						style={{ 'vertical-align': 'middle' } as React.CSSProperties}
+					>{t('groupfolders', 'Do not grant any advanced permissions by default')}</span>
+				</label>
+			</form>
+
 			<table>
 				<thead>
 					<tr>
@@ -406,36 +431,6 @@ export class App extends Component<unknown, AppState> implements OC.Plugin<OC.Se
 				</thead>
 				<FlipMove typeName='tbody' enterAnimation="accordionVertical" leaveAnimation="accordionVertical">
 					{rows}
-					<tr>
-						<td>
-							<form action="#" onSubmit={this.createRow}>
-								<input
-									className="newgroup-name"
-									value={this.state.newMountPoint}
-									placeholder={t('groupfolders', 'Folder name')}
-									onChange={(event) => {
-										this.setState({ newMountPoint: event.target.value })
-									}}/>
-								<br/>
-								<label>
-									<input
-										type="checkbox"
-										style={{ 'vertical-align': 'middle' } as React.CSSProperties}
-										value={this.state.newACLDefaultNoPermission ? 'true' : 'false'}
-										onChange={(event) => {
-											this.setState({ newACLDefaultNoPermission: event.target.checked })
-										}}/>
-									<span
-										style={{ 'vertical-align': 'middle' } as React.CSSProperties}
-									>{t('groupfolders', 'Do not grant any advanced permissions by default')}</span>
-								</label>
-								<br/>
-								<input type="submit"
-									value={t('groupfolders', 'Create')}/>
-							</form>
-						</td>
-						<td colSpan={3}/>
-					</tr>
 				</FlipMove>
 			</table>
 			<nav className="groupfolders-pagination" style={{ display: 'flex', alignItems: 'center' }} aria-label={t('groupfolders', 'Pagination of team folders')}>