diff --git a/doc/smarty3-templates.md b/doc/smarty3-templates.md
index 27e2a02305..b39fa117e7 100644
--- a/doc/smarty3-templates.md
+++ b/doc/smarty3-templates.md
@@ -178,14 +178,3 @@ Field parameter:
 2. Current text for the box,
 3. Help text for the input box.
 4. if set to "required" modern browser will check that this input box is filled when submitting the form,
-
-### field_yesno.tpl
-
-A button that has two states *yes* or *no*.
-Field parameter:
-
-0. Name of the input field,
-1. Label for the button,
-2. Current value,
-3. Help text for the button
-4. if set to an array of two values, these two will be used, otherwise "off" and "on".
diff --git a/mod/settings.php b/mod/settings.php
index 3ba5dc2b37..277470ad5b 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -1075,7 +1075,7 @@ function settings_content(App $a)
 		$openid_field = ['openid_url', DI::l10n()->t('OpenID:'), $openid, DI::l10n()->t("\x28Optional\x29 Allow this OpenID to login to this account."), "", "readonly", "url"];
 	}
 
-	$opt_tpl = Renderer::getMarkupTemplate("field_yesno.tpl");
+	$opt_tpl = Renderer::getMarkupTemplate("field_checkbox.tpl");
 	if (DI::config()->get('system', 'publish_all')) {
 		$profile_in_dir = '<input type="hidden" name="profile_in_directory" value="1" />';
 	} else {
diff --git a/view/templates/admin/features.tpl b/view/templates/admin/features.tpl
index f0b696fae4..b1c8bad8fc 100644
--- a/view/templates/admin/features.tpl
+++ b/view/templates/admin/features.tpl
@@ -11,8 +11,8 @@
 	<div class="settings-content-block">
 		{{foreach $f.1 as $fcat}}
 			<div class="settings-block">
-			{{include file="field_yesno.tpl" field=$fcat.0}}
-			{{include file="field_yesno.tpl" field=$fcat.1}}
+			{{include file="field_checkbox.tpl" field=$fcat.0}}
+			{{include file="field_checkbox.tpl" field=$fcat.1}}
 			</div>
 		{{/foreach}}
 
diff --git a/view/templates/dfrn_request.tpl b/view/templates/dfrn_request.tpl
index 27cc72347c..2f6aec62e4 100644
--- a/view/templates/dfrn_request.tpl
+++ b/view/templates/dfrn_request.tpl
@@ -51,7 +51,7 @@
 
 <div id="dfrn-request-info-wrapper" >
 
-{{include file="field_yesno.tpl" field=$does_know_you}}
+{{include file="field_checkbox.tpl" field=$does_know_you}}
 <!--
 <p id="doiknowyou">
 {{$does_know}}
diff --git a/view/templates/field_yesno.tpl b/view/templates/field_yesno.tpl
deleted file mode 100644
index 64f0816647..0000000000
--- a/view/templates/field_yesno.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-
-	<div class="field yesno">
-		<label for="id_{{$field.0}}">{{$field.1}}</label>
-		<div class="onoff" id="id_{{$field.0}}_onoff">
-			<input  type="hidden" name="{{$field.0}}" id="id_{{$field.0}}" value="{{$field.2 nofilter}}" aria-describedby="{{$field.0}}_tip">
-			<a href="#" class="off">
-				{{if $field.4}}{{$field.4.0}}{{else}}OFF{{/if}}
-			</a>
-			<a href="#" class="on">
-				{{if $field.4}}{{$field.4.1}}{{else}}ON{{/if}}
-			</a>
-		</div>
-		{{if $field.3}}
-		<span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3 nofilter}}</span>
-		{{/if}}
-	</div>
diff --git a/view/templates/settings/features.tpl b/view/templates/settings/features.tpl
index 2793e477b1..c69670b48d 100644
--- a/view/templates/settings/features.tpl
+++ b/view/templates/settings/features.tpl
@@ -10,7 +10,7 @@
 <div class="settings-content-block">
 
 {{foreach $f.1 as $fcat}}
-	{{include file="field_yesno.tpl" field=$fcat}}
+	{{include file="field_checkbox.tpl" field=$fcat}}
 {{/foreach}}
 <div class="settings-submit-wrapper" >
 <input type="submit" name="submit" class="settings-features-submit" value="{{$submit}}" />
diff --git a/view/templates/settings/profile/hide-friends.tpl b/view/templates/settings/profile/hide-friends.tpl
index 80e6dcb940..853678d0f2 100644
--- a/view/templates/settings/profile/hide-friends.tpl
+++ b/view/templates/settings/profile/hide-friends.tpl
@@ -1,3 +1,3 @@
 <div id="profile-edit-hide-friends-wrapper">
-	{{include file="field_yesno.tpl" field=$yesno}}
+	{{include file="field_checkbox.tpl" field=$yesno}}
 </div>
diff --git a/view/templates/settings/settings.tpl b/view/templates/settings/settings.tpl
index 617baeb91a..3811e4f25c 100644
--- a/view/templates/settings/settings.tpl
+++ b/view/templates/settings/settings.tpl
@@ -72,10 +72,10 @@
 	<div style="display: none;">
 		<div id="advanced-expire-popup" style="width:auto;height:auto;overflow:auto;">
 			<h3>{{$expire.advanced}}</h3>
-			{{include file="field_yesno.tpl" field=$expire.items}}
-			{{include file="field_yesno.tpl" field=$expire.notes}}
-			{{include file="field_yesno.tpl" field=$expire.starred}}
-			{{include file="field_yesno.tpl" field=$expire.network_only}}
+			{{include file="field_checkbox.tpl" field=$expire.items}}
+			{{include file="field_checkbox.tpl" field=$expire.notes}}
+			{{include file="field_checkbox.tpl" field=$expire.starred}}
+			{{include file="field_checkbox.tpl" field=$expire.network_only}}
 		</div>
 	</div>
 
@@ -130,7 +130,7 @@
 {{include file="field_checkbox.tpl" field=$email_textonly}}
 {{include file="field_checkbox.tpl" field=$detailed_notif}}
 
-{{include file="field_yesno.tpl" field=$desktop_notifications}}
+{{include file="field_checkbox.tpl" field=$desktop_notifications}}
 <script>
 (function(){
     var elm = $("#id_{{$desktop_notifications.0}}_onoff");
diff --git a/view/theme/frio/templates/dfrn_request.tpl b/view/theme/frio/templates/dfrn_request.tpl
index 478f9bf64f..8270ebac21 100644
--- a/view/theme/frio/templates/dfrn_request.tpl
+++ b/view/theme/frio/templates/dfrn_request.tpl
@@ -52,7 +52,7 @@
 
 <div id="dfrn-request-info-wrapper" >
 
-{{include file="field_yesno.tpl" field=$does_know_you}}
+{{include file="field_checkbox.tpl" field=$does_know_you}}
 <!--
 <p id="doiknowyou">
 {{$does_know}}
diff --git a/view/theme/frio/templates/field_yesno.tpl b/view/theme/frio/templates/field_yesno.tpl
deleted file mode 100644
index 22ef4461e4..0000000000
--- a/view/theme/frio/templates/field_yesno.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-
-	<div class="field yesno">
-		<label for="id_{{$field.0}}">{{$field.1}}</label>
-		<div class="onoff toggle btn btn-xs pull-right" id="id_{{$field.0}}_onoff">
-			
-			<div class="switchlabel toggle-group">
-				<input  type="hidden" name="{{$field.0}}" id="id_{{$field.0}}" value="{{$field.2 nofilter}}" aria-describedby="{{$field.0}}_tip">
-				<label class="btn btn-default btn-xs  active toggle-off">
-					{{if $field.4}}{{$field.4.0}}{{else}}OFF{{/if}}
-				</label>
-				<label class="btn btn-primary btn-xs toggle-on">
-					{{if $field.4}}{{$field.4.1}}{{else}}ON{{/if}}
-				</label>
-				<span class="toggle-handle btn btn-default btn-xs"></span>
-			</div>
-		</div>
-		{{if $field.3}}
-		<span class="help-block" id="{{$field.0}}_tip" role="tooltip">{{$field.3 nofilter}}</span>
-		{{/if}}
-	</div>
-	<div class="clear"></div>
diff --git a/view/theme/frio/templates/settings/features.tpl b/view/theme/frio/templates/settings/features.tpl
index e5f8ce065a..1db5fd9669 100644
--- a/view/theme/frio/templates/settings/features.tpl
+++ b/view/theme/frio/templates/settings/features.tpl
@@ -19,7 +19,7 @@
 				<div id="{{$g}}-settings-content" class="panel-collapse collapse" role="tabpanel" aria-labelledby="{{$g}}-settings-title">
 					<div class="section-content-tools-wrapper">
 						{{foreach $f.1 as $fcat}}
-							{{include file="field_yesno.tpl" field=$fcat}}
+							{{include file="field_checkbox.tpl" field=$fcat}}
 						{{/foreach}}
 
 						<div class="form-group pull-right settings-submit-wrapper" >
diff --git a/view/theme/frio/templates/settings/settings.tpl b/view/theme/frio/templates/settings/settings.tpl
index 0a695191f0..3cf750a68b 100644
--- a/view/theme/frio/templates/settings/settings.tpl
+++ b/view/theme/frio/templates/settings/settings.tpl
@@ -113,10 +113,10 @@
 											<h4 class="modal-title">{{$expire.advanced}}</h4>
 										</div>
 										<div class="modal-body">
-											{{include file="field_yesno.tpl" field=$expire.items}}
-											{{include file="field_yesno.tpl" field=$expire.notes}}
-											{{include file="field_yesno.tpl" field=$expire.starred}}
-											{{include file="field_yesno.tpl" field=$expire.network_only}}
+											{{include file="field_checkbox.tpl" field=$expire.items}}
+											{{include file="field_checkbox.tpl" field=$expire.notes}}
+											{{include file="field_checkbox.tpl" field=$expire.starred}}
+											{{include file="field_checkbox.tpl" field=$expire.network_only}}
 										</div>
 									</div>
 								</div>
@@ -192,7 +192,7 @@
 							</div>
 							*}}
 
-							{{include file="field_yesno.tpl" field=$desktop_notifications}}
+							{{include file="field_checkbox.tpl" field=$desktop_notifications}}
 							<script type="text/javascript">
 								(function(){
 									var elm = $("#id_{{$desktop_notifications.0}}_onoff");