diff --git a/src/insets/InsetIPAMacro.cpp b/src/insets/InsetIPAMacro.cpp
index a529d04b08..5aeaf8432a 100644
--- a/src/insets/InsetIPAMacro.cpp
+++ b/src/insets/InsetIPAMacro.cpp
@@ -553,59 +553,34 @@ int InsetIPAChar::plaintext(odocstringstream & os, OutputParams const &, size_t)
 }
 
 
+namespace {
+std::string ipaCharToXMLEntity(InsetIPAChar::Kind kind) {
+	switch (kind) {
+	case InsetIPAChar::Kind::TONE_FALLING:
+		return "˥˩";
+	case InsetIPAChar::Kind::TONE_RISING:
+		return "˩˥";
+	case InsetIPAChar::Kind::TONE_HIGH_RISING:
+		return "˧˥";
+	case InsetIPAChar::Kind::TONE_LOW_RISING:
+		return "˩˧";
+	case InsetIPAChar::Kind::TONE_HIGH_RISING_FALLING:
+		return "˨˥˨";
+	}
+	return "";
+}
+}
+
+
 void InsetIPAChar::docbook(XMLStream & xs, OutputParams const &) const
 {
-	switch (kind_) {
-	case TONE_FALLING:
-		xs << XMLStream::ESCAPE_NONE << "&#x2e5;";
-		xs << XMLStream::ESCAPE_NONE << "&#x2e9;";
-		break;
-	case TONE_RISING:
-		xs << XMLStream::ESCAPE_NONE << "&#x2e9;";
-		xs << XMLStream::ESCAPE_NONE << "&#x2e5;";
-		break;
-	case TONE_HIGH_RISING:
-		xs << XMLStream::ESCAPE_NONE << "&#x2e7;";
-		xs << XMLStream::ESCAPE_NONE << "&#x2e5;";
-		break;
-	case TONE_LOW_RISING:
-		xs << XMLStream::ESCAPE_NONE << "&#x2e9;";
-		xs << XMLStream::ESCAPE_NONE << "&#x2e7;";
-		break;
-	case TONE_HIGH_RISING_FALLING:
-		xs << XMLStream::ESCAPE_NONE << "&#x2e8;";
-		xs << XMLStream::ESCAPE_NONE << "&#x2e5;";
-		xs << XMLStream::ESCAPE_NONE << "&#x2e8;";
-		break;
-	}
+	xs << XMLStream::ESCAPE_NONE << from_ascii(ipaCharToXMLEntity(kind()));
 }
 
 
 docstring InsetIPAChar::xhtml(XMLStream & xs, OutputParams const &) const
 {
-	switch (kind_) {
-	case TONE_FALLING:
-		xs << XMLStream::ESCAPE_NONE << "&#x2e5;"
-		   << XMLStream::ESCAPE_NONE << "&#x2e9;";
-		break;
-	case TONE_RISING:
-		xs << XMLStream::ESCAPE_NONE << "&#x2e9;"
-		   << XMLStream::ESCAPE_NONE << "&#x2e5;";
-		break;
-	case TONE_HIGH_RISING:
-		xs << XMLStream::ESCAPE_NONE << "&#x2e7;"
-		   << XMLStream::ESCAPE_NONE << "&#x2e5;";
-		break;
-	case TONE_LOW_RISING:
-		xs << XMLStream::ESCAPE_NONE << "&#x2e9;"
-		   << XMLStream::ESCAPE_NONE << "&#x2e7;";
-		break;
-	case TONE_HIGH_RISING_FALLING:
-		xs << XMLStream::ESCAPE_NONE << "&#x2e8;"
-		   << XMLStream::ESCAPE_NONE << "&#x2e5;"
-		   << XMLStream::ESCAPE_NONE << "&#x2e8;";
-		break;
-	}
+	xs << XMLStream::ESCAPE_NONE << from_ascii(ipaCharToXMLEntity(kind()));
 	return docstring();
 }