diff --git a/apps/federatedfilesharing/templates/settings-admin.php b/apps/federatedfilesharing/templates/settings-admin.php
index 8d04169ea8..187d75f21a 100644
--- a/apps/federatedfilesharing/templates/settings-admin.php
+++ b/apps/federatedfilesharing/templates/settings-admin.php
@@ -6,11 +6,14 @@ script('federatedfilesharing', 'settings-admin');
 
 <?php if($_['internalOnly'] === false): ?>
 
-<div id="fileSharingSettings" class="followupsection">
-	<h3><?php p($l->t('Federated Cloud Sharing'));?></h3>
-	<a target="_blank" rel="noreferrer noopener" class="icon-info svg"
-		title="<?php p($l->t('Open documentation'));?>"
-		href="<?php p(link_to_docs('admin-sharing-federated')); ?>"></a>
+<div id="fileSharingSettings" class="section">
+	<h2>
+		<?php p($l->t('Federated Cloud Sharing'));?>
+		<a target="_blank" rel="noreferrer noopener" class="icon-info svg"
+		   title="<?php p($l->t('Open documentation'));?>"
+		   href="<?php p(link_to_docs('admin-sharing-federated')); ?>"></a>
+	</h2>
+
 	<p class="settings-hint"><?php p($l->t('Adjust how people can share between servers.')); ?></p>
 
 	<p>
diff --git a/apps/federation/css/settings-admin.css b/apps/federation/css/settings-admin.css
index 3fd5f5aea6..c4c846bd81 100644
--- a/apps/federation/css/settings-admin.css
+++ b/apps/federation/css/settings-admin.css
@@ -26,3 +26,7 @@
 	vertical-align: middle;
 	margin-left: 10px;
 }
+
+#ocFederationAddServer #serverUrl {
+	width: 300px;
+}
diff --git a/settings/css/settings.scss b/settings/css/settings.scss
index 30798f0ba8..14900a52af 100644
--- a/settings/css/settings.scss
+++ b/settings/css/settings.scss
@@ -886,6 +886,13 @@ span.version {
 	&:not(:nth-child(2)) {
 		border-top: 1px solid $color-border;
 	}
+
+	/* correctly display help icons next to headings */
+	h2 .icon-info {
+		padding: 6px 20px;
+		vertical-align: text-bottom;
+		display: inline-block;
+	}
 }
 
 .personal-settings-setting-box .section {