diff --git a/panels/network/cc-wifi-connection-row.c b/panels/network/cc-wifi-connection-row.c
index 88ca9dfdc..84c8aee10 100644
--- a/panels/network/cc-wifi-connection-row.c
+++ b/panels/network/cc-wifi-connection-row.c
@@ -244,9 +244,25 @@ update_ui (CcWifiConnectionRow *self)
 
       gtk_widget_set_child_visible (GTK_WIDGET (self->encrypted_icon), TRUE);
       if (security == NM_AP_SEC_WEP)
-        icon_name = "channel-insecure-symbolic";
+	{
+          icon_name = "channel-insecure-symbolic";
+	  gtk_widget_set_tooltip_text (GTK_WIDGET (self->encrypted_icon), _("Insecure network (WEP)"));
+	}
+      else if (security == NM_AP_SEC_WPA)
+	{
+          icon_name = "network-wireless-encrypted-symbolic";
+          gtk_widget_set_tooltip_text (GTK_WIDGET (self->encrypted_icon), _("Secure network (WPA)"));
+	}
+      else if (security == NM_AP_SEC_WPA2)
+	{
+          icon_name = "network-wireless-encrypted-symbolic";
+          gtk_widget_set_tooltip_text (GTK_WIDGET (self->encrypted_icon), _("Secure network (WPA2)"));
+	}
       else
-        icon_name = "network-wireless-encrypted-symbolic";
+	{
+          icon_name = "network-wireless-encrypted-symbolic";
+          gtk_widget_set_tooltip_text (GTK_WIDGET (self->encrypted_icon), _("Secure network"));
+	}
 
       g_object_set (self->encrypted_icon, "icon-name", icon_name, NULL);
     }