91fac43f09a030cf65f5f60b183fa15e6a6342c9
diff --git a/embed/ephy-embed.c b/embed/ephy-embed.c
index 6c6d4cd..058ced9 100644
--- a/embed/ephy-embed.c
+++ b/embed/ephy-embed.c
@@ -20,6 +20,8 @@
 
 #include "config.h"
 
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
 #include "ephy-embed.h"
 #include "ephy-zoom.h"
 
@@ -486,7 +488,7 @@ ephy_embed_base_init (gpointer g_class)
 									  _("Blank page"),
 									  G_PARAM_READABLE | G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB));
                 g_object_interface_install_property (g_class,
-                                                     g_param_spec_string ("status message",
+                                                     g_param_spec_string ("status-message",
                                                                           "Status Message",
                                                                           "The embed's statusbar message",
                                                                           NULL,
diff --git a/embed/mozilla/mozilla-embed.cpp b/embed/mozilla/mozilla-embed.cpp
index 3e5c926..2d38b16 100644
--- a/embed/mozilla/mozilla-embed.cpp
+++ b/embed/mozilla/mozilla-embed.cpp
@@ -395,8 +395,10 @@ mozilla_embed_class_init (MozillaEmbedClass *klass)
 	g_object_class_override_property (object_class, PROP_ADDRESS, "address");
 	g_object_class_override_property (object_class, PROP_TYPED_ADDRESS, "typed-address");
 	g_object_class_override_property (object_class, PROP_TITLE, "title");
-	g_object_class_override_property (object_class, PROP_STATUS_MESSAGE, "message");
+	g_object_class_override_property (object_class, PROP_STATUS_MESSAGE, "status-message");
 	g_object_class_override_property (object_class, PROP_LINK_MESSAGE, "link-message");
+	g_object_class_override_property (object_class, PROP_ICON, "icon");
+	g_object_class_override_property (object_class, PROP_ICON_ADDRESS, "icon-address");
 
 	g_type_class_add_private (object_class, sizeof(MozillaEmbedPrivate));
 }
@@ -405,8 +407,9 @@ static void
 mozilla_embed_init (MozillaEmbed *embed)
 {
 	EphyFaviconCache *cache;
-	MozillaEmbedPrivate *priv = embed->priv;
-	priv = MOZILLA_EMBED_GET_PRIVATE (embed);
+	MozillaEmbedPrivate *priv;
+	embed->priv = MOZILLA_EMBED_GET_PRIVATE (embed);
+        priv = embed->priv;
 	priv->browser = new EphyBrowser ();
 
 	g_signal_connect_object (embed, "location",
@@ -1228,6 +1231,22 @@ impl_get_loading_title (EphyEmbed *embed)
         return priv->loading_title;
 }
 
+static const char*
+impl_get_icon_address (EphyEmbed *embed)
+{
+        MozillaEmbedPrivate *priv = MOZILLA_EMBED (embed)->priv;
+
+        return priv->icon_address;
+}
+
+static GdkPixbuf*
+impl_get_icon (EphyEmbed *embed)
+{
+        MozillaEmbedPrivate *priv = MOZILLA_EMBED (embed)->priv;
+
+        return priv->icon;
+}
+
 static void
 mozilla_embed_set_address (MozillaEmbed *embed, char *address)
 {
@@ -2358,6 +2377,8 @@ ephy_embed_iface_init (EphyEmbedIface *iface)
         iface->get_status_message = impl_get_status_message;
         iface->get_is_blank = impl_get_is_blank;
         iface->get_loading_title = impl_get_loading_title;
+        iface->get_icon = impl_get_icon;
+        iface->get_icon_address = impl_get_icon_address;
 }
 
 static void
diff --git a/src/ephy-window.c b/src/ephy-window.c
index c042f5f..a3d4f94 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -2225,7 +2225,7 @@ ephy_window_set_active_tab (EphyWindow *window, EphyTab *new_tab)
 		g_signal_connect_object (embed, "notify::icon",
 					 G_CALLBACK (sync_tab_icon),
 					 window, 0);
-		g_signal_connect_object (embed, "notify::message",
+		g_signal_connect_object (embed, "notify::status-message",
 					 G_CALLBACK (sync_tab_message),
 					 window, 0);
 		g_signal_connect_object (embed, "notify::security-level",
