diff --git a/js/battledata.js b/js/battledata.js
index ceff2bec3..0fabaa4aa 100644
--- a/js/battledata.js
+++ b/js/battledata.js
@@ -786,7 +786,16 @@ var Tools = {
 			return {attribs: attribs};
 		};
 		return function (input) {
-			return html.sanitizeWithPolicy(getString(input), tagPolicy);
+			// Implement <pokemonicon> and <itemicon>
+			input = getString(input).replace(/<(pokemon|item)icon>([^<]*)<\/\1icon>/g, function (match, p1, p2) {
+				if (p1 === 'pokemon') {
+					return '<span class="picon" style="display:inline-block;' + Tools.getPokemonIcon(p2) + '"></span>';
+				} else if (p1 === 'item') {
+					return '<span class="itemicon" style="display:inline-block;' + Tools.getItemIcon(p2) + '"></span>';
+				}
+			});
+
+			return html.sanitizeWithPolicy(input, tagPolicy);
 		};
 	})(),