diff --git a/api/etemplate.php b/api/etemplate.php
index c5dd4ac56a..146577705f 100644
--- a/api/etemplate.php
+++ b/api/etemplate.php
@@ -67,6 +67,9 @@ function send_template()
 		// fix <textbox multiline="true" .../> --> <textarea .../> (et2-prefix and self-closing is handled below)
 		$str = preg_replace('#<textbox(.*?)\smultiline="true"(.*?)/>#u', '<textarea$1$2/>', $str);
 
+		// fix <buttononly.../> --> <button type="buttononly".../>
+		$str = preg_replace('#<buttononly\s(.*?)/>#u', '<button type="buttononly" $1/>', $str);
+
 		$str = preg_replace_callback(ADD_ET2_PREFIX_REGEXP, static function (array $matches)
 		{
 			return '<' . $matches[2] . 'et2-' . $matches[3] .
@@ -120,4 +123,4 @@ function send_template()
 	echo $str;
 
 	exit;    // stop further processing eg. redirect to login
-}
\ No newline at end of file
+}
diff --git a/api/templates/default/etemplate2.css b/api/templates/default/etemplate2.css
index 2530ce881f..548d41eccf 100644
--- a/api/templates/default/etemplate2.css
+++ b/api/templates/default/etemplate2.css
@@ -315,6 +315,9 @@ button.et2_button_with_image {
 button.et2_button_with_image.et2_button_text {
 	background-position: 4px center;
 }
+button.et2_buttonFitContent, et2-button.et2_buttonFitContent {
+	max-width: fit-content;
+}
 /* et2_box_widget ###*/
 button[id="cancel"],
 button#cancel {
@@ -3370,4 +3373,4 @@ span.et2_countdown_seconds {
 }
 .et2_audio audio {
     outline: none;
-}
\ No newline at end of file
+}
diff --git a/filemanager/templates/default/admin.xet b/filemanager/templates/default/admin.xet
index 56a4e6f9e1..b55c9c0b23 100644
--- a/filemanager/templates/default/admin.xet
+++ b/filemanager/templates/default/admin.xet
@@ -85,10 +85,8 @@
 			</rows>
 		</grid>
 		<vbox class="filemanager_config">
-			<button label="Mount /etemplates to allow customizing of eTemplates" id="etemplates"/>
-			<menulist>
-				<menupopup id="allow_delete_versions" onchange="1" label="Who should be allowed to finally delete deleted files or old versions of a file:" empty_label="Noone" disabled="!@versioning"/>
-			</menulist>
+			<button label="Mount /etemplates to allow customizing of eTemplates" id="etemplates" class="et2_buttonFitContent"/>
+			<select id="allow_delete_versions" onchange="1" label="Who should be allowed to finally delete deleted files or old versions of a file:" empty_label="Noone" disabled="!@versioning"/>
 			<hbox disabled="!@versioning">
 				<integer id="mtime" label="Delete all older versions and deleted files older then %s days" statustext="0 means all, -N newer then N days"/>
 				<textbox size="30" label="under directory" id="versionedpath" statustext="/ = everywhere"/>