diff --git a/modules/ve-mw/ce/nodes/ve.ce.MWBlockImageNode.js b/modules/ve-mw/ce/nodes/ve.ce.MWBlockImageNode.js
index 5347ddd4c5..b0b12ea08a 100644
--- a/modules/ve-mw/ce/nodes/ve.ce.MWBlockImageNode.js
+++ b/modules/ve-mw/ce/nodes/ve.ce.MWBlockImageNode.js
@@ -31,10 +31,10 @@ ve.ce.MWBlockImageNode = function VeCeMWBlockImageNode( model, config ) {
 
 	// DOM Hierarchy for BlockImageNode:
 	// <div> this.$element
-	//   <figure> this.$figure (ve-ce-mwBlockImageNode-type (thumb) (tright/tleft/etc))
+	//   <figure> this.$figure (ve-ce-mwBlockImageNode-{type})
 	//     <a> this.$a
-	//       <img> this.$image (thumbimage)
-	//     <figcaption> this.caption.view.$element (thumbcaption)
+	//       <img> this.$image
+	//     <figcaption> this.caption.view.$element
 
 	// Build DOM:
 	this.$a = this.$( '<a>' )
@@ -206,15 +206,7 @@ ve.ce.MWBlockImageNode.prototype.updateSize = function ( dimensions ) {
 	}
 
 	this.$image.css( dimensions );
-
-	this.$figure.css( {
-		// If we have a border then the width is increased by 2
-		'width': dimensions.width + ( this.captionVisible ? 2 : 0 ),
-		'height': this.captionVisible ? 'auto' : dimensions.height
-	} );
-
 	this.$figure.toggleClass( 'mw-default-size', !!this.model.getAttribute( 'defaultSize' ) );
-
 };
 
 /**
diff --git a/modules/ve-mw/ce/nodes/ve.ce.MWImageCaptionNode.js b/modules/ve-mw/ce/nodes/ve.ce.MWImageCaptionNode.js
index c61296479d..50fe62222c 100644
--- a/modules/ve-mw/ce/nodes/ve.ce.MWImageCaptionNode.js
+++ b/modules/ve-mw/ce/nodes/ve.ce.MWImageCaptionNode.js
@@ -19,9 +19,6 @@
 ve.ce.MWImageCaptionNode = function VeCeMWImageCaptionNode( model, config ) {
 	// Parent constructor
 	ve.ce.BranchNode.call( this, model, config );
-
-	// DOM changes
-	this.$element.addClass( 'thumbcaption' );
 };
 
 /* Inheritance */
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 52cce17976..3981683e29 100644
--- a/modules/ve-mw/ce/styles/nodes/ve.ce.MWBlockImageNode.css
+++ b/modules/ve-mw/ce/styles/nodes/ve.ce.MWBlockImageNode.css
@@ -6,52 +6,7 @@
  */
 /*csslint regex-selectors:false, overqualified-elements:false */
 
-figure[typeof*='mw:Image'] {
-	margin: 0;
-}
-
-figure[typeof*='mw:Image'] a {
-	border: 0;
-}
-
-/* TODO: Merge with div.tright styles */
-/* Due to a weird cssjanus bug, noflip rules
-   are set as single-rules rather than for the
-   whole class */
-figure[typeof*='mw:Image'].mw-halign-right {
-	/* @noflip */
-	clear: right;
-	/* @noflip */
-	float: right;
-}
-
-figure[typeof*='mw:Image'].mw-halign-center {
-	margin-left: auto;
-	margin-right: auto;
-}
-
-/* TODO: Merge with div.tleft styles */
-/* Due to a weird cssjanus bug, noflip rules
-   are set as single-rules rather than for the
-   whole class */
-figure[typeof*='mw:Image'].mw-halign-left {
-	/* @noflip */
-	clear: left;
-	/* @noflip */
-	float: left;
-}
-
-figure:not([typeof='mw:Image/Thumb']) figcaption .magnify {
-	display:none;
-}
-
-/* TODO: Merge with div.thumbinner styles */
-figure[typeof='mw:Image/Thumb'], figure[typeof='mw:Image/Frame'] {
-	overflow: hidden;
-	text-align: center;
-}
-
 /* Hide outer shield for centered images */
-figure[typeof*='mw:Image'].mw-halign-center + .ve-ce-protectedNode-shield {
+figure[typeof~='mw:Image'].mw-halign-center + .ve-ce-protectedNode-shield {
 	display: none;
 }
diff --git a/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-shared.css b/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-shared.css
index f2db08fe8b..f33ada4784 100644
--- a/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-shared.css
+++ b/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-shared.css
@@ -6,48 +6,3 @@
  * @copyright 2011-2014 VisualEditor Team and others; see AUTHORS.txt
  * @license The MIT License (MIT); see LICENSE.txt
  */
-
-/* ve.ce.MWBlockImageNode */
-
-figure[typeof*='mw:Image'] {
-	margin: 0;
-}
-
-figure[typeof*='mw:Image'] a {
-	border: 0;
-}
-
-/* TODO: Merge with div.tright styles */
-/* Due to a weird cssjanus bug, noflip rules
-   are set as single-rules rather than for the
-   whole class */
-figure[typeof*='mw:Image'].mw-halign-right {
-	/* @noflip */
-	margin: .5em 0 1.3em 1.4em;
-}
-
-/* TODO: Merge with div.tleft styles */
-/* Due to a weird cssjanus bug, noflip rules
-   are set as single-rules rather than for the
-   whole class */
-figure[typeof*='mw:Image'].mw-halign-left {
-	/* @noflip */
-	margin: .5em 1.4em 1.3em 0;
-}
-
-/* TODO: Merge with div.thumbinner styles */
-figure[typeof='mw:Image/Thumb'], figure[typeof='mw:Image/Frame'] {
-	background-color: #f9f9f9;
-	border: 1px solid #cccccc;
-	padding: 3px !important;
-	font-size: 94%;
-}
-
-/* TODO: Merge with .thumbimage styles */
-figure[typeof*='mw:Image'] .ve-ce-mwBlockImageNode-thumbimage {
-	border: 1px solid #cccccc;
-}
-
-figure[typeof*='mw:Image'].mw-image-border img {
-	border: 1px solid #cccccc;
-}