diff --git a/i18n/en.json b/i18n/en.json
index 9c97624ab..c0c1d15d9 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -5,7 +5,7 @@
 	"discussiontools": "Discussion tools",
 	"discussiontools-autotopicsubpopup-body": "You will receive a notification when someone posts a new comment in this discussion. You can adjust your notifications settings in preferences.",
 	"discussiontools-autotopicsubpopup-dismiss": "Okay, I got it",
-	"discussiontools-autotopicsubpopup-preferences": "Preferences",
+	"discussiontools-autotopicsubpopup-preferences": "Edit preferences",
 	"discussiontools-autotopicsubpopup-title": "You have been subscribed",
 	"discussiontools-defaultsummary-reply": "Reply",
 	"discussiontools-desc": "Tools to enhance discussion pages.",
diff --git a/modules/controller.js b/modules/controller.js
index 8c98b8338..51c58b3ad 100644
--- a/modules/controller.js
+++ b/modules/controller.js
@@ -356,6 +356,7 @@ function maybeShowFirstTimeAutoTopicSubPopup() {
 				.append( new OO.ui.ButtonWidget( {
 					label: mw.msg( 'discussiontools-autotopicsubpopup-preferences' ),
 					href: mw.util.getUrl( 'Special:Preferences#mw-prefsection-editing-discussion' ),
+					flags: [ 'progressive' ],
 					framed: false
 				} ).$element )
 		);
diff --git a/modules/dt.init.less b/modules/dt.init.less
index 957747037..2158fbf88 100644
--- a/modules/dt.init.less
+++ b/modules/dt.init.less
@@ -276,17 +276,20 @@ span[ data-mw-comment-start ] {
 			top: 0;
 			right: 0;
 			height: 100%;
+			z-index: 1;
 		}
 
 		&-body {
 			margin-bottom: 1em;
 			margin-top: 1em;
+			margin-right: 200px;
 		}
 
 		&-title,
-		&-body,
 		&-actions {
-			margin-right: 200px;
+			margin-right: 150px;
+			position: relative;
+			z-index: 2;
 		}
 	}