diff --git a/typo3/sysext/rte_ckeditor/Classes/Controller/BrowseLinksController.php b/typo3/sysext/rte_ckeditor/Classes/Controller/BrowseLinksController.php
index 8b411c1615f49d1b2c930507b58527fc2b392197..9eac2a014b20996caef7db6bbdeaaa62647467cd 100644
--- a/typo3/sysext/rte_ckeditor/Classes/Controller/BrowseLinksController.php
+++ b/typo3/sysext/rte_ckeditor/Classes/Controller/BrowseLinksController.php
@@ -422,11 +422,11 @@ class BrowseLinksController extends AbstractLinkBrowserController
 				<form action="" name="ltargetform" id="ltargetform" class="t3js-dummyform form-horizontal">
                     <div class="form-group form-group-sm" ' . ($targetSelectorConfig['disabled'] ? ' style="display: none;"' : '') . '>
                         <label class="col-xs-4 control-label">' . htmlspecialchars($lang->getLL('target')) . '</label>
-						<div class="col-xs-3">
+						<div class="col-xs-4">
 							<input type="text" name="ltarget" class="t3js-linkTarget form-control"
 							    value="' . htmlspecialchars($target) . '" />
 						</div>
-						<div class="col-xs-3">
+						<div class="col-xs-4">
 							' . $targetSelector . '
 						</div>
 					</div>
@@ -493,17 +493,19 @@ class BrowseLinksController extends AbstractLinkBrowserController
         $selectClass = '';
         if ($this->classesAnchorJSOptions[$this->displayedLinkHandlerId]) {
             $selectClass = '
-				<form action="" name="lclassform" id="lclassform" class="t3js-dummyform">
-					<table border="0" cellpadding="2" cellspacing="1" id="typo3-linkClass">
-						<tr>
-							<td style="width: 96px;">' . htmlspecialchars($this->getLanguageService()->getLL('class')) . '</td>
-							<td><select name="lclass" class="t3js-class-selector form-control">
-								' . $this->classesAnchorJSOptions[$this->displayedLinkHandlerId] . '
-							</select></td>
-						</tr>
-					</table>
-				</form>
-				';
+                <form action="" name="lclassform" id="lclassform" class="t3js-dummyform form-horizontal">
+                    <div class="form-group form-group-sm">
+                        <label class="col-xs-4 control-label">
+                            ' . htmlspecialchars($this->getLanguageService()->getLL('class')) . '
+                        </label>
+                        <div class="col-xs-8">
+                            <select name="lclass" class="t3js-class-selector form-control">
+                                ' . $this->classesAnchorJSOptions[$this->displayedLinkHandlerId] . '
+                            </select>
+                        </div>
+                    </div>
+                </form>
+            ';
         }
         return $selectClass;
     }
diff --git a/typo3/sysext/rtehtmlarea/Classes/Controller/BrowseLinksController.php b/typo3/sysext/rtehtmlarea/Classes/Controller/BrowseLinksController.php
index e425f81208033b0b52abcb9c02bdb01b8e7e08fb..86bcc417a3ee6c1a63e3cb78218b6f234248f23b 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Controller/BrowseLinksController.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Controller/BrowseLinksController.php
@@ -478,11 +478,11 @@ class BrowseLinksController extends AbstractLinkBrowserController
 				<form action="" name="ltargetform" id="ltargetform" class="t3js-dummyform form-horizontal">
                     <div class="form-group form-group-sm" ' . ($targetSelectorConfig['disabled'] ? ' style="display: none;"' : '') . '>
                         <label class="col-xs-4 control-label">' . htmlspecialchars($lang->getLL('target')) . '</label>
-						<div class="col-xs-3">
+						<div class="col-xs-4">
 							<input type="text" name="ltarget" class="t3js-linkTarget form-control"
 							    value="' . htmlspecialchars($target) . '" />
 						</div>
-						<div class="col-xs-3">
+						<div class="col-xs-4">
 							' . $targetSelector . '
 						</div>
 					</div>
@@ -549,17 +549,19 @@ class BrowseLinksController extends AbstractLinkBrowserController
         $selectClass = '';
         if ($this->classesAnchorJSOptions[$this->displayedLinkHandlerId]) {
             $selectClass = '
-				<form action="" name="lclassform" id="lclassform" class="t3js-dummyform">
-					<table border="0" cellpadding="2" cellspacing="1" id="typo3-linkClass">
-						<tr>
-							<td style="width: 96px;">' . htmlspecialchars($this->getLanguageService()->getLL('anchor_class')) . '</td>
-							<td><select name="lclass" class="t3js-class-selector form-control">
-								' . $this->classesAnchorJSOptions[$this->displayedLinkHandlerId] . '
-							</select></td>
-						</tr>
-					</table>
-				</form>
-				';
+                <form action="" name="lclassform" id="lclassform" class="t3js-dummyform form-horizontal">
+                    <div class="form-group form-group-sm">
+                        <label class="col-xs-4 control-label">
+                            ' . htmlspecialchars($this->getLanguageService()->getLL('anchor_class')) . '
+                        </label>
+                        <div class="col-xs-8">
+                            <select name="lclass" class="t3js-class-selector form-control">
+                                ' . $this->classesAnchorJSOptions[$this->displayedLinkHandlerId] . '
+                            </select>
+                        </div>
+                    </div>
+                </form>
+            ';
         }
         return $selectClass;
     }