diff --git a/gtk2_ardour/waves_ui.cc b/gtk2_ardour/waves_ui.cc
index b981c2f0ff..043fdb949e 100644
--- a/gtk2_ardour/waves_ui.cc
+++ b/gtk2_ardour/waves_ui.cc
@@ -147,7 +147,7 @@ WavesUI::create_widget (const XMLNode& definition, const XMLNodeMap& styles)
 	if (widget_type == "BUTTON") {
 		child = manage (new WavesButton (text));
 	} else if (widget_type == "ICONBUTTON") {
-		child = manage (new WavesIconButton);
+		child = manage (new WavesIconButton (text));
 	} else if (widget_type == "DROPDOWN") {
 		child = manage (new WavesDropdown (text));
 	} else if (widget_type == "DROPDOWNITEM") {
diff --git a/libs/canvas/xml_ui.cc b/libs/canvas/xml_ui.cc
index 7a3a458950..4d301cd3c1 100644
--- a/libs/canvas/xml_ui.cc
+++ b/libs/canvas/xml_ui.cc
@@ -179,7 +179,7 @@ xml_property (const XMLNode &node, const char *prop_name, const XMLNodeMap& styl
 std::string
 xml_property (const XMLNode &node, const char *prop_name, const std::string& default_value)
 {
-	return node.property (prop_name) ? node.property(prop_name)->value() : "";
+	return node.property (prop_name) ? node.property(prop_name)->value() : default_value;
 }
 
 std::string