diff --git a/core/css/styles.css b/core/css/styles.css
index 5aec3d2ae4436920d64e5a2de192fef189bb925e..6eb09e6e9423889bb0335e6e8ed5e2d1296abbc2 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -166,6 +166,7 @@ input[type="submit"], input[type="button"],
 button, .button,
 #quota, select, .pager li a {
 	width: auto;
+	min-width: 25px;
 	padding: 5px;
 	background-color: rgba(240,240,240,.9);
 	font-weight: bold;
diff --git a/settings/css/settings.css b/settings/css/settings.css
index b67c88a9c8fe94fc323979172b25075652216062..6913e796838be53a0e2c42619d31d3a10cd48410 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -7,7 +7,10 @@ input#openid, input#webdav { width:20em; }
 
 #user-controls {
 	-moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box;
-	position: fixed; right: 0; left:380px; height: 44px;
+	position: fixed;
+	right: 0;
+	left: 230px;
+	height: 44px;
 	padding: 0; margin: 0;
 	background: #eee; border-bottom: 1px solid #e7e7e7;
 	z-index: 50;
diff --git a/settings/templates/users/part.grouplist.php b/settings/templates/users/part.grouplist.php
index a903f43f876e815a754b6e0bcea13365322e300d..593c202f2c91f2a38bd6f5576e5fc516cc601e54 100644
--- a/settings/templates/users/part.grouplist.php
+++ b/settings/templates/users/part.grouplist.php
@@ -8,7 +8,7 @@
 	<li id="newgroup-form">
 		<form>
 			<input type="text" id="newgroupname" placeholder="<?php p($l->t('Group')); ?>..." />
-			<input type="submit" class="button" value="<?php p($l->t('Add Group'))?>" />
+			<input type="submit" class="button icon-add" value="" />
 		</form>
 	</li>
 	<!-- Everyone -->