diff --git a/resources/skins.minerva.content.styles/thumbnails.less b/resources/skins.minerva.content.styles/thumbnails.less
index 77ffffc..fa784ac 100644
--- a/resources/skins.minerva.content.styles/thumbnails.less
+++ b/resources/skins.minerva.content.styles/thumbnails.less
@@ -38,6 +38,9 @@
 		width: auto !important;
 	}
 
+	// Parsoid class name (T198534)
+	.mw-image-border,
+	// parser (PHP) class name
 	.thumbborder {
 		border: 1px solid @colorGray12;
 	}
diff --git a/skinStyles/mediawiki.skinning.content.parsoid/minerva.less b/skinStyles/mediawiki.skinning.content.parsoid/minerva.less
index e2ab897..b148926 100644
--- a/skinStyles/mediawiki.skinning.content.parsoid/minerva.less
+++ b/skinStyles/mediawiki.skinning.content.parsoid/minerva.less
@@ -29,6 +29,11 @@ figure[ typeof*='mw:Audio' ] {
 	margin: 0 auto;
 }
 
+/* T198534 */
+.mw-image-border {
+	display: inline-block;
+}
+
 @media screen and ( min-width: @width-breakpoint-tablet ) {
 	figure[ typeof*='mw:Image' ],
 	figure[ typeof*='mw:Video' ],