diff --git a/icon/future64x64.png b/icon/future64x64.png
new file mode 100644
index 000000000..b41c8c359
Binary files /dev/null and b/icon/future64x64.png differ
diff --git a/icon/past64x64.png b/icon/past64x64.png
new file mode 100644
index 000000000..3bae7b906
Binary files /dev/null and b/icon/past64x64.png differ
diff --git a/swad_agenda.c b/swad_agenda.c
index e1682200f..6ebf36a26 100644
--- a/swad_agenda.c
+++ b/swad_agenda.c
@@ -166,8 +166,8 @@ static void Agd_ShowFormToSelPastFutureEvents (void)
    Agd_PastFutureEvents_t PstFut;
    static const char *Image[2] =
      {
-      "backward64x64.png",	// Agd_PAST_EVENTS
-      "forward64x64.png",	// Agd_FUTURE_EVENTS
+      "past64x64.png",		// Agd_PAST_EVENTS
+      "future64x64.png",	// Agd_FUTURE_EVENTS
      };
 
    fprintf (Gbl.F.Out,"<div class=\"PREF_CONTAINER\">");
@@ -216,11 +216,11 @@ static void Agd_ShowFormToSelPrivatePublicEvents (void)
 	PrvPub++)
      {
       fprintf (Gbl.F.Out,"<div class=\"%s\">",
-	       (Gbl.Agenda.PastFutureEvents & (1 << PrvPub)) ? "PREF_ON" :
-							       "PREF_OFF");
+	       (Gbl.Agenda.PrivatePublicEvents & (1 << PrvPub)) ? "PREF_ON" :
+							          "PREF_OFF");
       Act_FormStart (ActSeeMyAgd);
-      Agd_PutHiddenParamsPastFutureEvents (1 << PrvPub);
-      Agd_PutHiddenParamsPrivatePublicEvents (Gbl.Agenda.PrivatePublicEvents);
+      Agd_PutHiddenParamsPastFutureEvents (Gbl.Agenda.PastFutureEvents);
+      Agd_PutHiddenParamsPrivatePublicEvents (1 << PrvPub);
       Agd_PutHiddenParamsHiddenVisibleEvents (Gbl.Agenda.HiddenVisibleEvents);
 
       fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/%s\""
@@ -256,12 +256,12 @@ static void Agd_ShowFormToSelHiddenVisibleEvents (void)
 	HidVis++)
      {
       fprintf (Gbl.F.Out,"<div class=\"%s\">",
-	       (Gbl.Agenda.PastFutureEvents & (1 << HidVis)) ? "PREF_ON" :
-							       "PREF_OFF");
+	       (Gbl.Agenda.HiddenVisibleEvents & (1 << HidVis)) ? "PREF_ON" :
+							          "PREF_OFF");
       Act_FormStart (ActSeeMyAgd);
-      Agd_PutHiddenParamsPastFutureEvents (1 << HidVis);
+      Agd_PutHiddenParamsPastFutureEvents (Gbl.Agenda.PastFutureEvents);
       Agd_PutHiddenParamsPrivatePublicEvents (Gbl.Agenda.PrivatePublicEvents);
-      Agd_PutHiddenParamsHiddenVisibleEvents (Gbl.Agenda.HiddenVisibleEvents);
+      Agd_PutHiddenParamsHiddenVisibleEvents (1 << HidVis);
 
       fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/%s\""
 			 " alt=\"%s\" title=\"%s\" class=\"ICO25x25\""
diff --git a/swad_changelog.h b/swad_changelog.h
index d21bc4433..78a19e03a 100644
--- a/swad_changelog.h
+++ b/swad_changelog.h
@@ -210,14 +210,15 @@
 /****************************** Public constants *****************************/
 /*****************************************************************************/
 
-#define Log_PLATFORM_VERSION	"SWAD 16.158 (2017-03-21)"
+#define Log_PLATFORM_VERSION	"SWAD 16.158.1 (2017-03-21)"
 #define CSS_FILE		"swad16.157.css"
 #define JS_FILE			"swad16.144.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.158:   Mar 21, 2017	Changes in agenda. No finished.
+        Version 16.158.1: Mar 21, 2017	Changes in agenda. Not finished. (217395 lines)
+        Version 16.158:   Mar 21, 2017	Changes in agenda. Not finished.
 					Fixed bug in user enrollment. (217394 lines)
 Copy the following icons to icon public directory:
 sudo cp -a backward64x64.png /var/www/html/swad/icon/
diff --git a/swad_global.c b/swad_global.c
index 5d59dc70a..02bf989eb 100644
--- a/swad_global.c
+++ b/swad_global.c
@@ -424,7 +424,7 @@ void Gbl_InitializeGlobals (void)
 
    /* Agenda */
    Gbl.Agenda.PastFutureEvents    = (1 << Agd_FUTURE_EVENTS);
-   Gbl.Agenda.PrivatePublicEvents = (1 << Agd_PRIVATE_EVENTS) &
+   Gbl.Agenda.PrivatePublicEvents = (1 << Agd_PRIVATE_EVENTS) |
 	                            (1 << Agd_PUBLIC_EVENTS);
    Gbl.Agenda.HiddenVisibleEvents = (1 << Agd_VISIBLE_EVENTS);
    Gbl.Agenda.SelectedOrder = Agd_ORDER_DEFAULT;