diff --git a/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateInformationModuleFunctionController.php b/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateInformationModuleFunctionController.php
index 3748c4d6ac5a90fab23e41a2b67ea9802010b858..e3046fe0b404b986bc1f7607d0b3c66cb66aa381 100644
--- a/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateInformationModuleFunctionController.php
+++ b/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateInformationModuleFunctionController.php
@@ -55,22 +55,24 @@ class TypoScriptTemplateInformationModuleFunctionController extends AbstractFunc
 	public function tableRow($label, $data, $field, $id) {
 		$lang = $this->getLanguageService();
 		$ret = '<tr><td>';
+		$startAnchor = '';
 		if ($field === 'config' || $field === 'constants') {
 			$urlParameters = array(
 				'id' => $this->pObj->id
 			);
 			$aHref = BackendUtility::getModuleUrl('web_ts', $urlParameters);
-			$ret .= '<a href="' . htmlspecialchars(($aHref . '&e[' . $field . ']=1')) . '">';
+			$startAnchor = '<a href="' . htmlspecialchars(($aHref . '&e[' . $field . ']=1')) . '">';
 		} else {
 			$params = '&columnsOnly=' . $field . '&createExtension=0' . '&edit[sys_template][' . $id . ']=edit';
 			$editOnClick = BackendUtility::editOnClick($params, $GLOBALS['BACK_PATH'], '');
-			$ret .= '<a href="#" onclick="' . $editOnClick . '">';
+			$startAnchor = '<a href="#" onclick="' . $editOnClick . '">';
 		}
-		$ret .= IconUtility::getSpriteIcon(
-				'actions-document-open',
-				array('title' => $lang->sL('LLL:EXT:lang/locallang_common.xlf:editField', TRUE))
-			) . '<strong>' . $label . '</strong></a>';
-		$ret .= '</td><td width="80%">' . $data . '&nbsp;</td></tr>';
+		$icon = IconUtility::getSpriteIcon(
+			'actions-document-open',
+			array('title' => $lang->sL('LLL:EXT:lang/locallang_common.xlf:editField', TRUE))
+		);
+		$ret .= $startAnchor . '<strong>' . $label . '</strong></a>';
+		$ret .= '</td><td width="80%">' . $data . $startAnchor . '&nbsp;<span class="btn pull-right">' . $icon . '</span></a></td></tr>';
 		return $ret;
 	}