diff --git a/gtk/gtktoolbutton.c b/gtk/gtktoolbutton.c
index 635fed719b..8ccf3cf073 100644
--- a/gtk/gtktoolbutton.c
+++ b/gtk/gtktoolbutton.c
@@ -271,8 +271,9 @@ gtk_tool_button_class_init (GtkToolButtonClass *klass)
    * GtkToolButton:icon-name:
    * 
    * The name of the themed icon displayed on the item.
-   * This property only has an effect if not overridden by "label", 
-   * "icon_widget" or "stock_id" properties.
+   * This property only has an effect if not overridden by
+   * #GtkToolButton:label-widget, #GtkToolButton:icon-widget or
+   * #GtkToolButton:stock-id properties.
    *
    * Since: 2.8 
    */
@@ -1165,11 +1166,12 @@ gtk_tool_button_new (GtkWidget	 *icon_widget,
  * @button: a #GtkToolButton
  * @label: (allow-none): a string that will be used as label, or %NULL.
  *
- * Sets @label as the label used for the tool button. The “label” property
- * only has an effect if not overridden by a non-%NULL “label-widget” property.
- * If both the “label-widget” and “label” properties are %NULL, the label
- * is determined by the “stock-id” property. If the “stock-id” property is also
- * %NULL, @button will not have a label.
+ * Sets @label as the label used for the tool button. The #GtkToolButton:label
+ * property only has an effect if not overridden by a non-%NULL 
+ * #GtkToolButton:label-widget property. If both the #GtkToolButton:label-widget
+ * and #GtkToolButton:label properties are %NULL, the label is determined by the
+ * #GtkToolButton:stock-id property. If the #GtkToolButton:stock-id property is
+ * also %NULL, @button will not have a label.
  * 
  * Since: 2.4
  **/
@@ -1280,8 +1282,8 @@ gtk_tool_button_get_use_underline (GtkToolButton *button)
  * @stock_id: (allow-none): a name of a stock item, or %NULL
  *
  * Sets the name of the stock item. See gtk_tool_button_new_from_stock().
- * The stock_id property only has an effect if not
- * overridden by non-%NULL “label-widget” and “icon-widget” properties.
+ * The stock_id property only has an effect if not overridden by non-%NULL 
+ * #GtkToolButton:label-widget and #GtkToolButton:icon-widget properties.
  * 
  * Since: 2.4
  *
@@ -1333,9 +1335,9 @@ gtk_tool_button_get_stock_id (GtkToolButton *button)
  *
  * Sets the icon for the tool button from a named themed icon.
  * See the docs for #GtkIconTheme for more details.
- * The “icon_name” property only has an effect if not
- * overridden by non-%NULL “label-widget”, “icon-widget” and “stock-id”
- * properties.
+ * The #GtkToolButton:icon-name property only has an effect if not
+ * overridden by non-%NULL #GtkToolButton:label-widget, 
+ * #GtkToolButton:icon-widget and #GtkToolButton:stock-id properties.
  * 
  * Since: 2.8
  **/
@@ -1383,8 +1385,8 @@ gtk_tool_button_get_icon_name (GtkToolButton *button)
  * @icon_widget: (allow-none): the widget used as icon, or %NULL
  *
  * Sets @icon as the widget used as icon on @button. If @icon_widget is
- * %NULL the icon is determined by the “stock-id” property. If the
- * “stock-id” property is also %NULL, @button will not have an icon.
+ * %NULL the icon is determined by the #GtkToolButton:stock-id property. If the
+ * #GtkToolButton:stock-id property is also %NULL, @button will not have an icon.
  * 
  * Since: 2.4
  **/
@@ -1425,10 +1427,10 @@ gtk_tool_button_set_icon_widget (GtkToolButton *button,
  * @label_widget: (allow-none): the widget used as label, or %NULL
  *
  * Sets @label_widget as the widget that will be used as the label
- * for @button. If @label_widget is %NULL the “label” property is used
- * as label. If “label” is also %NULL, the label in the stock item
- * determined by the “stock-id” property is used as label. If
- * “stock-id” is also %NULL, @button does not have a label.
+ * for @button. If @label_widget is %NULL the #GtkToolButton:label property is used
+ * as label. If #GtkToolButton:label is also %NULL, the label in the stock item
+ * determined by the #GtkToolButton:stock-id property is used as label. If
+ * #GtkToolButton:stock-id is also %NULL, @button does not have a label.
  * 
  * Since: 2.4
  **/