diff --git a/view/tpl/connections.tpl b/view/tpl/connections.tpl
index f6ee1b1db..1719a6522 100644
--- a/view/tpl/connections.tpl
+++ b/view/tpl/connections.tpl
@@ -19,7 +19,7 @@
 		<form action="{{$cmd}}" method="get" id="mimimi" name="contacts-search-form">
 			<div class="input-group mb-3">
 				<input type="text" name="search" id="contacts-search" class="form-control" onfocus="this.select();" value="{{$search}}" placeholder="{{$desc}}" />
-				<button id="contacts-search-submit" class="btn btn-sm btn-outline-secondary" type="submit"><i class="fa fa-fw fa-search"></i></button>
+				<button id="contacts-search-submit" class="btn btn-outline-secondary" type="submit"><i class="fa fa-fw fa-search"></i></button>
 			</div>
 		</form>
 	</div>
diff --git a/view/tpl/follow.tpl b/view/tpl/follow.tpl
index 53325fdce..7adbc03ec 100644
--- a/view/tpl/follow.tpl
+++ b/view/tpl/follow.tpl
@@ -3,7 +3,7 @@
 	<form action="follow" method="post" />
 		<div class="input-group">
 			<input class="form-control" type="text" name="url" title="{{$hint}}" placeholder="{{$desc}}" />
-			<button class="btn btn-sm btn-success" type="submit" name="submit" value="{{$follow}}" title="{{$follow}}"><i class="fa fa-fw fa-plus"></i></button>
+			<button class="btn btn-success" type="submit" name="submit" value="{{$follow}}" title="{{$follow}}"><i class="fa fa-fw fa-plus"></i></button>
 		</div>
 	</form>
 	{{if $abook_usage_message}}
diff --git a/view/tpl/peoplefind.tpl b/view/tpl/peoplefind.tpl
index 2ede221f3..1dc02e4c3 100644
--- a/view/tpl/peoplefind.tpl
+++ b/view/tpl/peoplefind.tpl
@@ -3,7 +3,7 @@
 	<form action="directory" method="post" />
 		<div class="input-group mb-3">
 			<input class="form-control" type="text" name="search" title="{{$hint}}{{if $advanced_search}}{{$advanced_hint}}{{/if}}" placeholder="{{$desc}}" />
-			<button class="btn btn-sm btn-outline-secondary" type="submit" name="submit"><i class="fa fa-fw fa-search"></i></button>
+			<button class="btn btn-outline-secondary" type="submit" name="submit"><i class="fa fa-fw fa-search"></i></button>
 		</div>
 	</form>
 	<ul class="nav nav-pills flex-column">
diff --git a/view/tpl/searchbox.tpl b/view/tpl/searchbox.tpl
index ec855dc5c..c6bbcee82 100644
--- a/view/tpl/searchbox.tpl
+++ b/view/tpl/searchbox.tpl
@@ -2,9 +2,9 @@
 	<input type="hidden" name="f" value="" />
 	<div id="{{$id}}" class="input-group">
 		<input class="form-control" type="text" name="search" id="search-text" value="{{$s}}" onclick="this.submit();" />
-		<button type="submit" name="submit" class="btn btn-sm btn-outline-secondary" id="search-submit" value="{{$search_label}}"><i class="fa fa-search"></i></button>
+		<button type="submit" name="submit" class="btn btn-outline-secondary" id="search-submit" value="{{$search_label}}"><i class="fa fa-search"></i></button>
 		{{if $savedsearch}}
-		<button type="submit" name="searchsave" class="btn btn-sm btn-outline-secondary" id="search-save" value="{{$save_label}}"><i class="fa fa-floppy-o"></i></button>
+		<button type="submit" name="searchsave" class="btn btn-outline-secondary" id="search-save" value="{{$save_label}}"><i class="fa fa-floppy-o"></i></button>
 		{{/if}}
 	</div>
 </form>
diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl
index bf3f64508..640678ae8 100644
--- a/view/tpl/wiki.tpl
+++ b/view/tpl/wiki.tpl
@@ -67,7 +67,7 @@
 			<div id="id_{{$commitMsg.0}}_wrapper" class="field input" style="display: none">
 				<div class="input-group">
 					<input class="form-control" name="{{$commitMsg.0}}" id="id_{{$commitMsg.0}}" type="text" value="{{$commitMsg.2}}"{{if $commitMsg.5}} {{$commitMsg.5}}{{/if}}>
-					<button id="save-page" type="button" class="btn btn-sm btn-primary disabled">Save</button>
+					<button id="save-page" type="button" class="btn btn-primary disabled">Save</button>
 				</div>
 			</div>
 			{{/if}}