diff --git a/source/gui/CButton.cpp b/source/gui/CButton.cpp
index 466911957f..72c4e3cbcb 100644
--- a/source/gui/CButton.cpp
+++ b/source/gui/CButton.cpp
@@ -45,7 +45,7 @@ CButton::CButton()
 	AddSetting(GUIST_CColor,				"textcolor_over");
 	AddSetting(GUIST_CColor,				"textcolor_pressed");
 	AddSetting(GUIST_CColor,				"textcolor_disabled");
-	AddSetting(GUIST_CStr,					"tooltip");
+	AddSetting(GUIST_CStrW,					"tooltip");
 	AddSetting(GUIST_CStr,					"tooltip_style");
 
 	// Add text
diff --git a/source/gui/CCheckBox.cpp b/source/gui/CCheckBox.cpp
index eb61257734..dd5e28e2d4 100644
--- a/source/gui/CCheckBox.cpp
+++ b/source/gui/CCheckBox.cpp
@@ -50,7 +50,7 @@ CCheckBox::CCheckBox()
 	AddSetting(GUIST_CColor,				"textcolor_over");
 	AddSetting(GUIST_CColor,				"textcolor_pressed");
 	AddSetting(GUIST_CColor,				"textcolor_disabled");
-	AddSetting(GUIST_CStr,					"tooltip");
+	AddSetting(GUIST_CStrW,					"tooltip");
 	AddSetting(GUIST_CStr,					"tooltip_style");
 
 	// Add text
diff --git a/source/gui/CImage.cpp b/source/gui/CImage.cpp
index ada607e3e0..1e48da0632 100644
--- a/source/gui/CImage.cpp
+++ b/source/gui/CImage.cpp
@@ -33,7 +33,7 @@ CImage::CImage()
 {
 	AddSetting(GUIST_CGUISpriteInstance,	"sprite");
 	AddSetting(GUIST_int,					"cell_id");
-	AddSetting(GUIST_CStr,					"tooltip");
+	AddSetting(GUIST_CStrW,					"tooltip");
 	AddSetting(GUIST_CStr,					"tooltip_style");
 }
 
diff --git a/source/gui/CInput.cpp b/source/gui/CInput.cpp
index 899f74a1f2..9133a85170 100644
--- a/source/gui/CInput.cpp
+++ b/source/gui/CInput.cpp
@@ -52,7 +52,7 @@ CInput::CInput() : m_iBufferPos(-1), m_iBufferPos_Tail(-1), m_SelectingText(fals
 	AddSetting(GUIST_CGUISpriteInstance,	"sprite_selectarea");
 	AddSetting(GUIST_CColor,				"textcolor");
 	AddSetting(GUIST_CColor,				"textcolor_selected");
-	AddSetting(GUIST_CStr,					"tooltip");
+	AddSetting(GUIST_CStrW,					"tooltip");
 	AddSetting(GUIST_CStr,					"tooltip_style");
 
 	// Add scroll-bar
diff --git a/source/gui/CList.cpp b/source/gui/CList.cpp
index 8bd2fd3402..68878e2955 100644
--- a/source/gui/CList.cpp
+++ b/source/gui/CList.cpp
@@ -47,7 +47,7 @@ CList::CList()
 	AddSetting(GUIST_CColor,				"textcolor");
 	AddSetting(GUIST_CColor,				"textcolor_selected");
 	AddSetting(GUIST_int,					"selected");	// Index selected. -1 is none.
-	AddSetting(GUIST_CStr,					"tooltip");
+	AddSetting(GUIST_CStrW,					"tooltip");
 	AddSetting(GUIST_CStr,					"tooltip_style");
 	// Each list item has both a name (in 'list') and an associated data string (in 'list_data')
 	AddSetting(GUIST_CGUIList,				"list");
diff --git a/source/gui/CProgressBar.cpp b/source/gui/CProgressBar.cpp
index 2022589dd8..064ded4c2a 100644
--- a/source/gui/CProgressBar.cpp
+++ b/source/gui/CProgressBar.cpp
@@ -34,7 +34,7 @@ CProgressBar::CProgressBar()
 	AddSetting(GUIST_CGUISpriteInstance,	"sprite_background");
 	AddSetting(GUIST_CGUISpriteInstance,	"sprite_bar");
 	AddSetting(GUIST_float,					"caption"); // aka value from 0 to 100
-	AddSetting(GUIST_CStr,					"tooltip");
+	AddSetting(GUIST_CStrW,					"tooltip");
 	AddSetting(GUIST_CStr,					"tooltip_style");
 }
 
diff --git a/source/gui/CText.cpp b/source/gui/CText.cpp
index db7a900c13..783fbbcc75 100644
--- a/source/gui/CText.cpp
+++ b/source/gui/CText.cpp
@@ -44,11 +44,11 @@ CText::CText()
 	AddSetting(GUIST_EAlign,				"text_align");
 	AddSetting(GUIST_EVAlign,				"text_valign");
 	AddSetting(GUIST_CColor,				"textcolor");
-	AddSetting(GUIST_CStr,					"tooltip");
+	AddSetting(GUIST_CStrW,					"tooltip");
 	AddSetting(GUIST_CStr,					"tooltip_style");
 
-	//Private settings
-	AddSetting(GUIST_CStr,					"_icon_tooltip");
+	// Private settings
+	AddSetting(GUIST_CStrW,					"_icon_tooltip");
 	AddSetting(GUIST_CStr,					"_icon_tooltip_style");
 
 	//GUI<bool>::SetSetting(this, "ghost", true);
diff --git a/source/gui/GUITooltip.cpp b/source/gui/GUITooltip.cpp
index 968db12f3a..bac3ca4000 100644
--- a/source/gui/GUITooltip.cpp
+++ b/source/gui/GUITooltip.cpp
@@ -90,8 +90,8 @@ bool GUITooltip::GetTooltip(IGUIObject* obj, CStr& style)
 		if (GUI<CStr>::GetSetting(obj, "_icon_tooltip_style", style) == PSRETURN_OK)
 		{
 			// Check if icon tooltip text exists
-			CStr text;
-			if (GUI<CStr>::GetSetting(obj, "_icon_tooltip", text) == PSRETURN_OK)
+			CStrW text;
+			if (GUI<CStrW>::GetSetting(obj, "_icon_tooltip", text) == PSRETURN_OK)
 			{
 				if (text.empty())
 				{
@@ -113,8 +113,8 @@ bool GUITooltip::GetTooltip(IGUIObject* obj, CStr& style)
 	else if (obj && obj->SettingExists("tooltip_style")
 		&& GUI<CStr>::GetSetting(obj, "tooltip_style", style) == PSRETURN_OK)
 	{
-		CStr text;
-		if (GUI<CStr>::GetSetting(obj, "tooltip", text) == PSRETURN_OK)
+		CStrW text;
+		if (GUI<CStrW>::GetSetting(obj, "tooltip", text) == PSRETURN_OK)
 		{
 			if (text.empty())
 			{
diff --git a/source/gui/MiniMap.cpp b/source/gui/MiniMap.cpp
index aabcbaffc4..ec3635f399 100644
--- a/source/gui/MiniMap.cpp
+++ b/source/gui/MiniMap.cpp
@@ -55,7 +55,7 @@ CMiniMap::CMiniMap() :
 {
 	AddSetting(GUIST_CColor,	"fov_wedge_color");
 	AddSetting(GUIST_bool,		"circular");
-	AddSetting(GUIST_CStr,		"tooltip");
+	AddSetting(GUIST_CStrW,		"tooltip");
 	AddSetting(GUIST_CStr,		"tooltip_style");
 	m_Clicking = false;
 	m_Hovering = false;