diff --git a/bundlesize.config.json b/bundlesize.config.json
index 0c0ecb9d6..9d4716295 100644
--- a/bundlesize.config.json
+++ b/bundlesize.config.json
@@ -18,7 +18,7 @@
 		},
 		{
 			"resourceModule": "mmv.bootstrap",
-			"maxSize": "5.6 kB"
+			"maxSize": "5.3 kB"
 		}
 	]
 }
diff --git a/resources/mmv.bootstrap/mmv.bootstrap.js b/resources/mmv.bootstrap/mmv.bootstrap.js
index d247da603..f62784502 100644
--- a/resources/mmv.bootstrap/mmv.bootstrap.js
+++ b/resources/mmv.bootstrap/mmv.bootstrap.js
@@ -380,7 +380,7 @@ class MultimediaViewerBootstrap {
 		// remove the buttons (and the clearing element) if they are already there
 		// this should not happen (at least until we support paged media) but just in case
 		// eslint-disable-next-line no-jquery/no-global-selector
-		$( '.mw-mmv-filepage-buttons' ).next().addBack().remove();
+		$( '.mw-mmv-view-expanded' ).remove();
 
 		const $mmvButton = $( '<button>' )
 			.addClass( 'mw-mmv-view-expanded cdx-button' )
@@ -388,16 +388,8 @@ class MultimediaViewerBootstrap {
 			.append( ' ' )
 			.append( mw.msg( 'multimediaviewer-view-expanded' ) );
 
-		const $filepageButtons = $( '<div>' )
-			.addClass( 'cdx-button-group mw-mmv-filepage-buttons' )
-			.append( $mmvButton );
-
 		// eslint-disable-next-line no-jquery/no-global-selector
-		$( '.fullMedia' ).append(
-			$filepageButtons,
-			$( '<div>' )
-				.css( 'clear', 'both' )
-		);
+		$( '.fullMedia' ).append( $mmvButton );
 
 		const image = new LightboxImage(
 			$thumb.prop( 'src' ),
@@ -409,10 +401,7 @@ class MultimediaViewerBootstrap {
 		);
 		this.thumbs.push( image );
 
-		$mmvButton.on( 'click', () => {
-			this.openImage( image );
-			return false;
-		} );
+		$mmvButton.on( 'click', () => this.openImage( image ) );
 
 		if ( Config.shouldShowStatusInfo() ) {
 			Config.disableStatusInfo();
diff --git a/resources/mmv.bootstrap/mmv.bootstrap.less b/resources/mmv.bootstrap/mmv.bootstrap.less
index 5ddab2e75..af0e84e5b 100644
--- a/resources/mmv.bootstrap/mmv.bootstrap.less
+++ b/resources/mmv.bootstrap/mmv.bootstrap.less
@@ -42,20 +42,9 @@ body.mw-mmv-lightbox-open {
 	}
 }
 
-.mw-mmv-filepage-buttons {
-	margin-top: 5px;
-
-	.cdx-button:nth-child(n + 2) {
-		border-left: none;
-	}
-
-	.mw-mmv-view-expanded .cdx-button__icon {
+.mw-mmv-view-expanded {
+	.cdx-button__icon {
 		.cdx-mixin-css-icon( @cdx-icon-image-gallery, @param-is-button-icon: true,
 			@param-size-icon: @size-icon-small );
 	}
-
-	.mw-mmv-view-config .cdx-button__icon {
-		.cdx-mixin-css-icon( @cdx-icon-settings, @param-is-button-icon: true,
-			@param-size-icon: @size-icon-small );
-	}
 }
diff --git a/tests/qunit/mmv/mmv.bootstrap.test.js b/tests/qunit/mmv/mmv.bootstrap.test.js
index 432e16735..2c056ed04 100644
--- a/tests/qunit/mmv/mmv.bootstrap.test.js
+++ b/tests/qunit/mmv/mmv.bootstrap.test.js
@@ -235,9 +235,6 @@ const { asyncMethod, waitForAsync, getMultimediaViewer } = require( './mmv.testh
 		const $link4 = $( '.fullMedia .mw-mmv-view-expanded' );
 		assert.ok( $link4.length, 'Link for viewing expanded file was set up.' );
 
-		const $link5 = $( '.fullMedia .mw-mmv-view-config' );
-		assert.ok( $link5.length, 'Link for opening enable/disable configuration was set up.' );
-
 		// Click on valid link
 		$link.trigger( { type: 'click', which: 1 } );
 		clock.tick( 10 );