diff --git a/source/gui/CButton.cpp b/source/gui/CButton.cpp
index a1064f8869..14b9d6ed5d 100755
--- a/source/gui/CButton.cpp
+++ b/source/gui/CButton.cpp
@@ -44,11 +44,14 @@ void CButton::SetupText()
 	assert(m_GeneratedTexts.size()>=1);
 
 	CStr font;
+	if (GUI<CStr>::GetSetting(this, "font", font) != PS_OK || font.Length()==0)
+		// Use the default if none is specified
+		font = "palatino12";
+
 	CGUIString caption;
 	GUI<CGUIString>::GetSetting(this, "caption", caption);
 
-	//*m_GeneratedTexts[0] = GetGUI()->GenerateText(caption, CStr("palatino12"), 0, 0);
-	*m_GeneratedTexts[0] = GetGUI()->GenerateText(caption, CStr("palatino12"), m_CachedActualSize.GetWidth(), 0);
+	*m_GeneratedTexts[0] = GetGUI()->GenerateText(caption, font, m_CachedActualSize.GetWidth(), 0);
 
 	// Set position of text
 	//m_TextPos = m_CachedActualSize.CenterPoint() - m_GeneratedTexts[0]->m_Size/2;
diff --git a/source/gui/CGUI.cpp b/source/gui/CGUI.cpp
index 3f1d940f5f..f71ed0b6c3 100755
--- a/source/gui/CGUI.cpp
+++ b/source/gui/CGUI.cpp
@@ -692,7 +692,7 @@ SGUIText CGUI::GenerateText(const CGUIString &string, /*const CColor &Color, */
 						union_from = max(y, it->m_YFrom);
 						union_to = min(y+prelim_line_height, it->m_YTo);
 						
-						// The union is not ø
+						// The union is not empty
 						if (union_to > union_from)
 						{
 							if (j == From)
@@ -761,7 +761,7 @@ SGUIText CGUI::GenerateText(const CGUIString &string, /*const CColor &Color, */
 				vector<SGUIText::STextCall>::iterator it;
 				for (it = Feedback2.m_TextCalls.begin(); it != Feedback2.m_TextCalls.end(); ++it)
 				{
-					it->m_Pos = CPos(x + x_pointer, y + line_height - it->m_Size.cy);
+					it->m_Pos = CPos(x + x_pointer, y);
 
 					x_pointer += it->m_Size.cx;