diff --git a/wp-includes/js/tinymce/plugins/wordpress/css/content.css b/wp-includes/js/tinymce/plugins/wordpress/css/content.css
deleted file mode 100644
index 8cf986c518..0000000000
--- a/wp-includes/js/tinymce/plugins/wordpress/css/content.css
+++ /dev/null
@@ -1,29 +0,0 @@
-
-.mceWPnextpage, .mceWPmore {
-	border: 0;
-	border-top: 1px dotted #cccccc;
-	display: block;
-	width: 95%;
-	height: 12px;
-	margin: 15px auto 0;
-}
-.mceWPmore {
-	background: transparent url(../img/more_bug.gif) no-repeat right top;
-}
-.mceWPnextpage {
-    background: transparent url(../img/page_bug.gif) no-repeat right top;
-}
-
-img.wpGallery {
-	border: 1px dashed #888;
-	background: #f2f8ff url("../../wpgallery/img/gallery.png") no-repeat scroll center center;
-	width: 99%;
-	height: 250px;
-}
-
-img.wp-oembed {
-	border: 1px dashed #888;
-	background: #f7f5f2 url("../img/embedded.png") no-repeat scroll center center;
-	width: 300px;
-	height: 250px;
-}
diff --git a/wp-includes/js/tinymce/plugins/wordpress/editor_plugin_src.js b/wp-includes/js/tinymce/plugins/wordpress/editor_plugin_src.js
index 7cdcdfad0d..dcd6f149c8 100644
--- a/wp-includes/js/tinymce/plugins/wordpress/editor_plugin_src.js
+++ b/wp-includes/js/tinymce/plugins/wordpress/editor_plugin_src.js
@@ -371,11 +371,6 @@
 			moreHTML = '<img src="' + url + '/img/trans.gif" alt="$1" class="mceWPmore mceItemNoResize" title="'+ed.getLang('wordpress.wp_more_alt')+'" />';
 			nextpageHTML = '<img src="' + url + '/img/trans.gif" class="mceWPnextpage mceItemNoResize" title="'+ed.getLang('wordpress.wp_page_alt')+'" />';
 
-			// Load plugin specific CSS into editor
-			ed.onInit.add(function() {
-				ed.dom.loadCSS(url + '/css/content.css');
-			});
-
 			// Display morebreak instead if img in element path
 			ed.onPostRender.add(function() {
 				if (ed.theme.onResolveName) {
diff --git a/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/content.css b/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/content.css
index 2eb68c8e27..5aa6c3ba30 100644
--- a/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/content.css
+++ b/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/content.css
@@ -108,3 +108,37 @@ td {
 	font-size: 11px;
 	margin: 8px;
 }
+
+/* Styles for the WordPress plugins */
+img.mceWPnextpage,
+img.mceWPmore {
+	border: 0;
+	border-top: 1px dotted #cccccc;
+	display: block;
+	width: 95%;
+	height: 12px;
+	margin: 15px auto 0;
+}
+
+img.mceWPmore {
+	background: transparent url("img/more_bug.gif") no-repeat right top;
+}
+
+img.mceWPnextpage {
+    background: transparent url("img/page_bug.gif") no-repeat right top;
+}
+
+img.wpGallery {
+	border: 1px dashed #888;
+	background: #f2f8ff url("img/gallery.png") no-repeat scroll center center;
+	width: 99%;
+	height: 250px;
+}
+
+img.wp-oembed {
+	border: 1px dashed #888;
+	background: #f7f5f2 url("img/embedded.png") no-repeat scroll center center;
+	width: 300px;
+	height: 250px;
+}
+
diff --git a/wp-includes/js/tinymce/plugins/wordpress/img/embedded.png b/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/embedded.png
similarity index 100%
rename from wp-includes/js/tinymce/plugins/wordpress/img/embedded.png
rename to wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/embedded.png
diff --git a/wp-includes/js/tinymce/plugins/wpgallery/img/gallery.png b/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/gallery.png
similarity index 100%
rename from wp-includes/js/tinymce/plugins/wpgallery/img/gallery.png
rename to wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/gallery.png
diff --git a/wp-includes/js/tinymce/plugins/wordpress/img/more_bug.gif b/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/more_bug.gif
similarity index 100%
rename from wp-includes/js/tinymce/plugins/wordpress/img/more_bug.gif
rename to wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/more_bug.gif
diff --git a/wp-includes/js/tinymce/plugins/wordpress/img/page_bug.gif b/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/page_bug.gif
similarity index 100%
rename from wp-includes/js/tinymce/plugins/wordpress/img/page_bug.gif
rename to wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/page_bug.gif