diff --git a/admin/css/screen.css b/admin/css/screen.css
index a49672b11..f10be22b0 100644
--- a/admin/css/screen.css
+++ b/admin/css/screen.css
@@ -565,7 +565,7 @@ body.cms-dialog { overflow: auto; background: url("../images/textures/bg_cms_mai
 .htmleditorfield-dialog .ui-tabs ul.ui-tabs-nav li.ui-state-active { background: #f0f3f4 url("../admin/images/textures/bg_cms_main_content.png") repeat left top; }
 .htmleditorfield-dialog .ui-tabs ul.ui-tabs-nav li.ui-state-active a { color: #444444; text-shadow: none; }
 .htmleditorfield-dialog .ui-tabs .ui-tabs-panel { padding: 0; }
-.htmleditorfield-dialog .ss-insert-media, .htmleditorfield-dialog .Actions { padding: 8px 16px; }
+.htmleditorfield-dialog .ss-insert-media, .htmleditorfield-dialog .Actions, .htmleditorfield-dialog .ss-insert-link { padding: 8px 16px; }
 .htmleditorfield-dialog .details .file-url { display: block; width: 450px; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; -o-text-overflow: ellipsis; }
 .htmleditorfield-dialog .details .cms-file-info .field { border: none; -webkit-box-shadow: 0 0 0 rgba(0, 0, 0, 0); -moz-box-shadow: 0 0 0 rgba(0, 0, 0, 0); box-shadow: 0 0 0 rgba(0, 0, 0, 0); }
 .htmleditorfield-dialog .details .field { border-bottom: 1px solid rgba(201, 205, 206, 0.8); -webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); -moz-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); }
diff --git a/admin/scss/_style.scss b/admin/scss/_style.scss
index 8726c9678..14b3feba4 100644
--- a/admin/scss/_style.scss
+++ b/admin/scss/_style.scss
@@ -1550,7 +1550,7 @@ body.cms-dialog {
 			padding:0;
 		}
 	}
-	.ss-insert-media, .Actions{
+	.ss-insert-media, .Actions, .ss-insert-link{
 		padding:$grid-y $grid-x*2 ;
 	}
 	.details{
diff --git a/forms/HtmlEditorField.php b/forms/HtmlEditorField.php
index 1da956135..45a56d9f1 100644
--- a/forms/HtmlEditorField.php
+++ b/forms/HtmlEditorField.php
@@ -299,9 +299,11 @@ class HtmlEditorField_Toolbar extends RequestHandler {
 			$this->controller,
 			"{$this->name}/LinkForm", 
 			new FieldList(
-				new LiteralField(
-					'Heading', 
-					sprintf('<h3>%s</h3>', _t('HtmlEditorField.LINK', 'Insert Link'))
+				$headerWrap = new CompositeField(
+					new LiteralField(
+						'Heading', 
+						sprintf('<h3 class="htmleditorfield-mediaform-heading insert">%s</h3>', _t('HtmlEditorField.LINK', 'Insert Link'))
+					)
 				),
 				$contentComposite = new CompositeField(
 					new OptionsetField(
@@ -340,8 +342,9 @@ class HtmlEditorField_Toolbar extends RequestHandler {
 					->setUseButtonTag(true)
 			)
 		);
-		
-		$contentComposite->addExtraClass('content');
+
+		$headerWrap->addExtraClass('CompositeField composite cms-content-header nolabel ');		
+		$contentComposite->addExtraClass('ss-insert-link content');
 		
 		$form->unsetValidator();
 		$form->loadDataFrom($this);