diff --git a/libempathy/empathy-call-handler.c b/libempathy/empathy-call-handler.c
index 3172499..537bdde 100644
--- a/libempathy/empathy-call-handler.c
+++ b/libempathy/empathy-call-handler.c
@@ -43,6 +43,7 @@ enum {
   SINK_PAD_ADDED,
   REQUEST_RESOURCE,
   CLOSED,
+  VIDEO_STREAM_CHANGED,
   LAST_SIGNAL
 };
 
@@ -71,6 +72,13 @@ typedef struct {
 #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyCallHandler)
 
 static void
+empathy_call_handler_call_video_stream_cb (EmpathyTpCall *call,
+    GParamSpec *property, EmpathyCallHandler *self)
+{
+  g_signal_emit (G_OBJECT (self), signals[VIDEO_STREAM_CHANGED], 0);
+}
+
+static void
 empathy_call_handler_dispose (GObject *object)
 {
   EmpathyCallHandlerPriv *priv = GET_PRIV (object);
@@ -93,6 +101,8 @@ empathy_call_handler_dispose (GObject *object)
   if (priv->call != NULL)
     {
       empathy_tp_call_close (priv->call);
+      g_signal_handlers_disconnect_by_func (priv->call,
+          empathy_call_handler_call_video_stream_cb, object);
       g_object_unref (priv->call);
     }
 
@@ -262,6 +272,13 @@ empathy_call_handler_class_init (EmpathyCallHandlerClass *klass)
       g_cclosure_marshal_VOID__VOID,
       G_TYPE_NONE,
       0);
+
+  signals[VIDEO_STREAM_CHANGED] =
+    g_signal_new ("video-stream-changed", G_TYPE_FROM_CLASS (klass),
+      G_SIGNAL_RUN_LAST, 0, NULL, NULL,
+      g_cclosure_marshal_VOID__VOID,
+      G_TYPE_NONE,
+      0);
 }
 
 /**
@@ -514,6 +531,9 @@ empathy_call_handler_request_cb (EmpathyDispatchOperation *operation,
 
   g_object_ref (priv->call);
 
+  g_signal_connect (priv->call, "notify::video-stream",
+      G_CALLBACK (empathy_call_handler_call_video_stream_cb), self);
+
   empathy_call_handler_start_tpfs (self);
 
   empathy_tp_call_to (priv->call, priv->contact,
@@ -536,6 +556,8 @@ empathy_call_handler_start_call (EmpathyCallHandler *handler)
   if (priv->call != NULL)
     {
       empathy_call_handler_start_tpfs (handler);
+      g_signal_connect (priv->call, "notify::video-stream",
+          G_CALLBACK (empathy_call_handler_call_video_stream_cb), handler);
       empathy_tp_call_accept_incoming_call (priv->call);
       return;
     }
diff --git a/libempathy/empathy-tp-call.c b/libempathy/empathy-tp-call.c
index 2971e0f..bf3fe77 100644
--- a/libempathy/empathy-tp-call.c
+++ b/libempathy/empathy-tp-call.c
@@ -672,3 +672,40 @@ empathy_tp_call_has_dtmf (EmpathyTpCall *call)
       TP_IFACE_QUARK_CHANNEL_INTERFACE_DTMF);
 }
 
+/**
+ * empathy_tp_call_is_receiving_video:
+ * @call: the call
+ *
+ * Indicates if the call is receiving video or not.
+ *
+ * Returns: %TRUE if the call is currently receiving video, %FALSE otherwise.
+ */
+gboolean
+empathy_tp_call_is_receiving_video (EmpathyTpCall *call)
+{
+  EmpathyTpCallPriv *priv = GET_PRIV (call);
+
+  g_return_val_if_fail (EMPATHY_IS_TP_CALL (call), FALSE);
+
+  return priv->video->direction == TP_MEDIA_STREAM_DIRECTION_RECEIVE ||
+            priv->video->direction == TP_MEDIA_STREAM_DIRECTION_BIDIRECTIONAL;
+}
+
+/**
+ * empathy_tp_call_is_sending_video:
+ * @call: the call
+ *
+ * Indicates if the call is sending video or not.
+ *
+ * Returns: %TRUE if the call is currently sending video, %FALSE otherwise.
+ */
+gboolean
+empathy_tp_call_is_sending_video (EmpathyTpCall *call)
+{
+  EmpathyTpCallPriv *priv = GET_PRIV (call);
+
+  g_return_val_if_fail (EMPATHY_IS_TP_CALL (call), FALSE);
+
+  return priv->video->direction == TP_MEDIA_STREAM_DIRECTION_SEND ||
+            priv->video->direction == TP_MEDIA_STREAM_DIRECTION_BIDIRECTIONAL;
+}
diff --git a/libempathy/empathy-tp-call.h b/libempathy/empathy-tp-call.h
index 406ed1c..a00fe3e 100644
--- a/libempathy/empathy-tp-call.h
+++ b/libempathy/empathy-tp-call.h
@@ -85,6 +85,8 @@ void empathy_tp_call_request_video_stream_direction (EmpathyTpCall *call,
 void empathy_tp_call_start_tone (EmpathyTpCall *call, TpDTMFEvent event);
 void empathy_tp_call_stop_tone (EmpathyTpCall *call);
 gboolean empathy_tp_call_has_dtmf (EmpathyTpCall *call);
+gboolean empathy_tp_call_is_receiving_video (EmpathyTpCall *call);
+gboolean empathy_tp_call_is_sending_video (EmpathyTpCall *call);
 
 G_END_DECLS
 
diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index dd993fc..925d126 100644
--- a/src/empathy-call-window.c
+++ b/src/empathy-call-window.c
@@ -206,6 +206,9 @@ static void empathy_call_window_video_menu_popup (EmpathyCallWindow *window,
 static void empathy_call_window_status_message (EmpathyCallWindow *window,
   gchar *message);
 
+static void empathy_call_window_update_avatars_visibility (EmpathyTpCall *call,
+  EmpathyCallWindow *window);
+
 static gboolean empathy_call_window_bus_message (GstBus *bus,
   GstMessage *message, gpointer user_data);
 
@@ -1013,6 +1016,10 @@ empathy_call_window_disconnected (EmpathyCallWindow *self)
 
   empathy_call_window_status_message (self, _("Disconnected"));
 
+  gtk_widget_hide (priv->video_output);
+  gtk_widget_hide (priv->video_preview);
+  gtk_widget_show (priv->self_user_avatar_widget);
+  gtk_widget_show (priv->remote_user_avatar_widget);
   gtk_widget_set_sensitive (priv->camera_button, FALSE);
   gtk_action_set_sensitive (priv->send_video, FALSE);
   priv->sending_video = FALSE;
@@ -1119,6 +1126,7 @@ empathy_call_window_connected (gpointer user_data)
       gtk_action_set_sensitive (priv->send_video, TRUE);
     }
 
+  empathy_call_window_update_avatars_visibility (call, self);
   g_object_unref (call);
 
   g_mutex_lock (priv->lock);
@@ -1334,6 +1342,48 @@ empathy_call_window_bus_message (GstBus *bus, GstMessage *message,
 }
 
 static void
+empathy_call_window_update_avatars_visibility (EmpathyTpCall *call,
+    EmpathyCallWindow *window)
+{
+  EmpathyCallWindowPriv *priv = GET_PRIV (window);
+
+  if (empathy_tp_call_is_receiving_video (call))
+    {
+      gtk_widget_hide (priv->remote_user_avatar_widget);
+      gtk_widget_show (priv->video_output);
+    }
+  else
+    {
+      gtk_widget_hide (priv->video_output);
+      gtk_widget_show (priv->remote_user_avatar_widget);
+    }
+
+  if (empathy_tp_call_is_sending_video (call))
+    {
+      gtk_widget_hide (priv->self_user_avatar_widget);
+      gtk_widget_show (priv->video_preview);
+    }
+  else
+    {
+      gtk_widget_hide (priv->video_preview);
+      gtk_widget_show (priv->self_user_avatar_widget);
+    }
+}
+
+static void
+empathy_call_window_video_stream_changed_cb (EmpathyCallHandler *handler,
+    EmpathyCallWindow *window)
+{
+  EmpathyTpCall *call;
+  EmpathyCallWindowPriv *priv = GET_PRIV (window);
+
+  g_object_get (priv->handler, "tp-call", &call, NULL);
+
+  empathy_call_window_update_avatars_visibility (call, window);
+  g_object_unref (call);
+}
+
+static void
 empathy_call_window_realized_cb (GtkWidget *widget, EmpathyCallWindow *window)
 {
   EmpathyCallWindowPriv *priv = GET_PRIV (window);
@@ -1349,6 +1399,8 @@ empathy_call_window_realized_cb (GtkWidget *widget, EmpathyCallWindow *window)
     G_CALLBACK (empathy_call_window_src_added_cb), window);
   g_signal_connect (priv->handler, "sink-pad-added",
     G_CALLBACK (empathy_call_window_sink_added_cb), window);
+  g_signal_connect (priv->handler, "video-stream-changed",
+    G_CALLBACK (empathy_call_window_video_stream_changed_cb), window);
 
 
   preview = empathy_video_widget_get_element (
