diff --git a/css/swad16.86.5.css b/css/swad16.86.5.css
index 9b6895f3a..b516eb269 100644
--- a/css/swad16.86.5.css
+++ b/css/swad16.86.5.css
@@ -1995,16 +1995,14 @@ a:hover img.CENTRE_PHOTO_SHOW
 .PREF_OFF
 	{
 	box-sizing:border-box;
-	height:44px;
-	padding:0 10px;
+	padding:6px;
 	text-align:center;
 	vertical-align:middle;
 	}
 .PREF_ON
 	{
 	box-sizing:border-box;
-	height:44px;
-	padding:0 10px;
+	padding:6px;
 	text-align:center;
 	vertical-align:middle;
 	border:solid 1px;
diff --git a/icon/lock-off64x64.png b/icon/lock-off64x64.png
new file mode 100644
index 000000000..8e22095f8
Binary files /dev/null and b/icon/lock-off64x64.png differ
diff --git a/icon/lock-on64x64.png b/icon/lock-on64x64.png
new file mode 100644
index 000000000..b826b54e6
Binary files /dev/null and b/icon/lock-on64x64.png differ
diff --git a/icon/lockunlock64x64.png b/icon/lockunlock64x64.png
new file mode 100644
index 000000000..4d170a8ae
Binary files /dev/null and b/icon/lockunlock64x64.png differ
diff --git a/icon/unlock-off64x64.png b/icon/unlock-off64x64.png
new file mode 100644
index 000000000..c00003fab
Binary files /dev/null and b/icon/unlock-off64x64.png differ
diff --git a/icon/unlock-on64x64.png b/icon/unlock-on64x64.png
new file mode 100644
index 000000000..682783180
Binary files /dev/null and b/icon/unlock-on64x64.png differ
diff --git a/icon/unlock64x64.png b/icon/unlock64x64.png
new file mode 100644
index 000000000..f1963b28d
Binary files /dev/null and b/icon/unlock64x64.png differ
diff --git a/swad_agenda.c b/swad_agenda.c
index 1ecd6e548..460841ac2 100644
--- a/swad_agenda.c
+++ b/swad_agenda.c
@@ -74,7 +74,7 @@ static void Agd_ShowEvents (Agd_AgendaType_t AgendaType);
 static void Agd_PutIconToCreateNewEvent (void);
 static void Agd_PutButtonToCreateNewEvent (void);
 static void Agd_PutParamsToCreateNewEvent (void);
-static void Agd_ShowSelectorWhichEvents (void);
+static void Agd_ShowFormToSelWhichEvents (Act_Action_t Action);
 static void Agd_GetParamWhichEvents (void);
 static void Agd_ShowOneEvent (Agd_AgendaType_t AgendaType,long AgdCod);
 static void Agd_WriteEventAuthor (struct AgendaEvent *AgdEvent);
@@ -211,7 +211,7 @@ static void Agd_ShowEvents (Agd_AgendaType_t AgendaType)
 	 /***** Put form to choice whether to show
                 all events or only public events *****/
 	 Act_FormStart (ActSeeMyAgd);
-	 Agd_ShowSelectorWhichEvents ();
+	 Agd_ShowFormToSelWhichEvents (ActSeeMyAgd);
 	 Act_FormEnd ();
 	 break;
      }
@@ -325,33 +325,36 @@ static void Agd_PutParamsToCreateNewEvent (void)
   }
 
 /*****************************************************************************/
-/** Show selector to choice whether to show all events or only public events */
+/*** Show form to choice whether to show all events or only public events ****/
 /*****************************************************************************/
 
-static void Agd_ShowSelectorWhichEvents (void)
+static void Agd_ShowFormToSelWhichEvents (Act_Action_t Action)
   {
    extern const char *Txt_Show_WHICH_events[2];
    Agd_WhichEvents_t WhichEvents;
 
-   fprintf (Gbl.F.Out,"<div style=\"margin:12px 0;\">"
-                      "<ul class=\"LIST_CENTER\">");
+   fprintf (Gbl.F.Out,"<div style=\"display:table-cell; padding:0 20px;\">");
    for (WhichEvents = Agd_ALL_EVENTS;
 	WhichEvents <= Agd_ONLY_PUBLIC_EVENTS;
 	WhichEvents++)
      {
-      fprintf (Gbl.F.Out,"<li class=\"DAT LEFT_MIDDLE\""
-	                 " style=\"display:inline;\">"
-                         "<input type=\"radio\" name=\"WhichEvents\" value=\"%u\"",
-               (unsigned) WhichEvents);
-      if (WhichEvents == Gbl.Agenda.WhichEvents)
-         fprintf (Gbl.F.Out," checked=\"checked\"");
-      fprintf (Gbl.F.Out," onclick=\"document.getElementById('%s').submit();\" />"
-                         " %s"
-                         "</li>",
-               Gbl.Form.Id,Txt_Show_WHICH_events[WhichEvents]);
+      fprintf (Gbl.F.Out,"<div class=\"%s\" style=\"display:table-cell;\">",
+	       WhichEvents == Gbl.Agenda.WhichEvents ? "PREF_ON" :
+					               "PREF_OFF");
+      Act_FormStart (Action);
+      Par_PutHiddenParamUnsigned ("WhichEvents",(unsigned) WhichEvents);
+      fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/%s\""
+			 " alt=\"%s\" title=\"%s\" class=\"ICO25x25\""
+			 " style=\"margin:0 auto;\" />",
+	       Gbl.Prefs.IconsURL,
+	       WhichEvents == Agd_ONLY_PUBLIC_EVENTS ? "unlock64x64.png" :
+		                                       "lockunlock64x64.png",
+	       Txt_Show_WHICH_events[WhichEvents],
+	       Txt_Show_WHICH_events[WhichEvents]);
+      Act_FormEnd ();
+      fprintf (Gbl.F.Out,"</div>");
      }
-   fprintf (Gbl.F.Out,"</ul>"
-                      "</div>");
+   fprintf (Gbl.F.Out,"</div>");
   }
 
 /*****************************************************************************/
@@ -597,12 +600,12 @@ static void Agd_PutFormsToRemEditOneEvent (struct AgendaEvent *AgdEvent)
      {
       if (AgdEvent->Public)
 	 Lay_PutContextualLink (ActPrvEvtMyAgd,Agd_PutParams,
-				"open_on16x16.gif",
+				"unlock-on64x64.png",
 				Txt_Event_visible_to_the_users_of_your_courses_click_to_make_it_private,NULL,
 				NULL);
       else
 	 Lay_PutContextualLink (ActPubEvtMyAgd,Agd_PutParams,
-				"closed_on16x16.gif",
+				"lock-on64x64.png",
 				Txt_Event_private_click_to_make_it_visible_to_the_users_of_your_courses,NULL,
 				NULL);
      }
diff --git a/swad_changelog.h b/swad_changelog.h
index 0098fb536..84553e02d 100644
--- a/swad_changelog.h
+++ b/swad_changelog.h
@@ -183,13 +183,14 @@
 /****************************** Public constants *****************************/
 /*****************************************************************************/
 
-#define Log_PLATFORM_VERSION	"SWAD 16.86.6 (2016-12-04)"
+#define Log_PLATFORM_VERSION	"SWAD 16.86.7 (2016-12-05)"
 #define CSS_FILE		"swad16.86.5.css"
 #define JS_FILE			"swad16.84.2.js"
 
 // Number of lines (includes comments but not blank lines) has been got with the following command:
 // nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*?.h sql/swad*.sql | tail -1
 /*
+        Version 16.86.7:  Dec 05, 2016	Changes in icons for open/closed and public/private. (209852 lines)
         Version 16.86.6:  Dec 04, 2016	Removed contextual icons to change which groups to show. (209876 lines)
         Version 16.86.5:  Dec 04, 2016	Changes in layout of forms to change which groups to show / first day of week. (209913 lines)
         Version 16.86.4:  Dec 04, 2016	Contextual icons to change which groups to show. (209864 lines)
diff --git a/swad_file_browser.c b/swad_file_browser.c
index 858370559..2ceb82cc9 100644
--- a/swad_file_browser.c
+++ b/swad_file_browser.c
@@ -6049,7 +6049,7 @@ static void Brw_WriteFileName (unsigned Level,bool IsPublic,
 
       /* Put icon to make public/private file */
       if (IsPublic)
-         fprintf (Gbl.F.Out,"&nbsp;<img src=\"%s/open_on16x16.gif\""
+         fprintf (Gbl.F.Out,"&nbsp;<img src=\"%s/unlock-on64x64.png\""
                             " alt=\"%s\" title=\"%s\""
                             " class=\"ICO20x20\" />",
                   Gbl.Prefs.IconsURL,
diff --git a/swad_group.c b/swad_group.c
index d1b179505..38b533525 100644
--- a/swad_group.c
+++ b/swad_group.c
@@ -1334,12 +1334,12 @@ static void Grp_ListGroupsForEdition (void)
                   Grp->Open ? Txt_Group_X_open_click_to_close_it :
                               Txt_Group_X_closed_click_to_open_it,
                   Grp->GrpName);
-         fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/%s_on16x16.gif\""
+         fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/%s-on64x64.png\""
                             " alt=\"%s\" title=\"%s\""
                             " class=\"ICO20x20\" />",
                   Gbl.Prefs.IconsURL,
-                  Grp->Open ? "open" :
-                	      "closed",
+                  Grp->Open ? "unlock" :
+                	      "lock",
                   Gbl.Title,
                   Gbl.Title);
          Act_FormEnd ();
@@ -2000,13 +2000,13 @@ static void Grp_WriteRowGrp (struct Group *Grp,bool Highlight)
    if (Highlight)
       fprintf (Gbl.F.Out," LIGHT_BLUE");
    fprintf (Gbl.F.Out,"\" style=\"width:15px;\">"
-	              "<img src=\"%s/%s_off16x16.gif\""
+	              "<img src=\"%s/%s-off64x64.png\""
 	              " alt=\"%s\" title=\"%s\""
 	              " class=\"ICO20x20\" />"
 	              "</td>",
             Gbl.Prefs.IconsURL,
-            Grp->Open ? "open" :
-        	        "closed",
+            Grp->Open ? "unlock" :
+        	        "lock",
 	    Gbl.Title,Gbl.Title);
 
    /***** Group name *****/
@@ -2195,7 +2195,7 @@ static void Grp_PutFormToCreateGroup (void)
    Lay_PutIconRemovalNotAllowed ();
    fprintf (Gbl.F.Out,"</td>"
                       "<td class=\"BM\">"
-                      "<img src=\"%s/closed_off16x16.gif\""
+                      "<img src=\"%s/lock-off64x64.png\""
                       " alt=\"%s\" title=\"%s\""
                       " class=\"ICO20x20\" />"
                       "</td>"
@@ -4201,36 +4201,9 @@ void Grp_PutParamWhichGrpsAllGrps (void)
   }
 
 /*****************************************************************************/
-/********** Show selector to choice whether to show only my groups ***********/
-/********** or all groups in timetable                             ***********/
+/***** Show form to choice whether to show only my groups or all groups ******/
 /*****************************************************************************/
 
-void Grp_ShowSelectorWhichGrps (void)
-  {
-   extern const char *Txt_Show_WHICH_groups[2];
-   Grp_WhichGroups_t WhichGrps;
-
-   fprintf (Gbl.F.Out,"<div style=\"margin:12px 0;\">"
-                      "<ul class=\"LIST_CENTER\">");
-   for (WhichGrps = Grp_ONLY_MY_GROUPS;
-	WhichGrps <= Grp_ALL_GROUPS;
-	WhichGrps++)
-     {
-      fprintf (Gbl.F.Out,"<li class=\"DAT LEFT_MIDDLE\""
-	                 " style=\"display:inline;\">"
-                         "<input type=\"radio\" name=\"WhichGrps\" value=\"%u\"",
-               (unsigned) WhichGrps);
-      if (WhichGrps == Gbl.CurrentCrs.Grps.WhichGrps)
-         fprintf (Gbl.F.Out," checked=\"checked\"");
-      fprintf (Gbl.F.Out," onclick=\"document.getElementById('%s').submit();\" />"
-                         " %s"
-                         "</li>",
-               Gbl.Form.Id,Txt_Show_WHICH_groups[WhichGrps]);
-     }
-   fprintf (Gbl.F.Out,"</ul>"
-                      "</div>");
-  }
-
 void Grp_ShowFormToSelWhichGrps (Act_Action_t Action,void (*FuncParams) ())
   {
    extern const char *Txt_Show_WHICH_groups[2];
diff --git a/swad_group.h b/swad_group.h
index a355a218a..0a81e70f5 100644
--- a/swad_group.h
+++ b/swad_group.h
@@ -182,7 +182,6 @@ void Grp_PutParamAllGroups (void);
 void Grp_PutParamWhichGrps (void);
 void Grp_PutParamWhichGrpsOnlyMyGrps (void);
 void Grp_PutParamWhichGrpsAllGrps (void);
-void Grp_ShowSelectorWhichGrps (void);
 void Grp_ShowFormToSelWhichGrps (Act_Action_t Action,void (*FuncParams) ());
 void Grp_GetParamWhichGrps (void);
 
diff --git a/swad_message.c b/swad_message.c
index da63dc2b1..e7153fd07 100644
--- a/swad_message.c
+++ b/swad_message.c
@@ -3589,7 +3589,7 @@ static void Msg_PutFormToBanSender (struct UsrData *UsrDat)
    Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage);
    Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
    Msg_PutHiddenParamsMsgsFilters ();
-   fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/open_on16x16.gif\""
+   fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/unlock-on64x64.png\""
 	              " alt=\"%s\" title=\"%s\""
 	              " class=\"ICO20x20\" style=\"margin-left:12px;\" />",
             Gbl.Prefs.IconsURL,
@@ -3611,7 +3611,7 @@ static void Msg_PutFormToUnbanSender (struct UsrData *UsrDat)
    Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
    Msg_PutHiddenParamsMsgsFilters ();
    fprintf (Gbl.F.Out,"<span class=\"MSG_AUT\">&nbsp;</span>"
-	              "<input type=\"image\" src=\"%s/closed_on16x16.gif\""
+	              "<input type=\"image\" src=\"%s/lock-on64x64.png\""
 	              " alt=\"%s\" title=\"%s\""
 	              " class=\"ICO20x20\" />",
             Gbl.Prefs.IconsURL,
@@ -3790,7 +3790,7 @@ void Msg_ListBannedUsrs (void)
             Act_FormStart (ActUnbUsrLst);
             Usr_PutParamUsrCodEncrypted (UsrDat.EncryptedUsrCod);
             fprintf (Gbl.F.Out,"<input type=\"image\""
-        	               " src=\"%s/closed_on16x16.gif\""
+        	               " src=\"%s/lock-on64x64.png\""
         	               " alt=\"%s\" title=\"%s\""
         	               " class=\"ICO20x20\" />",
                      Gbl.Prefs.IconsURL,