diff --git a/Resources.php b/Resources.php
index 4e0a8cf2..a2298a55 100644
--- a/Resources.php
+++ b/Resources.php
@@ -34,6 +34,7 @@ $wgResourceModules['ext.uls.displaysettings'] = array(
 		'ext.uls.mediawiki',
 		'ext.uls.webfonts',
 		'mediawiki.api.parse',
+		'mediawiki.ui.checkbox',
 	),
 ) + $resourcePaths;
 
@@ -101,6 +102,7 @@ $wgResourceModules['ext.uls.inputsettings'] = array(
 		'ext.uls.languagesettings',
 		'ext.uls.mediawiki',
 		'jquery.ime',
+		'mediawiki.ui.radio',
 	),
 ) + $resourcePaths;
 
@@ -129,7 +131,6 @@ $wgResourceModules['ext.uls.languagesettings'] = array(
 	'scripts' => 'resources/js/ext.uls.languagesettings.js',
 	'styles' => 'resources/css/ext.uls.languagesettings.css',
 	'dependencies' => array(
-		'ext.uls.buttons',
 		'ext.uls.messages',
 		'ext.uls.preferences',
 		// The grid styles are used here,
@@ -254,6 +255,7 @@ $wgResourceModules['jquery.uls'] = array(
 		'jquery.i18n',
 		'jquery.uls.data',
 		'jquery.uls.grid',
+		'mediawiki.ui.input',
 	),
 ) + $resourcePaths;
 
diff --git a/resources/css/ext.uls.inputsettings.css b/resources/css/ext.uls.inputsettings.css
index 10658075..bb9484c1 100644
--- a/resources/css/ext.uls.inputsettings.css
+++ b/resources/css/ext.uls.inputsettings.css
@@ -12,7 +12,7 @@ div.input-settings-block {
 }
 
 .imelabel {
-	display: block;
+	display: inline;
 	padding-bottom: 10px;
 	font-size: 10pt;
 	line-height: 16pt;
@@ -22,10 +22,6 @@ div.input-settings-block {
 	padding-left: 5px;
 }
 
-.imelabel input {
-	float: left;
-}
-
 .uls-ime-menu-settings-item {
 	background-color: #f0f0f0;
 	border-radius: 0 0 5px 5px;
diff --git a/resources/js/ext.uls.displaysettings.js b/resources/js/ext.uls.displaysettings.js
index 3d90e05a..4a06124b 100644
--- a/resources/js/ext.uls.displaysettings.js
+++ b/resources/js/ext.uls.displaysettings.js
@@ -23,9 +23,9 @@
 
 		+ '<div class="row">' // Tab switcher buttons
 		+ '<div class="twelve columns uls-display-settings-tab-switcher">'
-		+ '<div class="uls-button-group">'
-		+ '<button id="uls-display-settings-language-tab" class="button down" data-i18n="ext-uls-display-settings-language-tab"></button>'
-		+ '<button id="uls-display-settings-fonts-tab" class="button" data-i18n="ext-uls-display-settings-fonts-tab"></button>'
+		+ '<div class="uls-button-group mw-ui-button-group">'
+		+ '<button id="uls-display-settings-language-tab" class="mw-ui-button mw-ui-checked" data-i18n="ext-uls-display-settings-language-tab"></button>'
+		+ '<button id="uls-display-settings-fonts-tab" class="mw-ui-button" data-i18n="ext-uls-display-settings-fonts-tab"></button>'
 		+ '</div>'
 		+ '</div>'
 		+ '</div>'
@@ -79,9 +79,9 @@
 
 		// Webfonts enabling checkbox with label
 		+ '<div class="row">'
-		+ '<div class="eleven columns">'
-		+ '<label class="checkbox">'
+		+ '<div class="eleven columns mw-ui-checkbox">'
 		+ '<input type="checkbox" id="webfonts-enable-checkbox" />'
+		+ '<label class="checkbox" for="webfonts-enable-checkbox">'
 		+ '<strong data-i18n="ext-uls-webfonts-settings-title"></strong> '
 		+ '<span data-i18n="ext-uls-webfonts-settings-info"></span> '
 		+ '<a target="_blank" href="https://www.mediawiki.org/wiki/Universal_Language_Selector/WebFonts" data-i18n="ext-uls-webfonts-settings-info-link"></a>'
@@ -242,8 +242,8 @@
 				return function () {
 					displaySettings.markDirty();
 					displaySettings.uiLanguage = button.data( 'language' ) || displaySettings.uiLanguage;
-					$( 'div.uls-ui-languages button.button' ).removeClass( 'down' );
-					button.addClass( 'down' );
+					$( 'div.uls-ui-languages button.mw-ui-button' ).removeClass( 'mw-ui-checked' );
+					button.addClass( 'mw-ui-checked' );
 					displaySettings.prepareUIFonts();
 					displaySettings.preview( displaySettings.uiLanguage );
 				};
@@ -253,7 +253,7 @@
 			for ( i = 0; i < SUGGESTED_LANGUAGES_NUMBER; i++ ) {
 				language = languagesForButtons[i];
 				$button = $( '<button>' )
-					.addClass( 'button uls-language-button autonym' )
+					.addClass( 'mw-ui-button uls-language-button autonym' )
 					.text( $.uls.data.getAutonym( language ) )
 					.prop( {
 						lang: language,
@@ -261,7 +261,7 @@
 					} );
 
 				if ( language === this.uiLanguage ) {
-					$button.addClass( 'down' );
+					$button.addClass( 'mw-ui-checked' );
 				}
 
 				$button.data( 'language', language );
@@ -282,7 +282,7 @@
 			$languages = this.$template.find( 'div.uls-ui-languages' );
 			$moreLanguagesButton = $( '<button>' )
 				.prop( 'class', 'uls-more-languages' )
-				.addClass( 'button' ).text( '...' );
+				.addClass( 'mw-ui-button' ).text( '...' );
 
 			$languages.append( $moreLanguagesButton );
 			// Show the long language list to select a language for display settings
@@ -578,7 +578,7 @@
 			$tabButtons.on( 'click', function () {
 				var $button = $( this );
 
-				if ( $button.hasClass( 'down' ) ) {
+				if ( $button.hasClass( 'mw-ui-checked' ) ) {
 					return;
 				}
 
@@ -593,8 +593,8 @@
 				} );
 
 				displaySettings.$parent.position();
-				$tabButtons.filter( '.down' ).removeClass( 'down' );
-				$button.addClass( 'down' );
+				$tabButtons.filter( '.mw-ui-checked' ).removeClass( 'mw-ui-checked' );
+				$button.addClass( 'mw-ui-checked' );
 
 			} );
 
diff --git a/resources/js/ext.uls.inputsettings.js b/resources/js/ext.uls.inputsettings.js
index c08de49f..d37fd284 100644
--- a/resources/js/ext.uls.inputsettings.js
+++ b/resources/js/ext.uls.inputsettings.js
@@ -48,9 +48,9 @@
 
 		// Disable IME system button
 		+ '<div class="row">'
-		+ '<div class="eleven columns button uls-input-settings-disable-info"></div>'
-		+ '<div class="six columns button uls-input-settings-toggle">'
-		+ '<button class="active green button uls-input-toggle-button"></button>'
+		+ '<div class="eleven columns uls-input-settings-disable-info"></div>'
+		+ '<div class="six columns uls-input-settings-toggle">'
+		+ '<button class="mw-ui-button uls-input-toggle-button"></button>'
 		+ '</div>'
 		+ '</div>';
 
@@ -119,7 +119,7 @@
 			$imeListTitle = this.$template.find( '.ext-uls-input-settings-imes-title' );
 			$imeListContainer = this.$template.find( '.uls-input-settings-inputmethods-list' );
 
-			$imeListContainer.find( 'label' ).remove();
+			$imeListContainer.find( 'div, label' ).remove();
 
 			if ( !imes ) {
 				$imeListContainer.append( $( '<label>' )
@@ -159,7 +159,7 @@
 		 * @return {Object} jQuery object corresponding to the input method item.
 		 */
 		renderInputmethodOption: function ( imeId, selected ) {
-			var $imeLabel, name, description, $helplink, inputmethod, $inputMethodItem;
+			var $imeHolder, $imeLabel, name, description, $helplink, inputmethod, $inputMethodItem;
 
 			if ( imeId !== 'system' && !$.ime.sources[imeId] ) {
 				// imeId not known for jquery.ime.
@@ -167,6 +167,8 @@
 				return $();
 			}
 
+			$imeHolder = $( '<div>' ).class( 'mw-ui-radio' );
+
 			$imeLabel = $( '<label>' ).attr( {
 				'for': imeId,
 				'class': 'imelabel'
@@ -179,7 +181,7 @@
 				checked: selected
 			} );
 
-			$imeLabel.append( $inputMethodItem );
+			$imeHolder.append( $inputMethodItem );
 
 			if ( imeId === 'system' ) {
 				name = $.i18n( 'ext-uls-disable-input-method' );
@@ -209,7 +211,8 @@
 				$helplink
 			);
 
-			return $imeLabel;
+			$imeHolder.append( $imeLabel );
+			return $imeHolder;
 		},
 
 		/**
@@ -274,8 +277,8 @@
 						$.ime.preferences.setLanguage( language );
 					}
 					// Mark the button selected
-					$( '.uls-ui-languages .button' ).removeClass( 'down' );
-					button.addClass( 'down' );
+					$( '.uls-ui-languages .mw-ui-button' ).removeClass( 'mw-ui-checked' );
+					button.addClass( 'mw-ui-checked' );
 					inputSettings.prepareInputmethods( language );
 				};
 			}
@@ -286,7 +289,7 @@
 			for ( i = 0; i < SUGGESTED_LANGUAGES_NUMBER; i++ ) {
 				language = languagesForButtons[i];
 				$button = $( '<button>' )
-					.addClass( 'button uls-language-button autonym' )
+					.addClass( 'mw-ui-button uls-language-button autonym' )
 					.text( $.uls.data.getAutonym( language ) )
 					.prop( {
 						lang: language,
@@ -318,7 +321,7 @@
 			$languages = this.$template.find( '.uls-ui-languages' );
 			$moreLanguagesButton = $( '<button>' )
 				.prop( 'class', 'uls-more-languages' )
-				.addClass( 'button' ).text( '...' );
+				.addClass( 'mw-ui-button' ).text( '...' );
 
 			$languages.append( $moreLanguagesButton );
 			// Show the long language list to select a language for ime settings
diff --git a/resources/js/ext.uls.languagesettings.js b/resources/js/ext.uls.languagesettings.js
index 5f93693a..d1998562 100644
--- a/resources/js/ext.uls.languagesettings.js
+++ b/resources/js/ext.uls.languagesettings.js
@@ -34,8 +34,8 @@
 	// Apply and Cancel buttons
 	buttonsRow = '<div class="row language-settings-buttons">' +
 		'<div class="eleven columns">' +
-		'<button class="button uls-settings-cancel" data-i18n="ext-uls-language-settings-cancel"></button>' +
-		'<button class="button active blue uls-settings-apply" data-i18n="ext-uls-language-settings-apply" disabled></button>' +
+		'<button class="mw-ui-button uls-settings-cancel" data-i18n="ext-uls-language-settings-cancel"></button>' +
+		'<button class="mw-ui-button mw-ui-constuctive uls-settings-apply" data-i18n="ext-uls-language-settings-apply" disabled></button>' +
 		'</div>' +
 		'</div>' +
 		'</div>';