diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html
index 72f4f2b239..0641398185 100644
--- a/phpBB/adm/style/acp_groups.html
+++ b/phpBB/adm/style/acp_groups.html
@@ -114,10 +114,10 @@
 	</dl>
 	<dl>
 		<dt><label>{L_AVATAR_TYPE}{L_COLON}</label></dt>
-		<dd><select name="avatar_driver" id="avatar_driver">
+		<dd><select name="avatar_driver" id="avatar_driver" data-toggable-settings="true">
 			<option value="">{L_NO_AVATAR_CATEGORY}</option>
 			<!-- BEGIN avatar_drivers -->
-			<option value="{avatar_drivers.DRIVER}"<!-- IF avatar_drivers.SELECTED --> selected="selected"<!-- ENDIF -->>{avatar_drivers.L_TITLE}</option>
+			<option value="{avatar_drivers.DRIVER}"<!-- IF avatar_drivers.SELECTED --> selected="selected"<!-- ENDIF --> data-toggle-setting="#avatar_option_{avatar_drivers.DRIVER}">{avatar_drivers.L_TITLE}</option>
 			<!-- END avatar_drivers -->
 		</select></dd>
 	</dl>
@@ -139,8 +139,6 @@
 	</fieldset>
 	</form>
 
-	<!-- INCLUDEJS avatars.js -->
-
 <!-- ELSEIF S_LIST -->
 
 	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
diff --git a/phpBB/adm/style/acp_users_avatar.html b/phpBB/adm/style/acp_users_avatar.html
index 0a72bb0b62..ba0b896e6c 100644
--- a/phpBB/adm/style/acp_users_avatar.html
+++ b/phpBB/adm/style/acp_users_avatar.html
@@ -13,10 +13,10 @@
 		<legend>{L_AVATAR_SELECT}</legend>
 		<dl>
 			<dt><label>{L_AVATAR_TYPE}</label></dt>
-			<dd><select name="avatar_driver" id="avatar_driver">
+			<dd><select name="avatar_driver" id="avatar_driver" data-toggable-settings="true">
 				<option value="">{L_NO_AVATAR_CATEGORY}</option>
 				<!-- BEGIN avatar_drivers -->
-				<option value="{avatar_drivers.DRIVER}"<!-- IF avatar_drivers.SELECTED --> selected="selected"<!-- ENDIF -->>{avatar_drivers.L_TITLE}</option>
+				<option value="{avatar_drivers.DRIVER}"<!-- IF avatar_drivers.SELECTED --> selected="selected"<!-- ENDIF --> data-toggle-setting="#avatar_option_{avatar_drivers.DRIVER}">{avatar_drivers.L_TITLE}</option>
 				<!-- END avatar_drivers -->
 			</select></dd>
 		</dl>
@@ -35,5 +35,3 @@
 	{S_FORM_TOKEN}
 	</fieldset>
 	</form>
-
-	<!-- INCLUDEJS avatars.js -->
diff --git a/phpBB/adm/style/avatars.js b/phpBB/adm/style/avatars.js
deleted file mode 100644
index 26ea24c0db..0000000000
--- a/phpBB/adm/style/avatars.js
+++ /dev/null
@@ -1,15 +0,0 @@
-(function($) {  // Avoid conflicts with other libraries
-
-"use strict";
-
-function avatarHide() {
-    $('#avatar_options > div').hide();
-
-    var selected = $('#avatar_driver').val();
-    $('#avatar_option_' + selected).show();
-}
-
-avatarHide();
-$('#avatar_driver').bind('change', avatarHide);
-
-})(jQuery); // Avoid conflicts with other libraries
diff --git a/phpBB/styles/prosilver/template/avatars.js b/phpBB/styles/prosilver/template/avatars.js
deleted file mode 100644
index 26ea24c0db..0000000000
--- a/phpBB/styles/prosilver/template/avatars.js
+++ /dev/null
@@ -1,15 +0,0 @@
-(function($) {  // Avoid conflicts with other libraries
-
-"use strict";
-
-function avatarHide() {
-    $('#avatar_options > div').hide();
-
-    var selected = $('#avatar_driver').val();
-    $('#avatar_option_' + selected).show();
-}
-
-avatarHide();
-$('#avatar_driver').bind('change', avatarHide);
-
-})(jQuery); // Avoid conflicts with other libraries
diff --git a/phpBB/styles/prosilver/template/ucp_avatar_options.html b/phpBB/styles/prosilver/template/ucp_avatar_options.html
index 072f235eb1..63e1fe3336 100644
--- a/phpBB/styles/prosilver/template/ucp_avatar_options.html
+++ b/phpBB/styles/prosilver/template/ucp_avatar_options.html
@@ -16,10 +16,10 @@
 	<fieldset>
 		<dl>
 			<dt><label>{L_AVATAR_TYPE}{L_COLON}</label></dt>
-			<dd><select name="avatar_driver" id="avatar_driver">
+			<dd><select name="avatar_driver" id="avatar_driver" data-toggable-settings="true">
 				<option value="">{L_NO_AVATAR_CATEGORY}</option>
 				<!-- BEGIN avatar_drivers -->
-				<option value="{avatar_drivers.DRIVER}"<!-- IF avatar_drivers.SELECTED --> selected="selected"<!-- ENDIF -->>{avatar_drivers.L_TITLE}</option>
+				<option value="{avatar_drivers.DRIVER}"<!-- IF avatar_drivers.SELECTED --> selected="selected"<!-- ENDIF --> data-toggle-setting="#avatar_option_{avatar_drivers.DRIVER}">{avatar_drivers.L_TITLE}</option>
 				<!-- END avatar_drivers -->
 			</select></dd>
 		</dl>
@@ -46,5 +46,3 @@
 <!-- ENDIF -->
 	</div>
 </div>
-
-<!-- INCLUDEJS avatars.js -->
diff --git a/phpBB/styles/subsilver2/template/avatars.js b/phpBB/styles/subsilver2/template/avatars.js
deleted file mode 100644
index 146aca94d3..0000000000
--- a/phpBB/styles/subsilver2/template/avatars.js
+++ /dev/null
@@ -1,15 +0,0 @@
-(function($) {  // Avoid conflicts with other libraries
-
-"use strict";
-
-function avatarHide() {
-    $('.[class^="avatar_option_"]').hide();
-
-    var selected = $('#avatar_driver').val();
-    $('.avatar_option_' + selected).show();
-}
-
-avatarHide();
-$('#avatar_driver').bind('change', avatarHide);
-
-})(jQuery); // Avoid conflicts with other libraries
diff --git a/phpBB/styles/subsilver2/template/ucp_profile_avatar.html b/phpBB/styles/subsilver2/template/ucp_profile_avatar.html
index 60a816d00a..11eb537b5c 100644
--- a/phpBB/styles/subsilver2/template/ucp_profile_avatar.html
+++ b/phpBB/styles/subsilver2/template/ucp_profile_avatar.html
@@ -27,10 +27,10 @@
 	<tr>
 		<td class="row1" width="35%"><b class="genmed">{L_AVATAR_TYPE}{L_COLON}</b></td>
 		<td class="row2">
-			<select name="avatar_driver" id="avatar_driver">
+			<select name="avatar_driver" id="avatar_driver" data-toggable-settings="true">
 				<option value="">{L_NO_AVATAR_CATEGORY}</option>
 				<!-- BEGIN avatar_drivers -->
-				<option value="{avatar_drivers.DRIVER}"<!-- IF avatar_drivers.SELECTED --> selected="selected"<!-- ENDIF -->>{avatar_drivers.L_TITLE}</option>
+				<option value="{avatar_drivers.DRIVER}"<!-- IF avatar_drivers.SELECTED --> selected="selected"<!-- ENDIF --> data-toggle-setting=".avatar_option_{avatar_drivers.DRIVER}">{avatar_drivers.L_TITLE}</option>
 				<!-- END avatar_drivers -->
 			</select></td>
 	</tr>
@@ -48,6 +48,4 @@
 	</tr>
 </table>
 
-<!-- INCLUDEJS avatars.js -->
-
 <!-- INCLUDE ucp_footer.html -->