diff --git a/swad_calendar.c b/swad_calendar.c
index 40cacc2f7..2f2d53cb8 100644
--- a/swad_calendar.c
+++ b/swad_calendar.c
@@ -63,6 +63,8 @@ static void Cal_ShowFormToSelFirstDayOfWeek (Act_Action_t Action,const char *Cla
 
 static unsigned Cal_GetParamFirstDayOfWeek (void);
 
+static void Cal_PutIconToPrintCalendar (void);
+
 /*****************************************************************************/
 /************** Put icons to select the first day of the week ****************/
 /*****************************************************************************/
@@ -231,7 +233,6 @@ void Cal_DrawCurrentMonth (void)
 */
 void Cal_DrawCalendar (void)
   {
-   extern const char *Txt_Print;
    extern const char *Txt_STR_LANG_ID[1+Txt_NUM_LANGUAGES];
    char Params[256+256+Ses_LENGTH_SESSION_ID+256];
    bool PrintView = (Gbl.Action.Act == ActPrnCal);
@@ -247,15 +248,9 @@ void Cal_DrawCalendar (void)
    Exa_CreateListOfExamAnnouncements ();
 
    /***** Start of table and title *****/
-   if (!PrintView)
-     {
-      /* Link to print view */
-      fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
-      Lay_PutContextualLink (ActPrnCal,NULL,"print64x64.png",
-                             Txt_Print,Txt_Print);
-      fprintf (Gbl.F.Out,"</div>");
-     }
-   Lay_StartRoundFrameTable (NULL,0,NULL);
+   Lay_StartRoundFrame (NULL,NULL,PrintView ? NULL :
+	                                      Cal_PutIconToPrintCalendar);
+   fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE\">");
    Lay_WriteHeaderClassPhoto (1,PrintView,false,
 			      Gbl.CurrentIns.Ins.InsCod,
 			      Gbl.CurrentDeg.Deg.DegCod,
@@ -293,11 +288,24 @@ void Cal_DrawCalendar (void)
 	    Params);
 
    fprintf (Gbl.F.Out,"</td>"
-	              "</tr>");
+	              "</tr>"
+	              "</table>");
 
    /***** Free list of dates of exam announcements *****/
    Exa_FreeListExamAnnouncements ();
 
    /***** End frame *****/
-   Lay_EndRoundFrameTable ();
+   Lay_EndRoundFrame ();
   }
+
+/*****************************************************************************/
+/************************ Draw an academic calendar **************************/
+/*****************************************************************************/
+
+static void Cal_PutIconToPrintCalendar (void)
+  {
+   extern const char *Txt_Print;
+
+   Lay_PutContextualLink (ActPrnCal,NULL,"print64x64.png",Txt_Print,NULL);
+  }
+
diff --git a/swad_changelog.h b/swad_changelog.h
index bd0afd8e9..65d248dee 100644
--- a/swad_changelog.h
+++ b/swad_changelog.h
@@ -134,13 +134,14 @@
 /****************************** Public constants *****************************/
 /*****************************************************************************/
 
-#define Log_PLATFORM_VERSION	"SWAD 15.150.9 (2016-03-18)"
+#define Log_PLATFORM_VERSION	"SWAD 15.150.10 (2016-03-18)"
 #define CSS_FILE		"swad15.150.2.css"
 #define JS_FILE			"swad15.131.3.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 15.150.10:Mar 18, 2016	Icon to print calendar integrated in frame. (195961 lines)
         Version 15.150.9: Mar 18, 2016	Icons to print/show-all students/teachers integrated in frame. (195957 lines)
         Version 15.150.8: Mar 18, 2016	Icons to print/show-all guests integrated in frame. (195967 lines)
         Version 15.150.7: Mar 18, 2016	Icon to print degree configuration integrated in frame. (195970 lines)