diff --git a/modules/sandbox/images/big.png b/modules/es/images/big.png
similarity index 100%
rename from modules/sandbox/images/big.png
rename to modules/es/images/big.png
diff --git a/modules/sandbox/images/bold.png b/modules/es/images/bold.png
similarity index 100%
rename from modules/sandbox/images/bold.png
rename to modules/es/images/bold.png
diff --git a/modules/sandbox/images/bullet.png b/modules/es/images/bullet.png
similarity index 100%
rename from modules/sandbox/images/bullet.png
rename to modules/es/images/bullet.png
diff --git a/modules/sandbox/images/clear.png b/modules/es/images/clear.png
similarity index 100%
rename from modules/sandbox/images/clear.png
rename to modules/es/images/clear.png
diff --git a/modules/sandbox/images/data.png b/modules/es/images/data.png
similarity index 100%
rename from modules/sandbox/images/data.png
rename to modules/es/images/data.png
diff --git a/modules/sandbox/images/fade-down.png b/modules/es/images/fade-down.png
similarity index 100%
rename from modules/sandbox/images/fade-down.png
rename to modules/es/images/fade-down.png
diff --git a/modules/sandbox/images/fade-up.png b/modules/es/images/fade-up.png
similarity index 100%
rename from modules/sandbox/images/fade-up.png
rename to modules/es/images/fade-up.png
diff --git a/modules/sandbox/images/html.png b/modules/es/images/html.png
similarity index 100%
rename from modules/sandbox/images/html.png
rename to modules/es/images/html.png
diff --git a/modules/sandbox/images/indent.png b/modules/es/images/indent.png
similarity index 100%
rename from modules/sandbox/images/indent.png
rename to modules/es/images/indent.png
diff --git a/modules/sandbox/images/insert-reference.png b/modules/es/images/insert-reference.png
similarity index 100%
rename from modules/sandbox/images/insert-reference.png
rename to modules/es/images/insert-reference.png
diff --git a/modules/sandbox/images/italic.png b/modules/es/images/italic.png
similarity index 100%
rename from modules/sandbox/images/italic.png
rename to modules/es/images/italic.png
diff --git a/modules/sandbox/images/json.png b/modules/es/images/json.png
similarity index 100%
rename from modules/sandbox/images/json.png
rename to modules/es/images/json.png
diff --git a/modules/sandbox/images/link.png b/modules/es/images/link.png
similarity index 100%
rename from modules/sandbox/images/link.png
rename to modules/es/images/link.png
diff --git a/modules/sandbox/images/number.png b/modules/es/images/number.png
similarity index 100%
rename from modules/sandbox/images/number.png
rename to modules/es/images/number.png
diff --git a/modules/sandbox/images/outdent.png b/modules/es/images/outdent.png
similarity index 100%
rename from modules/sandbox/images/outdent.png
rename to modules/es/images/outdent.png
diff --git a/modules/sandbox/images/render.png b/modules/es/images/render.png
similarity index 100%
rename from modules/sandbox/images/render.png
rename to modules/es/images/render.png
diff --git a/modules/sandbox/images/small.png b/modules/es/images/small.png
similarity index 100%
rename from modules/sandbox/images/small.png
rename to modules/es/images/small.png
diff --git a/modules/sandbox/images/sub.png b/modules/es/images/sub.png
similarity index 100%
rename from modules/sandbox/images/sub.png
rename to modules/es/images/sub.png
diff --git a/modules/sandbox/images/super.png b/modules/es/images/super.png
similarity index 100%
rename from modules/sandbox/images/super.png
rename to modules/es/images/super.png
diff --git a/modules/sandbox/images/toolbar-shadow.png b/modules/es/images/toolbar-shadow.png
similarity index 100%
rename from modules/sandbox/images/toolbar-shadow.png
rename to modules/es/images/toolbar-shadow.png
diff --git a/modules/sandbox/images/wikitext.png b/modules/es/images/wikitext.png
similarity index 100%
rename from modules/sandbox/images/wikitext.png
rename to modules/es/images/wikitext.png
diff --git a/modules/es/views/es.ContextView.js b/modules/es/views/es.ContextView.js
index 6ba584d356..293bdfb5fd 100644
--- a/modules/es/views/es.ContextView.js
+++ b/modules/es/views/es.ContextView.js
@@ -14,10 +14,8 @@ es.ContextView = function( surfaceView, $overlay ) {
 	// Example menu items
 	this.$menu.append(
 		'<div class="es-contextView-menuSection">' +
-			'<div class="es-contextView-menuButton"><b>B</b></div>' +
-			'<div class="es-contextView-menuButton"><i>I</i></div>' +
-			'<div class="es-contextView-menuButton"><u>U</u></div>' +
-			'<div class="es-contextView-menuButton"><s>S</s></div>' +
+			'<div class="es-contextView-menuButton"></div>' +
+			'<div class="es-contextView-menuButton"></div>' +
 		'</div>' +
 		'<div class="es-contextView-menuItem-break"></div>' +
 		'<div class="es-contextView-menuItem">Cut</div>' +
diff --git a/modules/sandbox/images/bullet-icon.png b/modules/sandbox/images/bullet-icon.png
deleted file mode 100644
index e304b26755..0000000000
Binary files a/modules/sandbox/images/bullet-icon.png and /dev/null differ