diff --git a/apps/systemtags/css/settings.css b/apps/systemtags/css/settings.css
index 5313247227..02713e3521 100644
--- a/apps/systemtags/css/settings.css
+++ b/apps/systemtags/css/settings.css
@@ -1,17 +1,15 @@
 .systemtag-input {
 	display: flex;
-	max-width: 500px;
+	flex-wrap: wrap;
 }
 #systemtags .select2-container {
 	width: 100%;
-	max-width: 500px;
+	max-width: 400px;
+}
+#systemtags .select2-container .select2-choice {
+	height: auto;
 }
 #systemtag_name {
-	flex-grow: 1;
-}
-
-#systemtag_delete,
-#systemtag_reset,
-#systemtag_submit {
-	padding: 8px;
+	width: 100%;
+	max-width: 400px;
 }
\ No newline at end of file
diff --git a/apps/systemtags/templates/admin.php b/apps/systemtags/templates/admin.php
index fa1b07cb18..842648b5aa 100644
--- a/apps/systemtags/templates/admin.php
+++ b/apps/systemtags/templates/admin.php
@@ -49,9 +49,9 @@ style('systemtags', 'settings');
 			<option value="0"><?php p($l->t('Invisible')); ?></option>
 		</select>
 
-		<a id="systemtag_delete" class="hidden icon-delete"><span class="hidden-visually"><?php p($l->t('Delete')); ?></span></a>
-		<a id="systemtag_reset" class="icon-close"><span class="hidden-visually"><?php p($l->t('Reset')); ?></span></a>
-		<a id="systemtag_submit" class="icon-confirm"><span class="hidden-visually"><?php p($l->t('Create')); ?></span></a>
+		<a id="systemtag_delete" class="hidden button"><span><?php p($l->t('Delete')); ?></span></a>
+		<a id="systemtag_reset" class="button"><span><?php p($l->t('Reset')); ?></span></a>
+		<a id="systemtag_submit" class="button"><span><?php p($l->t('Create')); ?></span></a>
 	</div>
 
 </form>