--- a/XCalc
+++ b/XCalc
@@ -132,8 +132,7 @@ XCalc*ti.button1.label:		1/x
 XCalc*ti.button1.translations: #override<Btn1Down>,<Btn1Up>:reciprocal()unset()
 XCalc*ti.button2.label:		x\262
 XCalc*ti.button2.translations: #override<Btn1Down>,<Btn1Up>:square()unset()
-XCalc*ti.button3.font:		-adobe-symbol-*-*-*-*-*-120-*-*-*-*-*-*
-XCalc*ti.button3.label:		\326\140
+XCalc*ti.button3.label:		SQRT
 XCalc*ti.button3.translations: #override<Btn1Down>,<Btn1Up>:squareRoot()unset()
 XCalc*ti.button4.label:		CE/C
 XCalc*ti.button4.translations: #override<Btn1Down>,<Btn1Up>:clear()unset()
@@ -174,8 +173,7 @@ XCalc*ti.button19.translations: #override<Btn1Down>,<Btn1Up>:xor()unset()
 XCalc*ti.button20.label:	trunc
 XCalc*ti.button20.translations: #override<Btn1Down>,<Btn1Up>:trunc()unset()
 
-XCalc*ti.button21.font:		-adobe-symbol-*-*-*-*-*-120-*-*-*-*-*-*
-XCalc*ti.button21.label:	\160
+XCalc*ti.button21.label:	pi
 XCalc*ti.button21.translations: #override<Btn1Down>,<Btn1Up>:pi()unset()
 XCalc*ti.button22.label:	x!
 XCalc*ti.button22.translations: #override<Btn1Down>,<Btn1Up>:factorial()unset()
@@ -205,8 +203,7 @@ XCalc*ti.button33.label:	B
 XCalc*ti.button33.translations: #override<Btn1Down>,<Btn1Up>:digit(B)unset()
 XCalc*ti.button34.label:	C
 XCalc*ti.button34.translations: #override<Btn1Down>,<Btn1Up>:digit(C)unset()
-XCalc*ti.button35.font:		-adobe-symbol-*-*-*-*-*-120-*-*-*-*-*-*
-XCalc*ti.button35.label:	\270
+XCalc*ti.button35.label:	\367
 XCalc*ti.button35.translations: #override<Btn1Down>,<Btn1Up>:divide()unset()
 
 XCalc*ti.button36.label:	STO
@@ -217,7 +214,7 @@ XCalc*ti.button38.label:	8
 XCalc*ti.button38.translations: #override<Btn1Down>,<Btn1Up>:digit(8)unset()
 XCalc*ti.button39.label:	9
 XCalc*ti.button39.translations: #override<Btn1Down>,<Btn1Up>:digit(9)unset()
-XCalc*ti.button40.label:	*
+XCalc*ti.button40.label:	\327
 XCalc*ti.button40.translations: #override<Btn1Down>,<Btn1Up>:multiply()unset()
 
 XCalc*ti.button41.label:	RCL
@@ -437,8 +434,7 @@ XCalc*hp.bevel.screen.LCD.translations:	#replace\n\
 	<Key>BackSpace:back()\n\
 	<Btn1Down>,<Btn1Up>:toggle()selection()\n
 
-XCalc*hp.button1.font:		-adobe-symbol-*-*-*-*-*-120-*-*-*-*-*-*
-XCalc*hp.button1.label:		\326\140
+XCalc*hp.button1.label:		SQRT
 XCalc*hp.button1.translations: #override<Btn1Down>,<Btn1Up>:squareRoot()unset()
 XCalc*hp.button2.label:		e^x
 XCalc*hp.button2.translations: #override<Btn1Down>,<Btn1Up>:epower()unset()
@@ -456,14 +452,12 @@ XCalc*hp.button8.label:		8
 XCalc*hp.button8.translations: #override<Btn1Down>,<Btn1Up>:digit(8)unset()
 XCalc*hp.button9.label:		9
 XCalc*hp.button9.translations: #override<Btn1Down>,<Btn1Up>:digit(9)unset()
-XCalc*hp.button10.font:		-adobe-symbol-*-*-*-*-*-120-*-*-*-*-*-*
-XCalc*hp.button10.label:	\270
+XCalc*hp.button10.label:	\367
 XCalc*hp.button10.translations: #override<Btn1Down>,<Btn1Up>:divide()unset()
 
 XCalc*hp.button11.label:	x!
 XCalc*hp.button11.translations: #override<Btn1Down>,<Btn1Up>:factorial()unset()
-XCalc*hp.button12.font:		-adobe-symbol-*-*-*-*-*-120-*-*-*-*-*-*
-XCalc*hp.button12.label:	\160
+XCalc*hp.button12.label:	pi
 XCalc*hp.button12.translations: #override<Btn1Down>,<Btn1Up>:pi()unset()
 XCalc*hp.button13.label:	sin
 XCalc*hp.button13.translations: #override<Btn1Down>,<Btn1Up>:sine()unset()
@@ -479,7 +473,7 @@ XCalc*hp.button18.label:	5
 XCalc*hp.button18.translations: #override<Btn1Down>,<Btn1Up>:digit(5)unset()
 XCalc*hp.button19.label:	6
 XCalc*hp.button19.translations: #override<Btn1Down>,<Btn1Up>:digit(6)unset()
-XCalc*hp.button20.label:	*
+XCalc*hp.button20.label:	\327
 XCalc*hp.button20.translations: #override<Btn1Down>,<Btn1Up>:multiply()unset()
 
 XCalc*hp.button21.mappedWhenManaged: False