diff --git a/js/battle.js b/js/battle.js
index 2e77d64ff..d2f4e4ce3 100644
--- a/js/battle.js
+++ b/js/battle.js
@@ -2758,7 +2758,7 @@ var Battle = (function () {
 			},
 			deltastream: {
 				name: 'Strong Winds',
-				startMessage: 'A mysterious air current is protecting Flying-type Pokemon!',
+				startMessage: 'A mysterious air current is protecting Flying-type Pokémon!',
 				endMessage: 'The mysterious air current has dissipated!'
 			}
 		};
diff --git a/js/client-teambuilder.js b/js/client-teambuilder.js
index 2e371771a..ad2d5070a 100644
--- a/js/client-teambuilder.js
+++ b/js/client-teambuilder.js
@@ -1022,7 +1022,7 @@
 					buf += '<div class="setmenu setmenu-left"><button name="undeleteSet"><i class="fa fa-undo"></i> Undo Delete</button></div>';
 				}
 				buf += '<div class="setmenu"><button name="importSet"><i class="fa fa-upload"></i>Import</button></div>';
-				buf += '<div class="setchart" style="background-image:url(' + Tools.resourcePrefix + 'sprites/bw/0.png);"><div class="setcol setcol-icon"><span class="itemicon"></span><div class="setcell setcell-pokemon"><label>Pokemon</label><input type="text" name="pokemon" class="chartinput" value="" /></div></div></div>';
+				buf += '<div class="setchart" style="background-image:url(' + Tools.resourcePrefix + 'sprites/bw/0.png);"><div class="setcol setcol-icon"><span class="itemicon"></span><div class="setcell setcell-pokemon"><label>Pok&eacute;mon</label><input type="text" name="pokemon" class="chartinput" value="" /></div></div></div>';
 				buf += '</li>';
 				return buf;
 			}
@@ -1038,7 +1038,7 @@
 				var item = Tools.getItem(set.item);
 				itemicon = '<span class="itemicon" style="' + Tools.getItemIcon(item) + '"></span>';
 			}
-			buf += '<div class="setcol setcol-icon">' + itemicon + '<div class="setcell setcell-pokemon"><label>Pokemon</label><input type="text" name="pokemon" class="chartinput" value="' + Tools.escapeHTML(set.species) + '" /></div></div>';
+			buf += '<div class="setcol setcol-icon">' + itemicon + '<div class="setcell setcell-pokemon"><label>Pok&eacute;mon</label><input type="text" name="pokemon" class="chartinput" value="' + Tools.escapeHTML(set.species) + '" /></div></div>';
 
 			// details
 			buf += '<div class="setcol setcol-details"><div class="setrow">';
diff --git a/js/search.js b/js/search.js
index 80f7a7d37..0eacec89a 100644
--- a/js/search.js
+++ b/js/search.js
@@ -73,7 +73,7 @@
 		category: 7
 	};
 	var typeName = {
-		pokemon: 'Pokemon',
+		pokemon: 'Pok&eacute;mon',
 		type: 'Type',
 		move: 'Moves',
 		item: 'Items',