diff --git a/modules/ve-mw/ce/nodes/ve.ce.MWBlockImageNode.js b/modules/ve-mw/ce/nodes/ve.ce.MWBlockImageNode.js
index f03404b3ab..ab2cdfc6b3 100644
--- a/modules/ve-mw/ce/nodes/ve.ce.MWBlockImageNode.js
+++ b/modules/ve-mw/ce/nodes/ve.ce.MWBlockImageNode.js
@@ -48,7 +48,7 @@ ve.ce.MWBlockImageNode = function VeCeMWBlockImageNode( model, config ) {
 	this.$figure = this.$( '<figure>' )
 		.appendTo( this.$element )
 		.append( this.$a )
-		.addClass( 've-ce-mwBlockImageNode-type-' + type )
+		.addClass( 've-ce-mwBlockImageNode ve-ce-mwBlockImageNode-type-' + type )
 		// 'typeof' should appear with the proper Parsoid-generated
 		// type. The model deals with converting it
 		.attr( 'typeof', this.typeToRdfa[ type ] );
diff --git a/modules/ve-mw/ce/styles/nodes/ve.ce.MWBlockImageNode.css b/modules/ve-mw/ce/styles/nodes/ve.ce.MWBlockImageNode.css
index 3981683e29..6ee980ab68 100644
--- a/modules/ve-mw/ce/styles/nodes/ve.ce.MWBlockImageNode.css
+++ b/modules/ve-mw/ce/styles/nodes/ve.ce.MWBlockImageNode.css
@@ -10,3 +10,13 @@
 figure[typeof~='mw:Image'].mw-halign-center + .ve-ce-protectedNode-shield {
 	display: none;
 }
+
+/* Override border on shields for images */
+.ve-ce-mwBlockImageNode .ve-ce-protectedNode-shield {
+	border: none;
+}
+
+/* Override paragraph margins inside of captions */
+.ve-ce-mwBlockImageNode figcaption p {
+	margin: 0 !important;
+}
\ No newline at end of file
diff --git a/modules/ve-mw/ce/styles/nodes/ve.ce.MWInlineImageNode.css b/modules/ve-mw/ce/styles/nodes/ve.ce.MWInlineImageNode.css
index 2bdf70f8ed..69b2d3f7a4 100644
--- a/modules/ve-mw/ce/styles/nodes/ve.ce.MWInlineImageNode.css
+++ b/modules/ve-mw/ce/styles/nodes/ve.ce.MWInlineImageNode.css
@@ -9,3 +9,7 @@
 	display: inline-block;
 }
 
+/* Override border on shields for images */
+.ve-ce-mwInlineImageNode .ve-ce-protectedNode-shield {
+	border: none;
+}
\ No newline at end of file