From 0e6ee3ee732dd08717ba64c4bd85ff3fae1111a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= <acanas@ugr.es>
Date: Mon, 14 Nov 2016 10:05:41 +0100
Subject: [PATCH] Version 16.59

---
 css/{swad16.51.css => swad16.59.css} |  71 ++++++-----
 swad_ID.c                            |   4 +-
 swad_account.c                       |   9 +-
 swad_announcement.c                  |  14 +--
 swad_assignment.c                    |   8 +-
 swad_attendance.c                    |  39 +++---
 swad_banner.c                        |   8 +-
 swad_calendar.c                      |   4 +-
 swad_centre.c                        |  13 +-
 swad_changelog.h                     |   7 +-
 swad_chat.c                          |  10 +-
 swad_connected.c                     |   2 +-
 swad_country.c                       |  18 ++-
 swad_course.c                        |  20 ++--
 swad_degree.c                        |  19 ++-
 swad_degree_type.c                   |  11 +-
 swad_department.c                    |  14 +--
 swad_file_browser.c                  |  51 ++++----
 swad_follow.c                        |  35 +++---
 swad_forum.c                         |  30 +++--
 swad_group.c                         |  35 +++---
 swad_holiday.c                       |  12 +-
 swad_icon.c                          |   2 +-
 swad_image.c                         |   2 +-
 swad_indicator.c                     |   2 +-
 swad_institution.c                   |  14 +--
 swad_layout.c                        |  59 ++++-----
 swad_logo.c                          |   2 +-
 swad_mail.c                          |  16 ++-
 swad_menu.c                          |   4 +-
 swad_message.c                       |  12 +-
 swad_network.c                       |  13 +-
 swad_notice.c                        |  23 ++--
 swad_notification.c                  |  14 +--
 swad_password.c                      |   3 +-
 swad_place.c                         |  12 +-
 swad_plugin.c                        |  18 ++-
 swad_record.c                        |  38 +++---
 swad_report.c                        |   2 +-
 swad_search.c                        |   2 +-
 swad_social.c                        |  60 +++++-----
 swad_statistic.c                     | 173 +++++++++++++--------------
 swad_survey.c                        |  22 ++--
 swad_syllabus.c                      |  26 ++--
 swad_tab.c                           |   8 +-
 swad_test.c                          |  42 +++----
 swad_test_import.c                   |   8 +-
 swad_timetable.c                     |   2 +-
 swad_user.c                          |  29 ++---
 swad_zip.c                           |   6 +-
 50 files changed, 499 insertions(+), 549 deletions(-)
 rename css/{swad16.51.css => swad16.59.css} (98%)

diff --git a/css/swad16.51.css b/css/swad16.59.css
similarity index 98%
rename from css/swad16.51.css
rename to css/swad16.59.css
index 2ba4cccca..4047a0165 100644
--- a/css/swad16.51.css
+++ b/css/swad16.59.css
@@ -710,7 +710,7 @@ a:hover						/* Default ==> underlined */
 	opacity:1;
 	transform:scale(1.25,1.25);
 	}
-#main_horizontal .MENU_ICON
+#main_horizontal .MENU_ICO
 	{
 	box-sizing:border-box;
 	padding:32px 0 0 0;
@@ -769,7 +769,7 @@ a:hover						/* Default ==> underlined */
 		opacity:1;
 		transform:scale(1.2,1.2);
 		}
-	#main_vertical .MENU_ICON
+	#main_vertical .MENU_ICO
 		{
 		box-sizing:border-box;
 		padding:32px 0 0 0;
@@ -825,7 +825,7 @@ a:hover						/* Default ==> underlined */
 		{
 		opacity:1;
 		}
-	#main_vertical .MENU_ICON
+	#main_vertical .MENU_ICO
 		{
 		display:table-cell;
 		height:42px;
@@ -1269,7 +1269,7 @@ a:hover						/* Default ==> underlined */
 	box-sizing:border-box;
 	max-width:90%;
 	margin:8px auto 0 auto;
-	background-color:#FFF9E0;
+	background-color:#FFF9EA;
 	background-position:12px 12px;
 	background-size:20px 20px;
 	background-repeat:no-repeat;
@@ -1284,14 +1284,14 @@ a:hover						/* Default ==> underlined */
 	}
 
 /*********************************** Icons ***********************************/
-.ICON20x15B	{width:20px; height:15px; vertical-align:middle; display:block;}
-.ICON20x20	{width:20px; height:20px; vertical-align:middle;}
-.ICON20x20B	{width:20px; height:20px; vertical-align:middle; display:block;}
-.ICON25x25	{width:25px; height:25px; vertical-align:middle;}
-.ICON40x40	{width:40px; height:40px; vertical-align:middle;}
-.ICON40x40B	{width:40px; height:40px; vertical-align:middle; display:block;}
-.ICON64x64	{width:64px; height:64px; vertical-align:middle;}
-.ICON160x160	{width:160px; height:160px; vertical-align:middle;}
+.ICO20x15B	{width:20px; height:15px; vertical-align:middle; display:block;}
+.ICO20x20	{width:20px; height:20px; vertical-align:middle;}
+.ICO20x20B	{width:20px; height:20px; vertical-align:middle; display:block;}
+.ICO25x25	{width:25px; height:25px; vertical-align:middle;}
+.ICO40x40	{width:40px; height:40px; vertical-align:middle;}
+.ICO40x40B	{width:40px; height:40px; vertical-align:middle; display:block;}
+.ICO64x64	{width:64px; height:64px; vertical-align:middle;}
+.ICO160x160	{width:160px; height:160px; vertical-align:middle;}
 .BANNER		{width:150px; height:50px;}
 .BANNER_SMALL	{width:75px; height:25px;}
 
@@ -1337,33 +1337,33 @@ a:hover						/* Default ==> underlined */
 	text-align:center;
 	overflow:hidden;
 	}
-.FRAME_ICONS
+.FRAME_ICO
 	{
 	box-sizing:border-box;
 	height:20px;
 	text-align:left;
 	}
-.FRAME_ICONS_LEFT
+.FRAME_ICO_LEFT
 	{
 	display:inline-block;
 	}
-.FRAME_ICONS_RIGHT
+.FRAME_ICO_RIGHT
 	{
 	display:inline-block;
 	float:right;
 	}
-.FRAME_TABLE
+.FRAME_TBL
 	{
 	box-sizing:border-box;
 	width:100%;
 	}
-.FRAME_TABLE_MARGIN
+.FRAME_TBL_MARGIN
 	{
 	box-sizing:border-box;
 	width:100%;
 	margin-bottom:20px;
 	}
-.FRAME_TABLE_TITLE
+.FRAME_TBL_TITLE
 	{
 	display:table;
 	box-sizing:border-box;
@@ -1561,15 +1561,24 @@ a:hover img.CENTRE_PHOTO_SHOW
 .YELLOW_TITLE		{color:#BD4815; font-size:18pt;}
 
 /**************************** Icon highlighting ******************************/
-.ICON_HIDDEN
+.ICO_HIDDEN
 	{
 	opacity:0.2;
 	}
-.ICON_HIGHLIGHT
+.ICO_HIGHLIGHT
 	{
 	opacity:0.67;
 	}
-.ICON_HIGHLIGHT:hover
+.ICO_HIGHLIGHT:hover
+	{
+	opacity:1;
+	}
+
+.HLP_HIGHLIGHT
+	{
+	opacity:0.33;
+	}
+.HLP_HIGHLIGHT:hover
 	{
 	opacity:1;
 	}
@@ -2005,7 +2014,7 @@ a:hover img.CENTRE_PHOTO_SHOW
 	{
 	cursor:pointer;
 	}
-.IMG_UPLOAD_ICON
+.IMG_UPLOAD_ICO
 	{
 	width:20px;
 	height:20px;
@@ -2123,7 +2132,7 @@ a:hover img.CENTRE_PHOTO_SHOW
 	width:480px;
 	vertical-align:top;
 	}
-.SOCIAL_ICONS_FAV_SHA_REM	/* Container for fav, share and remove */
+.SOCIAL_ICOS_FAV_SHA_REM	/* Container for fav, share and remove */
 	{
 	padding-bottom:10px;
 	}
@@ -2157,42 +2166,42 @@ a:hover img.CENTRE_PHOTO_SHOW
 	box-sizing:border-box;
 	width:440px;
 	}
-.SOCIAL_ICON_COMMENT
+.SOCIAL_ICO_COMMENT
 	{
 	display:inline-block;
 	padding-bottom:10px;
 	}
-.SOCIAL_ICON_COMMENT_DISABLED
+.SOCIAL_ICO_COMMENT_DISABLED
 	{
 	display:inline-block;
 	padding-bottom:10px;
 	opacity:0.1;
 	}
-.SOCIAL_ICON_FAV
+.SOCIAL_ICO_FAV
 	{
 	display:inline-block;
 	vertical-align:bottom;
 	}
-.SOCIAL_ICON_SHARE
+.SOCIAL_ICO_SHARE
 	{
 	display:inline-block;
 	padding-left:20px;
 	vertical-align:bottom;
 	}
-.SOCIAL_ICON_FAV_DISABLED
+.SOCIAL_ICO_FAV_DISABLED
 	{
 	display:inline-block;
 	vertical-align:bottom;
 	opacity:0.1;
 	}
-.SOCIAL_ICON_SHARE_DISABLED
+.SOCIAL_ICO_SHARE_DISABLED
 	{
 	display:inline-block;
 	padding-left:20px;
 	vertical-align:bottom;
 	opacity:0.1;
 	}
-.SOCIAL_ICON_REMOVE
+.SOCIAL_ICO_REMOVE
 	{
 	display:inline-block;
 	vertical-align:bottom;
@@ -2534,7 +2543,7 @@ a:hover img.CENTRE_PHOTO_SHOW
 	text-align:left;
 	vertical-align:bottom;
 	}
-.FOLLOW_USR_ICON
+.FOLLOW_USR_ICO
 	{
 	padding:4px;
 	}
diff --git a/swad_ID.c b/swad_ID.c
index e2ac6fbac..59727802b 100644
--- a/swad_ID.c
+++ b/swad_ID.c
@@ -515,7 +515,7 @@ void ID_ShowFormOthIDs (void)
 	 Rec_ShowSharedUsrRecord (Rec_RECORD_LIST,&Gbl.Usrs.Other.UsrDat);
 
 	 /***** Form with the user's ID *****/
-	 fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">");
+	 fprintf (Gbl.F.Out,"<table class=\"FRAME_TBL CELLS_PAD_2\">");
          ID_ShowFormChangeUsrID (&Gbl.Usrs.Other.UsrDat,
                                  (Gbl.Usrs.Other.UsrDat.UsrCod == Gbl.Usrs.Me.UsrDat.UsrCod));	// It's me?
 	 fprintf (Gbl.F.Out,"</table>");
@@ -602,7 +602,7 @@ void ID_ShowFormChangeUsrID (const struct UsrData *UsrDat,bool ItsMe)
 	 sprintf (Gbl.Title,Txt_ID_X_confirmed,UsrDat->IDs.List[NumID].ID);
 	 fprintf (Gbl.F.Out,"<img src=\"%s/ok_green16x16.gif\""
 			    " alt=\"%s\" title=\"%s\""
-			    " class=\"ICON20x20\" />",
+			    " class=\"ICO20x20\" />",
 		  Gbl.Prefs.IconsURL,
 		  Gbl.Title,Gbl.Title);
 	}
diff --git a/swad_account.c b/swad_account.c
index d707e288b..2f75848a7 100644
--- a/swad_account.c
+++ b/swad_account.c
@@ -336,15 +336,15 @@ static void Acc_ShowFormRequestNewAccountWithParams (const char *NewNicknameWith
 
    /***** Form to enter some data of the new user *****/
    Act_FormStart (ActCreUsrAcc);
-   Lay_StartRoundFrame (NULL,Txt_Create_a_new_account,NULL,Hlp_PROFILE_Sign_up);
+   Lay_StartRoundFrameTable (NULL,Txt_Create_a_new_account,
+                             NULL,Hlp_PROFILE_Sign_up,2);
 
    /***** Nickname *****/
    if (NewNicknameWithoutArroba[0])
       sprintf (NewNicknameWithArroba,"@%s",NewNicknameWithoutArroba);
    else
       NewNicknameWithArroba[0] = '\0';
-   fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">"
-                      "<tr>"
+   fprintf (Gbl.F.Out,"<tr>"
 	              "<td class=\"%s RIGHT_MIDDLE\">"
 	              "%s:"
 	              "</td>"
@@ -456,8 +456,7 @@ void Acc_ShowFormChangeMyAccount (void)
    fprintf (Gbl.F.Out,"</div>");
 
    /***** Start table *****/
-   Lay_StartRoundFrame (NULL,Txt_User_account,NULL,Hlp_PROFILE_Account);
-   fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">");
+   Lay_StartRoundFrameTable (NULL,Txt_User_account,NULL,Hlp_PROFILE_Account,2);
 
    /***** Nickname *****/
    if (IMustFillNickname)
diff --git a/swad_announcement.c b/swad_announcement.c
index 4502a86d9..12d1995f0 100644
--- a/swad_announcement.c
+++ b/swad_announcement.c
@@ -304,11 +304,11 @@ static void Ann_DrawAnAnnouncement (long AnnCod,Ann_Status_t Status,
       /* Form to remove announcement */
       Act_FormStart (ActRemAnn);
       Ann_PutHiddenParamAnnCod (AnnCod);
-      fprintf (Gbl.F.Out,"<div class=\"CONTEXT_OPT ICON_HIGHLIGHT\">"
+      fprintf (Gbl.F.Out,"<div class=\"CONTEXT_OPT ICO_HIGHLIGHT\">"
         	         "<input type=\"image\""
 	                 " src=\"%s/remove-on64x64.png\""
 			 " alt=\"%s\" title=\"%s\""
-			 " class=\"ICON20x20\" />"
+			 " class=\"ICO20x20\" />"
 			 "</div>",
 	       Gbl.Prefs.IconsURL,
 	       Txt_Remove,
@@ -321,11 +321,11 @@ static void Ann_DrawAnAnnouncement (long AnnCod,Ann_Status_t Status,
 	 case Ann_ACTIVE_ANNOUNCEMENT:
 	    Act_FormStart (ActHidAnn);
 	    Ann_PutHiddenParamAnnCod (AnnCod);
-	    fprintf (Gbl.F.Out,"<div class=\"CONTEXT_OPT ICON_HIGHLIGHT\">"
+	    fprintf (Gbl.F.Out,"<div class=\"CONTEXT_OPT ICO_HIGHLIGHT\">"
 			       "<input type=\"image\""
 			       " src=\"%s/eye-on64x64.png\""
 			       " alt=%s\" title=\"%s\""
-			       " class=\"ICON20x20\" />"
+			       " class=\"ICO20x20\" />"
 			       "</div>",
 		     Gbl.Prefs.IconsURL,
 		     Txt_NOTICE_Active_Mark_as_obsolete,
@@ -334,11 +334,11 @@ static void Ann_DrawAnAnnouncement (long AnnCod,Ann_Status_t Status,
 	 case Ann_OBSOLETE_ANNOUNCEMENT:
 	    Act_FormStart (ActRevAnn);
 	    Ann_PutHiddenParamAnnCod (AnnCod);
-	    fprintf (Gbl.F.Out,"<div class=\"CONTEXT_OPT ICON_HIGHLIGHT\">"
+	    fprintf (Gbl.F.Out,"<div class=\"CONTEXT_OPT ICO_HIGHLIGHT\">"
 			       "<input type=\"image\""
 			       " src=\"%s/eye-slash-on64x64.png\""
 			       " alt=\"%s\" title=\"%s\""
-			       " class=\"ICON20x20\" />"
+			       " class=\"ICO20x20\" />"
 			       "</div>",
 		     Gbl.Prefs.IconsURL,
 		     Txt_NOTICE_Obsolete_Mark_as_active,
@@ -384,7 +384,7 @@ static void Ann_DrawAnAnnouncement (long AnnCod,Ann_Status_t Status,
       Act_LinkFormSubmit (Txt_Do_not_show_again,The_ClassForm[Gbl.Prefs.Theme],NULL);
       fprintf (Gbl.F.Out,"<img src=\"%s/remove-on64x64.png\""
 			 " alt=\"%s\" title=\"%s\""
-			 " class=\"ICON20x20\" />"
+			 " class=\"ICO20x20\" />"
 			 " %s</a>",
 	       Gbl.Prefs.IconsURL,
 	       Txt_Do_not_show_again,
diff --git a/swad_assignment.c b/swad_assignment.c
index 949b41132..7719a613f 100644
--- a/swad_assignment.c
+++ b/swad_assignment.c
@@ -146,7 +146,7 @@ static void Asg_ShowAllAssignments (void)
    if (Gbl.Asgs.Num)
      {
       /***** Table head *****/
-      fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE_MARGIN CELLS_PAD_2\">"
+      fprintf (Gbl.F.Out,"<table class=\"FRAME_TBL_MARGIN CELLS_PAD_2\">"
                          "<tr>");
       for (Order = Asg_ORDER_BY_START_DATE;
 	   Order <= Asg_ORDER_BY_END_DATE;
@@ -348,7 +348,7 @@ static void Asg_ShowOneAssignment (long AsgCod)
    /* Send work? */
    fprintf (Gbl.F.Out,"<td rowspan=\"2\" class=\"%s CENTER_TOP COLOR%u\">"
                       "<img src=\"%s/%s16x16.gif\""
-                      " alt=\"%s\" title=\"%s\" class=\"ICON20x20\" />"
+                      " alt=\"%s\" title=\"%s\" class=\"ICO20x20\" />"
                       "<br />%s"
                       "</td>",
             (Asg.SendWork == Asg_SEND_WORK) ? "DAT_N" :
@@ -484,7 +484,7 @@ static void Asg_WriteAssignmentFolder (struct Assignment *Asg)
                   Asg->Folder);
          fprintf (Gbl.F.Out,"<input type=\"image\""
                             " src=\"%s/folder-open-plus16x16.gif\""
-                            " alt=\"%s\" title=\"%s\" class=\"ICON20x20\" />",
+                            " alt=\"%s\" title=\"%s\" class=\"ICO20x20\" />",
                   Gbl.Prefs.IconsURL,
                   Gbl.Title,
                   Gbl.Title);
@@ -492,7 +492,7 @@ static void Asg_WriteAssignmentFolder (struct Assignment *Asg)
         }
       else				// I can't send files to this assignment folder
          fprintf (Gbl.F.Out,"<img src=\"%s/folder-closed16x16.gif\""
-                            " alt=\"%s\" title=\"%s\" class=\"ICON20x20\" />",
+                            " alt=\"%s\" title=\"%s\" class=\"ICO20x20\" />",
                   Gbl.Prefs.IconsURL,
                   Txt_Folder,Txt_Folder);
 
diff --git a/swad_attendance.c b/swad_attendance.c
index 7e52032b5..d3db24ac0 100644
--- a/swad_attendance.c
+++ b/swad_attendance.c
@@ -219,7 +219,7 @@ static void Att_ShowAllAttEvents (void)
    if (Gbl.AttEvents.Num)
      {
       /***** Table head *****/
-      fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE_MARGIN CELLS_PAD_2\">"
+      fprintf (Gbl.F.Out,"<table class=\"FRAME_TBL_MARGIN CELLS_PAD_2\">"
 			 "<tr>");
       for (Order = Att_ORDER_BY_START_DATE;
 	   Order <= Att_ORDER_BY_END_DATE;
@@ -1113,10 +1113,9 @@ void Att_RequestCreatOrEditAttEvent (void)
    Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage);
 
    /***** Table start *****/
-   Lay_StartRoundFrame (NULL,ItsANewAttEvent ? Txt_New_event :
-                                               Txt_Edit_event,
-                        NULL,Hlp_USERS_Attendance);
-   fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">");
+   Lay_StartRoundFrameTable (NULL,ItsANewAttEvent ? Txt_New_event :
+                                                    Txt_Edit_event,
+                             NULL,Hlp_USERS_Attendance,2);
 
    /***** Attendance event title *****/
    fprintf (Gbl.F.Out,"<tr>"
@@ -1829,8 +1828,7 @@ void Att_SeeOneAttEvent (void)
    Pag_GetParamPagNum (Pag_ATT_EVENTS);
 
    /***** Show attendance *****/
-   Lay_StartRoundFrame (NULL,Txt_Event,NULL,Hlp_USERS_Attendance);
-   fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">");
+   Lay_StartRoundFrameTable (NULL,Txt_Event,NULL,Hlp_USERS_Attendance,2);
    Att.AttCod = Gbl.AttEvents.AttCod;
    Att_ShowOneAttEvent (&Att,true);
    Lay_EndRoundFrameTable ();
@@ -1875,9 +1873,8 @@ static void Att_ListAttOnlyMeAsStudent (struct AttendanceEvent *Att)
 
    /***** List students' data *****/
    /* Header */
-   Lay_StartRoundFrame (NULL,NULL,NULL,Hlp_USERS_Attendance);
-   fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">"
-                      "<tr>"
+   Lay_StartRoundFrameTable (NULL,NULL,NULL,Hlp_USERS_Attendance,2);
+   fprintf (Gbl.F.Out,"<tr>"
 		      "<th></th>"
 		      "<th></th>"
 		      "<th></th>");
@@ -1948,9 +1945,9 @@ static void Att_ListAttStudents (struct AttendanceEvent *Att)
 
       /***** List students' data *****/
       /* Header */
-      Lay_StartRoundFrame (NULL,Txt_Attendance,NULL,Hlp_USERS_Attendance);
-      fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">"
-                         "<tr>"
+      Lay_StartRoundFrameTable (NULL,Txt_Attendance,
+                                NULL,Hlp_USERS_Attendance,2);
+      fprintf (Gbl.F.Out,"<tr>"
                          "<th></th>"
                          "<th></th>"
                          "<th></th>");
@@ -2024,7 +2021,7 @@ static void Att_WriteRowStdToCallTheRoll (unsigned NumStd,struct UsrData *UsrDat
    fprintf (Gbl.F.Out,"<tr>"
 	              "<td class=\"BT%u\">"
 	              "<img src=\"%s/%s16x16.gif\""
-	              " alt=\"%s\" title=\"%s\" class=\"ICON20x20\" />"
+	              " alt=\"%s\" title=\"%s\" class=\"ICO20x20\" />"
 	              "</td>",
             Gbl.RowEvenOdd,
             Gbl.Prefs.IconsURL,
@@ -3036,8 +3033,7 @@ static void Att_ListEventsToSelect (Att_TypeOfView_t TypeOfView)
      }
 
    /***** Start frame *****/
-   Lay_StartRoundFrame (NULL,Txt_Events,NULL,Hlp_USERS_Attendance);
-   fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">");
+   Lay_StartRoundFrameTable (NULL,Txt_Events,NULL,Hlp_USERS_Attendance,2);
 
    /***** Heading row *****/
    fprintf (Gbl.F.Out,"<tr>"
@@ -3147,8 +3143,8 @@ static void Att_ListStdsAttendanceTable (Att_TypeOfView_t TypeOfView,
                         	                                    NULL),
                         Hlp_USERS_Attendance);
    fprintf (Gbl.F.Out,"<table class=\"%s CELLS_PAD_2\">",
-            PutButtonShowDetails ? "FRAME_TABLE_MARGIN" :
-        	                   "FRAME_TABLE");
+            PutButtonShowDetails ? "FRAME_TBL_MARGIN" :
+        	                   "FRAME_TBL");
 
    /***** Heading row *****/
    Att_WriteTableHeadSeveralAttEvents ();
@@ -3319,7 +3315,7 @@ static void Att_WriteRowStdSeveralAttEvents (unsigned NumStd,struct UsrData *Usr
 
 	 fprintf (Gbl.F.Out,"<td class=\"BM%u\">"
 	                    "<img src=\"%s/%s16x16.gif\""
-	                    " alt=\"%s\" title=\"%s\" class=\"ICON20x20\" />"
+	                    " alt=\"%s\" title=\"%s\" class=\"ICO20x20\" />"
 	                    "</td>",
 		  Gbl.RowEvenOdd,
 		  Gbl.Prefs.IconsURL,
@@ -3360,8 +3356,7 @@ static void Att_ListStdsWithAttEventsDetails (unsigned NumStdsInList,long *LstSe
    Usr_UsrDataConstructor (&UsrDat);
 
    /***** Start frame *****/
-   Lay_StartRoundFrame (NULL,Txt_Details,NULL,Hlp_USERS_Attendance);
-   fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">");
+   Lay_StartRoundFrameTable (NULL,Txt_Details,NULL,Hlp_USERS_Attendance,2);
 
    /***** List students with attendance details *****/
    for (NumStd = 0, Gbl.RowEvenOdd = 0;
@@ -3476,7 +3471,7 @@ static void Att_ListAttEventsForAStd (unsigned NumStd,struct UsrData *UsrDat)
 			    "</td>"
 			    "<td class=\"DAT LEFT_MIDDLE COLOR%u\">"
 	                    "<img src=\"%s/%s16x16.gif\""
-			    " alt=\"%s\" title=\"%s\" class=\"ICON20x20\" />"
+			    " alt=\"%s\" title=\"%s\" class=\"ICO20x20\" />"
 	                    "<span id=\"att_date_start_%u\"></span> %s"
 			    "<script type=\"text/javascript\">"
 			    "writeLocalDateHMSFromUTC('att_date_start_%u',%ld,'&nbsp;','%s');"
diff --git a/swad_banner.c b/swad_banner.c
index c816e16e2..990f84e6b 100644
--- a/swad_banner.c
+++ b/swad_banner.c
@@ -86,10 +86,9 @@ void Ban_SeeBanners (void)
 	               " ORDER BY ShortName");
 
    /***** Frame head *****/
-   Lay_StartRoundFrame (NULL,Txt_Banners,Ban_PutFormToEditBanners,NULL);
+   Lay_StartRoundFrameTable (NULL,Txt_Banners,Ban_PutFormToEditBanners,NULL,2);
 
    /***** Write all the banners *****/
-   fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">");
    for (NumBan = 0;
 	NumBan < Gbl.Banners.Num;
 	NumBan++)
@@ -109,10 +108,9 @@ void Ban_SeeBanners (void)
                Gbl.Banners.Lst[NumBan].Img,
                Gbl.Banners.Lst[NumBan].ShrtName,
                Gbl.Banners.Lst[NumBan].FullName);
-   fprintf (Gbl.F.Out,"</table>");
 
    /***** Frame end *****/
-   Lay_EndRoundFrame ();
+   Lay_EndRoundFrameTable ();
 
    /***** Free list of banners *****/
    Ban_FreeListBanners ();
@@ -328,7 +326,7 @@ static void Ban_ListBannersForEdition (void)
 	                           ActHidBan);
       Ban_PutParamBanCod (Ban->BanCod);
       fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/%s\""
-	                 " alt=\"%s\" title=\"%s\" class=\"ICON20x20\" />",
+	                 " alt=\"%s\" title=\"%s\" class=\"ICO20x20\" />",
                Gbl.Prefs.IconsURL,
                Ban->Hidden ? "eye-slash-on64x64.png" :
         	             "eye-on64x64.png",
diff --git a/swad_calendar.c b/swad_calendar.c
index dc1d9681c..a7476bf83 100644
--- a/swad_calendar.c
+++ b/swad_calendar.c
@@ -77,7 +77,7 @@ void Cal_PutIconsToSelectFirstDayOfWeek (void)
    Lay_StartRoundFrame (NULL,Txt_Calendar,
                         Cal_PutIconsFirstDayOfWeek,
                         Hlp_PROFILE_Preferences_calendar);
-   Cal_ShowFormToSelFirstDayOfWeek (ActChg1stDay,"ICON40x40B");
+   Cal_ShowFormToSelFirstDayOfWeek (ActChg1stDay,"ICO40x40B");
    Lay_EndRoundFrame ();
   }
 
@@ -255,7 +255,7 @@ void Cal_DrawCalendar (void)
    /***** Draw several months *****/
    /* Show form to change first day of week */
    if (!PrintView)
-      Cal_ShowFormToSelFirstDayOfWeek (ActChgCal1stDay,"ICON25x25");
+      Cal_ShowFormToSelFirstDayOfWeek (ActChgCal1stDay,"ICO25x25");
 
    /* JavaScript will write HTML here */
    fprintf (Gbl.F.Out,"<div id=\"calendar\">"
diff --git a/swad_centre.c b/swad_centre.c
index d425758f0..7b6877947 100644
--- a/swad_centre.c
+++ b/swad_centre.c
@@ -154,10 +154,9 @@ void Ctr_SeeCtrWithPendingDegs (void)
    if ((NumCtrs = (unsigned) DB_QuerySELECT (Query,&mysql_res,"can not get centres with pending degrees")))
      {
       /***** Write heading *****/
-      Lay_StartRoundFrame (NULL,Txt_Centres_with_pending_degrees,
-                           NULL,Hlp_SYSTEM_Pending);
-      fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">"
-	                 "<tr>"
+      Lay_StartRoundFrameTable (NULL,Txt_Centres_with_pending_degrees,
+                                NULL,Hlp_SYSTEM_Pending,2);
+      fprintf (Gbl.F.Out,"<tr>"
                          "<th class=\"LEFT_MIDDLE\">"
                          "%s"
                          "</th>"
@@ -305,7 +304,7 @@ static void Ctr_Configuration (bool PrintView)
 	                               Hlp_CENTRE_Information);
 
       /***** Title *****/
-      fprintf (Gbl.F.Out,"<div class=\"FRAME_TABLE_TITLE CENTER_MIDDLE\">");
+      fprintf (Gbl.F.Out,"<div class=\"FRAME_TBL_TITLE CENTER_MIDDLE\">");
       if (PutLink)
 	 fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\""
 	                    " class=\"TITLE_LOCATION\" title=\"%s\">",
@@ -373,7 +372,7 @@ static void Ctr_Configuration (bool PrintView)
 	}
 
       /***** Start table *****/
-      fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">");
+      fprintf (Gbl.F.Out,"<table class=\"FRAME_TBL CELLS_PAD_2\">");
 
       /***** Institution *****/
       fprintf (Gbl.F.Out,"<tr>"
@@ -753,7 +752,7 @@ static void Ctr_ListCentres (void)
    if (Gbl.Ctrs.Num)	// There are centres in the current institution
      {
       /***** Start table *****/
-      fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE_MARGIN CELLS_PAD_2\">");
+      fprintf (Gbl.F.Out,"<table class=\"FRAME_TBL_MARGIN CELLS_PAD_2\">");
       Ctr_PutHeadCentresForSeeing (true);	// Order selectable
 
       /***** Write all the centres and their nuber of teachers *****/
diff --git a/swad_changelog.h b/swad_changelog.h
index 4ecaeb77c..546e8a627 100644
--- a/swad_changelog.h
+++ b/swad_changelog.h
@@ -156,13 +156,16 @@
 /****************************** Public constants *****************************/
 /*****************************************************************************/
 
-#define Log_PLATFORM_VERSION	"SWAD 16.57.3 (2016-11-13)"
-#define CSS_FILE		"swad16.51.css"
+#define Log_PLATFORM_VERSION	"SWAD 16.59 (2016-11-14)"
+#define CSS_FILE		"swad16.59.css"
 #define JS_FILE			"swad16.46.1.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.59:    Nov 14, 2016	Changes in layout of contextual help icon.
+					Changes in CSS. (207075 lines)
+        Version 16.58:    Nov 14, 2016	Code refactoring related to layout of frames and tables. (207062 lines)
         Version 16.57.3:  Nov 13, 2016	Code refactoring related to layout of frames and tables. (207119 lines)
         Version 16.57.2:  Nov 13, 2016	Contextual help on usage report. (207102 lines)
         Version 16.57.1:  Nov 13, 2016	Contextual help on frequent actions. (207099 lines)
diff --git a/swad_chat.c b/swad_chat.c
index 5a0edcd86..7e55127aa 100644
--- a/swad_chat.c
+++ b/swad_chat.c
@@ -124,7 +124,7 @@ void Cht_ShowListOfAvailableChatRooms (void)
    fprintf (Gbl.F.Out,"<li class=\"DAT\" style=\"height:25px;\">"
                       "<img src=\"%s/chat64x64.gif\""
 	              " alt=\"%s\" title=\"%s\""
-	              " class=\"ICON20x20\" />"
+	              " class=\"ICO20x20\" />"
                       " %s"
                       "</li>",
             Gbl.Prefs.IconsURL,
@@ -140,7 +140,7 @@ void Cht_ShowListOfAvailableChatRooms (void)
    Cht_WriteLinkToChat1 ("GBL_USR",Txt_SEX_PLURAL_Abc[Usr_SEX_ALL],ThisRoomFullName,1,IsLastItemInLevel);
    fprintf (Gbl.F.Out,"<img src=\"%s/chat64x64.gif\""
 	              " alt=\"%s\" title=\"%s\""
-	              " class=\"ICON20x20\" />",
+	              " class=\"ICO20x20\" />",
             Gbl.Prefs.IconsURL,
             ThisRoomFullName,
             ThisRoomFullName);
@@ -154,7 +154,7 @@ void Cht_ShowListOfAvailableChatRooms (void)
          Cht_WriteLinkToChat1 ("GBL_STD",Txt_Students_ABBREVIATION,ThisRoomFullName,1,IsLastItemInLevel);
 	 fprintf (Gbl.F.Out,"<img src=\"%s/chat64x64.gif\""
 			    " alt=\"%s\" title=\"%s\""
-			    " class=\"ICON20x20\" />",
+			    " class=\"ICO20x20\" />",
 		  Gbl.Prefs.IconsURL,
 		  ThisRoomFullName,ThisRoomFullName);
 	 Cht_WriteLinkToChat2 ("GBL_STD",ThisRoomFullName);
@@ -164,7 +164,7 @@ void Cht_ShowListOfAvailableChatRooms (void)
          Cht_WriteLinkToChat1 ("GBL_TCH",Txt_Teachers_ABBREVIATION,ThisRoomFullName,1,IsLastItemInLevel);
 	 fprintf (Gbl.F.Out,"<img src=\"%s/chat64x64.gif\""
 			    " alt=\"%s\" title=\"%s\""
-			    " class=\"ICON20x20\" />",
+			    " class=\"ICO20x20\" />",
 		  Gbl.Prefs.IconsURL,
 		  ThisRoomFullName,ThisRoomFullName);
 	 Cht_WriteLinkToChat2 ("GBL_TCH",ThisRoomFullName);
@@ -215,7 +215,7 @@ void Cht_ShowListOfAvailableChatRooms (void)
                Cht_WriteLinkToChat1 (ThisRoomCode,ThisRoomShrtName,ThisRoomFullName,2,IsLastItemInLevel);
                fprintf (Gbl.F.Out,"<img src=\"%s/dot64x64.png\""
         	                  " alt=\"%s\" title=\"%s\""
-        	                  " class=\"ICON20x20\" />",
+        	                  " class=\"ICO20x20\" />",
                         Gbl.Prefs.IconsURL,
                         ThisRoomFullName,ThisRoomFullName);
                Cht_WriteLinkToChat2 (ThisRoomCode,ThisRoomFullName);
diff --git a/swad_connected.c b/swad_connected.c
index 9f9059a72..a309a725d 100644
--- a/swad_connected.c
+++ b/swad_connected.c
@@ -674,7 +674,7 @@ static void Con_ShowConnectedUsrsWithARoleBelongingToCurrentCrsOnRightColumn (Ro
 	 Sco_PutParamScope ("ScopeCon",Sco_SCOPE_CRS);
 	 Act_LinkFormSubmitUnique (Txt_Connected_users,The_ClassConnected[Gbl.Prefs.Theme]);
 	 fprintf (Gbl.F.Out,"<img src=\"%s/ellipsis32x32.gif\""
-			    " alt=\"%s\" title=\"%s\" class=\"ICON40x40\" />"
+			    " alt=\"%s\" title=\"%s\" class=\"ICO40x40\" />"
 			    "</a>",
 		  Gbl.Prefs.IconsURL,
 		  Txt_Connected_users,Txt_Connected_users);
diff --git a/swad_country.c b/swad_country.c
index 6120a184e..87e7ab154 100644
--- a/swad_country.c
+++ b/swad_country.c
@@ -127,10 +127,9 @@ void Cty_SeeCtyWithPendingInss (void)
    if ((NumCtys = (unsigned) DB_QuerySELECT (Query,&mysql_res,"can not get countries with pending institutions")))
      {
       /***** Write heading *****/
-      Lay_StartRoundFrame (NULL,Txt_Countries_with_pending_institutions,
-                           NULL,Hlp_SYSTEM_Pending);
-      fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">"
-	                 "<tr>"
+      Lay_StartRoundFrameTable (NULL,Txt_Countries_with_pending_institutions,
+                                NULL,Hlp_SYSTEM_Pending,2);
+      fprintf (Gbl.F.Out,"<tr>"
                          "<th class=\"LEFT_MIDDLE\">"
                          "%s"
                          "</th>"
@@ -237,7 +236,7 @@ static void Cty_Configuration (bool PrintView)
 	                	       Hlp_COUNTRY_Information);
 
       /***** Title *****/
-      fprintf (Gbl.F.Out,"<div class=\"FRAME_TABLE_TITLE CENTER_MIDDLE\">");
+      fprintf (Gbl.F.Out,"<div class=\"FRAME_TBL_TITLE CENTER_MIDDLE\">");
       if (PutLink)
 	 fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\""
 	                    " class=\"TITLE_LOCATION\" title=\"%s\">",
@@ -290,7 +289,7 @@ static void Cty_Configuration (bool PrintView)
 	}
 
       /***** Start table *****/
-      fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">");
+      fprintf (Gbl.F.Out,"<table class=\"FRAME_TBL CELLS_PAD_2\">");
 
       /***** Country name (an link to WWW if exists) *****/
       fprintf (Gbl.F.Out,"<tr>"
@@ -523,10 +522,9 @@ void Cty_ListCountries2 (void)
    const char *BgColor;
 
    /***** Table head *****/
-   Lay_StartRoundFrame (NULL,Txt_Countries,
-                        Cty_PutIconsListCountries,Hlp_SYSTEM_Countries);
-   fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">"
-                      "<tr>");
+   Lay_StartRoundFrameTable (NULL,Txt_Countries,
+                             Cty_PutIconsListCountries,Hlp_SYSTEM_Countries,2);
+   fprintf (Gbl.F.Out,"<tr>");
    for (Order = Cty_ORDER_BY_COUNTRY;
 	Order <= Cty_ORDER_BY_NUM_USRS;
 	Order++)
diff --git a/swad_course.c b/swad_course.c
index 6b91e302f..c57f43274 100644
--- a/swad_course.c
+++ b/swad_course.c
@@ -196,7 +196,7 @@ static void Crs_Configuration (bool PrintView)
 	                            Hlp_COURSE_Information);
 
    /***** Title *****/
-   fprintf (Gbl.F.Out,"<div class=\"FRAME_TABLE_TITLE CENTER_MIDDLE\">");
+   fprintf (Gbl.F.Out,"<div class=\"FRAME_TBL_TITLE CENTER_MIDDLE\">");
    if (PutLink)
       fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\""
 	                 " class=\"TITLE_LOCATION\" title=\"%s\">",
@@ -211,7 +211,7 @@ static void Crs_Configuration (bool PrintView)
             Gbl.CurrentCrs.Crs.FullName);
 
    /***** Start table *****/
-   fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">");
+   fprintf (Gbl.F.Out,"<table class=\"FRAME_TBL CELLS_PAD_2\">");
 
    /***** Degree *****/
    fprintf (Gbl.F.Out,"<tr>"
@@ -460,7 +460,7 @@ static void Crs_Configuration (bool PrintView)
       Act_LinkFormSubmit (Gbl.Title,"DAT",NULL);
       fprintf (Gbl.F.Out,"%s "
                          "<img src=\"%s/%s16x16.gif\" alt=\"%s\""
-                         " class=\"ICON20x20\" />",
+                         " class=\"ICO20x20\" />",
                Gbl.Title,
                Gbl.Prefs.IconsURL,
                (Indicators.NumIndicators == Ind_NUM_INDICATORS) ? "ok_green" :
@@ -559,7 +559,7 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
         	                   ClassNormal,NULL);
    fprintf (Gbl.F.Out,"<img src=\"%s/sys64x64.gif\""
 	              " alt=\"%s\" title=\"%s\""
-                      " class=\"ICON20x20\" />&nbsp;%s</a>",
+                      " class=\"ICO20x20\" />&nbsp;%s</a>",
 	    Gbl.Prefs.IconsURL,
 	    Txt_System,
 	    Txt_System,
@@ -597,7 +597,7 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
       /* Country map */
       fprintf (Gbl.F.Out,"<img src=\"%s/%s/%s/%s.png\""
 	                 " alt=\"%s\" title=\"%s\""
-                         " class=\"ICON20x20\" />&nbsp;%s</a>",
+                         " class=\"ICO20x20\" />&nbsp;%s</a>",
 	       Gbl.Prefs.IconsURL,Cfg_ICON_FOLDER_COUNTRIES,
 	       Cty.Alpha2,
 	       Cty.Alpha2,
@@ -742,7 +742,7 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
         	                                  ClassNormal,NULL);
 		  fprintf (Gbl.F.Out,"<img src=\"%s/dot64x64.png\""
 			             " alt=\"%s\" title=\"%s\""
-			             " class=\"ICON20x20\" />",
+			             " class=\"ICO20x20\" />",
 		           Gbl.Prefs.IconsURL,
 		           Crs.ShrtName,
 		           Crs.FullName);
@@ -761,7 +761,7 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
 		  fprintf (Gbl.F.Out,"\" target=\"_blank\">"
 				     "<img src=\"%s/rss16x16.gif\""
 				     " alt=\"RSS\" title=\"RSS\""
-				     " class=\"ICON20x20\" />"
+				     " class=\"ICO20x20\" />"
 				     "</a>",
 			   Gbl.Prefs.IconsURL);
 
@@ -1191,7 +1191,7 @@ static void Crs_ListCourses (void)
    if (Gbl.CurrentDeg.NumCrss)	// There are courses in the current degree
      {
       /***** Start table *****/
-      fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE_MARGIN CELLS_PAD_2\">");
+      fprintf (Gbl.F.Out,"<table class=\"FRAME_TBL_MARGIN CELLS_PAD_2\">");
       Crs_PutHeadCoursesForSeeing ();
 
       /***** List the courses *****/
@@ -1306,7 +1306,7 @@ static bool Crs_ListCoursesOfAYearForSeeing (unsigned Year)
 			    "<td class=\"CENTER_MIDDLE %s\">"
 			    "<img src=\"%s/%s16x16.gif\""
 			    " alt=\"%s\" title=\"%s\""
-			    " class=\"ICON20x20\" />"
+			    " class=\"ICO20x20\" />"
 			    "</td>",
 		  BgColor,
 		  Gbl.Prefs.IconsURL,
@@ -3241,7 +3241,7 @@ static void Crs_WriteRowCrsData (unsigned NumCrs,MYSQL_ROW row,bool WriteColumnA
       fprintf (Gbl.F.Out,"<td class=\"BT %s\">"
 	                 "<img src=\"%s/%s16x16.gif\""
 	                 " alt=\"%s\" title=\"%s\""
-	                 " class=\"ICON20x20\" />"
+	                 " class=\"ICO20x20\" />"
 	                 "</td>",
                BgColor,
                Gbl.Prefs.IconsURL,
diff --git a/swad_degree.c b/swad_degree.c
index 2491599f6..a8c3191c1 100644
--- a/swad_degree.c
+++ b/swad_degree.c
@@ -183,10 +183,9 @@ void Deg_SeeDegWithPendingCrss (void)
    if ((NumDegs = (unsigned) DB_QuerySELECT (Query,&mysql_res,"can not get degrees with pending courses")))
      {
       /***** Write heading *****/
-      Lay_StartRoundFrame (NULL,Txt_Degrees_with_pending_courses,
-                           NULL,Hlp_SYSTEM_Pending);
-      fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">"
-	                 "<tr>"
+      Lay_StartRoundFrameTable (NULL,Txt_Degrees_with_pending_courses,
+                                NULL,Hlp_SYSTEM_Pending,2);
+      fprintf (Gbl.F.Out,"<tr>"
                          "<th class=\"LEFT_MIDDLE\">"
                          "%s"
                          "</th>"
@@ -319,7 +318,7 @@ static void Deg_Configuration (bool PrintView)
 	                               Hlp_DEGREE_Information);
 
       /***** Title *****/
-      fprintf (Gbl.F.Out,"<div class=\"FRAME_TABLE_TITLE CENTER_MIDDLE\">");
+      fprintf (Gbl.F.Out,"<div class=\"FRAME_TBL_TITLE CENTER_MIDDLE\">");
       if (PutLink)
 	 fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\""
 	                    " class=\"TITLE_LOCATION\" title=\"%s\">",
@@ -334,7 +333,7 @@ static void Deg_Configuration (bool PrintView)
       fprintf (Gbl.F.Out,"</div>");
 
       /***** Start table *****/
-      fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">");
+      fprintf (Gbl.F.Out,"<table class=\"FRAME_TBL CELLS_PAD_2\">");
 
       /***** Centre *****/
       fprintf (Gbl.F.Out,"<tr>"
@@ -1634,7 +1633,7 @@ static void Deg_ListDegrees (void)
    if (Gbl.CurrentCtr.Ctr.Degs.Num)	// There are degrees in the current centre
      {
       /***** Start table *****/
-      fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE_MARGIN CELLS_PAD_2\">");
+      fprintf (Gbl.F.Out,"<table class=\"FRAME_TBL_MARGIN CELLS_PAD_2\">");
       Deg_PutHeadDegreesForSeeing ();
 
       /***** List the degrees *****/
@@ -1742,7 +1741,7 @@ static void Deg_ListOneDegreeForSeeing (struct Degree *Deg,unsigned NumDeg)
 		      "<td class=\"CENTER_MIDDLE %s\">"
 		      "<img src=\"%s/%s16x16.gif\""
 		      " alt=\"%s\" title=\"%s\""
-		      " class=\"ICON20x20\" />"
+		      " class=\"ICO20x20\" />"
 		      "</td>",
 	    BgColor,
 	    Gbl.Prefs.IconsURL,
@@ -2912,7 +2911,7 @@ void Deg_GetAndWriteInsCtrDegAdminBy (long UsrCod,unsigned ColSpan)
                             "<td class=\"RIGHT_TOP COLOR%u\">"
                             "<img src=\"%s/%s20x20.gif\""
                             " alt=\"\" title=\"\""
-                            " class=\"ICON25x25\" />"
+                            " class=\"ICO25x25\" />"
                             "</td>",
                   Gbl.RowEvenOdd,Gbl.Prefs.IconsURL,
                   NumRow == NumRows ? "subend" :
@@ -2932,7 +2931,7 @@ void Deg_GetAndWriteInsCtrDegAdminBy (long UsrCod,unsigned ColSpan)
 	    case Sco_SCOPE_SYS:	// System
 	       fprintf (Gbl.F.Out,"<img src=\"%s/swad64x64.gif\""
         	                  " alt=\"%s\" title=\"%s\""
-                                  " class=\"ICON20x20\" />"
+                                  " class=\"ICO20x20\" />"
                                   "&nbsp;%s",
                      Gbl.Prefs.IconsURL,
                      Txt_all_degrees,
diff --git a/swad_degree_type.c b/swad_degree_type.c
index 4f305eaac..03be21b20 100644
--- a/swad_degree_type.c
+++ b/swad_degree_type.c
@@ -197,11 +197,10 @@ static void DT_ListDegreeTypesForSeeing (void)
    const char *BgColor;
 
    /***** Write heading *****/
-   Lay_StartRoundFrame (NULL,Txt_Types_of_degree,
-                        Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM ? DT_PutIconToEditDegTypes :
-                                                                NULL,
-                        NULL);
-   fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">");
+   Lay_StartRoundFrameTable (NULL,Txt_Types_of_degree,
+                             Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM ? DT_PutIconToEditDegTypes :
+                                                                     NULL,
+                             NULL,2);
    DT_PutHeadDegreeTypesForSeeing ();
 
    /***** List degree types with forms for edition *****/
@@ -218,7 +217,7 @@ static void DT_ListDegreeTypesForSeeing (void)
                          "<td class=\"%s\">"
                          "<img src=\"%s/%s16x16.gif\""
                          " alt=\"%s\" title=\"%s\""
-                         " class=\"ICON20x20\" />"
+                         " class=\"ICO20x20\" />"
                          "</td>",
                BgColor,
                Gbl.Prefs.IconsURL,
diff --git a/swad_department.c b/swad_department.c
index 39a3c5de2..67771623c 100644
--- a/swad_department.c
+++ b/swad_department.c
@@ -96,12 +96,11 @@ void Dpt_SeeDepts (void)
       Dpt_GetListDepartments (Gbl.CurrentIns.Ins.InsCod);
 
       /***** Table head *****/
-      Lay_StartRoundFrame (NULL,Txt_Departments,
-                           Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM ? Dpt_PutIconToEditDpts :
-                        	                                   NULL,
-                           NULL);
-      fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">"
-                         "<tr>");
+      Lay_StartRoundFrameTable (NULL,Txt_Departments,
+                                Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM ? Dpt_PutIconToEditDpts :
+                        	                                        NULL,
+                                NULL,2);
+      fprintf (Gbl.F.Out,"<tr>");
       for (Order = Dpt_ORDER_BY_DEPARTMENT;
 	   Order <= Dpt_ORDER_BY_NUM_TCHS;
 	   Order++)
@@ -180,8 +179,7 @@ void Dpt_SeeDepts (void)
 					  Rol_TEACHER) - NumTchsInsWithDpt);
 
       /***** End table *****/
-      fprintf (Gbl.F.Out,"</table>");
-      Lay_EndRoundFrame ();
+      Lay_EndRoundFrameTable ();
 
       /***** Free list of departments *****/
       Dpt_FreeListDepartments ();
diff --git a/swad_file_browser.c b/swad_file_browser.c
index 8e011605f..d781af581 100644
--- a/swad_file_browser.c
+++ b/swad_file_browser.c
@@ -3176,9 +3176,8 @@ static void Brw_ShowFileBrowsersAsgWrkCrs (void)
       Brw_WriteTopBeforeShowingFileBrowser ();
 
       /***** Header of the table with the list of users *****/
-      Lay_StartRoundFrame ("100%",Txt_Assignments_and_other_works,
-                           Brw_PutIconShowFigure,Hlp_ASSESSMENT_Works);
-      fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE\">");
+      Lay_StartRoundFrameTable ("100%",Txt_Assignments_and_other_works,
+                                Brw_PutIconShowFigure,Hlp_ASSESSMENT_Works,0);
 
       /***** List the assignments and works of the selected users *****/
       Ptr = Gbl.Usrs.Select.All;
@@ -3309,7 +3308,7 @@ static void Brw_FormToChangeCrsGrpZone (void)
          fprintf (Gbl.F.Out,"<li class=\"%s\">"
                             "<img src=\"%s/%s20x20.gif\""
                             " alt=\"\" title=\"\""
-                            " class=\"ICON25x25\""
+                            " class=\"ICO25x25\""
                             " style=\"margin-left:6px;\" />"
 	                    "<input type=\"radio\" name=\"GrpCod\" value=\"%ld\"",
                   (IsGroupZone &&
@@ -5410,7 +5409,7 @@ static void Brw_PutIconRemoveFile (Brw_FileType_t FileType,
       sprintf (Gbl.Title,Txt_Remove_FILE_OR_LINK_X,FileNameToShow);
       fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/remove-on64x64.png\""
 	                 " alt=\"%s\" title=\"%s\""
-	                 " class=\"ICON20x20B\" />",
+	                 " class=\"ICO20x20B\" />",
                Gbl.Prefs.IconsURL,
                Gbl.Title,
                Gbl.Title);
@@ -5455,7 +5454,7 @@ static void Brw_PutIconRemoveDir (const char *PathInTree,const char *FileName,co
       sprintf (Gbl.Title,Txt_Remove_folder_X,FileNameToShow);
       fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/remove-on64x64.png\""
 	                 " alt=\"%s\" title=\"%s\""
-	                 " class=\"ICON20x20B\" />",
+	                 " class=\"ICO20x20B\" />",
                Gbl.Prefs.IconsURL,
                Gbl.Title,
                Gbl.Title);
@@ -5502,7 +5501,7 @@ static void Brw_PutIconCopy (Brw_FileType_t FileType,
       sprintf (Gbl.Title,Txt_Copy_FOLDER_FILE_OR_LINK_X,FileNameToShow);
       fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/copy_on16x16.gif\""
 	                 " alt=\"%s\" title=\"%s\""
-	                 " class=\"ICON20x20B\" />",
+	                 " class=\"ICO20x20B\" />",
                Gbl.Prefs.IconsURL,
                Gbl.Title,
                Gbl.Title);
@@ -5511,7 +5510,7 @@ static void Brw_PutIconCopy (Brw_FileType_t FileType,
    else
       fprintf (Gbl.F.Out,"<img src=\"%s/copy_off16x16.gif\""
 	                 " alt=\"%s\" title=\"%s\""
-	                 " class=\"ICON20x20B\" />",
+	                 " class=\"ICO20x20B\" />",
                Gbl.Prefs.IconsURL,
                Txt_Copy_not_allowed,
                Txt_Copy_not_allowed);
@@ -5550,7 +5549,7 @@ static void Brw_PutIconPasteOn (const char *PathInTree,const char *FileName,cons
    sprintf (Gbl.Title,Txt_Paste_in_X,FileNameToShow);
    fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/paste_on16x16.gif\""
 	              " alt=\"%s\" title=\"%s\""
-	              " class=\"ICON20x20B\" />",
+	              " class=\"ICO20x20B\" />",
             Gbl.Prefs.IconsURL,
             Gbl.Title,
             Gbl.Title);
@@ -5569,7 +5568,7 @@ static void Brw_PutIconPasteOff (void)
    fprintf (Gbl.F.Out,"<td class=\"BM%u\">"
 	              "<img src=\"%s/paste_off16x16.gif\""
 	              " alt=\"%s\" title=\"%s\""
-	              " class=\"ICON20x20B\" />"
+	              " class=\"ICO20x20B\" />"
 	              "</td>",
             Gbl.RowEvenOdd,Gbl.Prefs.IconsURL,
             Txt_Copy_not_allowed,
@@ -5598,7 +5597,7 @@ static void Brw_IndentAndWriteIconExpandContract (unsigned Level,Brw_ExpandTree_
       case Brw_EXPAND_TREE_NOTHING:
          fprintf (Gbl.F.Out,"<img src=\"%s/tr16x16.gif\""
                             " alt=\"\" title=\"\""
-                            " class=\"ICON20x20B\" />",
+                            " class=\"ICO20x20B\" />",
                   Gbl.Prefs.IconsURL);
          break;
       case Brw_EXPAND_TREE_PLUS:
@@ -5627,7 +5626,7 @@ static void Brw_IndentAndWriteIconExpandContract (unsigned Level,Brw_ExpandTree_
          sprintf (Gbl.Title,"%s %s",Txt_Expand,FileNameToShow);
          fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/expand64x64.png\""
                             " alt=\"%s\" title=\"%s\""
-                            " class=\"ICON20x20B\" />",
+                            " class=\"ICO20x20B\" />",
                   Gbl.Prefs.IconsURL,
                   Gbl.Title,
                   Gbl.Title);
@@ -5660,7 +5659,7 @@ static void Brw_IndentAndWriteIconExpandContract (unsigned Level,Brw_ExpandTree_
          sprintf (Gbl.Title,"%s %s",Txt_Contract,FileNameToShow);
          fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/contract64x64.png\""
                             " alt=\"%s\" title=\"%s\""
-                            " class=\"ICON20x20B\" />",
+                            " class=\"ICO20x20B\" />",
                   Gbl.Prefs.IconsURL,
                   Gbl.Title,
                   Gbl.Title);
@@ -5689,7 +5688,7 @@ static void Brw_IndentDependingOnLevel (unsigned Level)
       fprintf (Gbl.F.Out,"<td style=\"width:20px;\">"
 	                 "<img src=\"%s/tr16x16.gif\""
 	                 " alt=\"\" title=\"\""
-	                 " class=\"ICON20x20B\" />"
+	                 " class=\"ICO20x20B\" />"
 	                 "</td>",
                Gbl.Prefs.IconsURL);
   }
@@ -5718,7 +5717,7 @@ static void Brw_PutIconShow (unsigned Level,Brw_FileType_t FileType,
    sprintf (Gbl.Title,Txt_Show_FOLDER_FILE_OR_LINK_X,FileNameToShow);
    fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/eye-slash-%s64x64.png\""
 	              " alt=\"%s\" title=\"%s\""
-	              " class=\"ICON20x20B\" />",
+	              " class=\"ICO20x20B\" />",
             Gbl.Prefs.IconsURL,
             Brw_CheckIfAnyUpperLevelIsHidden (Level) ? "off" :
         	                                       "on",
@@ -5752,7 +5751,7 @@ static void Brw_PutIconHide (unsigned Level,Brw_FileType_t FileType,
    sprintf (Gbl.Title,Txt_Hide_FOLDER_FILE_OR_LINK_X,FileNameToShow);
    fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/eye-%s64x64.png\""
 	              " alt=\"%s\" title=\"%s\""
-	              " class=\"ICON20x20B\" />",
+	              " class=\"ICO20x20B\" />",
             Gbl.Prefs.IconsURL,
             Brw_CheckIfAnyUpperLevelIsHidden (Level) ? "off" :
         	                                       "on",
@@ -5820,7 +5819,7 @@ static void Brw_PutIconFolder (unsigned Level,Brw_ExpandTree_t ExpandTree,
       fprintf (Gbl.F.Out,"<input type=\"image\""
 	                 " src=\"%s/folder-%s-plus16x16.gif\""
 	                 " alt=\"%s\" title=\"%s\""
-	                 " class=\"ICON20x20B\" />",
+	                 " class=\"ICO20x20B\" />",
                Gbl.Prefs.IconsURL,
                (ExpandTree == Brw_EXPAND_TREE_PLUS) ? "closed" :
         	                                      "open",
@@ -5831,7 +5830,7 @@ static void Brw_PutIconFolder (unsigned Level,Brw_ExpandTree_t ExpandTree,
    else	// I can't create a new file or folder
       fprintf (Gbl.F.Out,"<img src=\"%s/folder-%s16x16.gif\""
 	                 " alt=\"%s\" title=\"%s\""
-	                 " class=\"ICON20x20B\" />",
+	                 " class=\"ICO20x20B\" />",
                Gbl.Prefs.IconsURL,
                (ExpandTree == Brw_EXPAND_TREE_PLUS) ? "closed" :
         	                                      "open",
@@ -5854,7 +5853,7 @@ static void Brw_PutIconNewFileOrFolder (void)
    fprintf (Gbl.F.Out,"<td class=\"BM%u\">"
 	              "<img src=\"%s/star16x16.gif\""
 	              " alt=\"%s\" title=\"%s\""
-	              " class=\"ICON20x20B\" />"
+	              " class=\"ICO20x20B\" />"
 	              "</td>",
             Gbl.RowEvenOdd,Gbl.Prefs.IconsURL,
             Txt_New_FILE_OR_FOLDER,
@@ -5945,8 +5944,8 @@ static void Brw_PutIconFile (unsigned Size,Brw_FileType_t FileType,const char *F
 	 fprintf (Gbl.F.Out,"xxx%ux%u.gif\" alt=\"\"",
 	          Size,Size);
      }
-   fprintf (Gbl.F.Out,(Size == 16) ? " class=\"ICON20x20\"/>" :
-	                             " class=\"ICON40x40\"/>");
+   fprintf (Gbl.F.Out,(Size == 16) ? " class=\"ICO20x20\"/>" :
+	                             " class=\"ICO40x40\"/>");
   }
 
 /*****************************************************************************/
@@ -6067,7 +6066,7 @@ static void Brw_WriteFileName (unsigned Level,bool IsPublic,Brw_FileType_t FileT
       if (IsPublic)
          fprintf (Gbl.F.Out,"&nbsp;<img src=\"%s/open_on16x16.gif\""
                             " alt=\"%s\" title=\"%s\""
-                            " class=\"ICON20x20\" />",
+                            " class=\"ICO20x20\" />",
                   Gbl.Prefs.IconsURL,
                   Txt_Public_open_educational_resource_OER_for_everyone,
                   Txt_Public_open_educational_resource_OER_for_everyone);
@@ -6175,7 +6174,7 @@ static void Brw_WriteDatesAssignment (void)
       fprintf (Gbl.F.Out,"<td class=\"RIGHT_MIDDLE\" style=\"width:20px;\">"
                          "<img src=\"%s/arrow%s16x12.gif\""
                          " alt=\"\" title=\"\""
-                         " class=\"ICON20x15B\" />"
+                         " class=\"ICO20x15B\" />"
                          "</td>",
                Gbl.Prefs.IconsURL,
                Gbl.FileBrowser.Asg.Open ? "green" :
@@ -9850,7 +9849,7 @@ static void Brw_WriteBigLinkToDownloadFile (const char *URL,
       fprintf (Gbl.F.Out,"&nbsp;%s&nbsp;"
 			 "<img src=\"%s/grades32x32.gif\""
 			 " alt=\"%s\" title=\"%s\""
-			 " class=\"ICON40x40\" />"
+			 " class=\"ICO40x40\" />"
 			 "</a>",
 	       FileNameToShow,Gbl.Prefs.IconsURL,
 	       Gbl.Title,Gbl.Title);
@@ -9868,7 +9867,7 @@ static void Brw_WriteBigLinkToDownloadFile (const char *URL,
       fprintf (Gbl.F.Out,"&nbsp;%s&nbsp;"
 			 "<img src=\"%s/download64x64.png\""
 			 " alt=\"%s\" title=\"%s\""
-			 " class=\"ICON40x40\" />"
+			 " class=\"ICO40x40\" />"
 			 "</a>",
 	       FileNameToShow,
 	       Gbl.Prefs.IconsURL,
@@ -11765,7 +11764,7 @@ static void Brw_WriteRowDocData (unsigned *NumDocsNotHidden,MYSQL_ROW row)
 	 /* Icon with folder */
 	 fprintf (Gbl.F.Out,"<img src=\"%s/folder-closed16x16.gif\""
 			    " alt=\"%s\" title=\"%s\""
-			    " class=\"ICON20x20\" />",
+			    " class=\"ICO20x20\" />",
 		  Gbl.Prefs.IconsURL,
 		  Txt_Folder,Txt_Folder);
       else
diff --git a/swad_follow.c b/swad_follow.c
index 82f55ebcf..36caad8f3 100644
--- a/swad_follow.c
+++ b/swad_follow.c
@@ -225,16 +225,14 @@ void Fol_SuggestWhoToFollow (void)
    if (NumUsrs)
      {
       /***** Start frame *****/
-      Lay_StartRoundFrame ("560px",Txt_Who_to_follow,
-                           Fol_PutIconsWhoToFollow,
-                           Hlp_SOCIAL_Profiles_who_to_follow);
+      Lay_StartRoundFrameTable ("560px",Txt_Who_to_follow,
+                                Fol_PutIconsWhoToFollow,
+                                Hlp_SOCIAL_Profiles_who_to_follow,2);
 
       /***** Initialize structure with user's data *****/
       Usr_UsrDataConstructor (&UsrDat);
 
-      /***** Start listing *****/
-      fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">");
-
+      /***** List users *****/
       for (NumUsr = 0;
 	   NumUsr < NumUsrs;
 	   NumUsr++)
@@ -255,14 +253,11 @@ void Fol_SuggestWhoToFollow (void)
 	    fprintf (Gbl.F.Out,"</tr>");
 	}
 
-      /***** End listing *****/
-      fprintf (Gbl.F.Out,"</table>");
-
       /***** Free memory used for user's data *****/
       Usr_UsrDataDestructor (&UsrDat);
 
       /***** End frame *****/
-      Lay_EndRoundFrame ();
+      Lay_EndRoundFrameTable ();
      }
    else
       Lay_ShowAlert (Lay_INFO,Txt_No_user_to_whom_you_can_follow_Try_again_later);
@@ -403,11 +398,11 @@ void Fol_ShowFollowingAndFollowers (const struct UsrData *UsrDat,
 	 Act_FormStart (ActUnfUsr);
 	 Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
 	 Act_LinkFormSubmit (Txt_Following_unfollow,"REC_DAT_BOLD",NULL);
-	 fprintf (Gbl.F.Out,"<div class=\"ICON_HIGHLIGHT\""
+	 fprintf (Gbl.F.Out,"<div class=\"ICO_HIGHLIGHT\""
 			    " style=\"display:inline;\" >"
 			    "<img src=\"%s/following64x64.png\""
 			    " alt=\"%s\" title=\"%s\""
-			    " class=\"ICON40x40\" />"
+			    " class=\"ICO40x40\" />"
 			    "</div>"
 			    "</a>",
 		  Gbl.Prefs.IconsURL,
@@ -419,11 +414,11 @@ void Fol_ShowFollowingAndFollowers (const struct UsrData *UsrDat,
 	 Act_FormStart (ActFolUsr);
 	 Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
 	 Act_LinkFormSubmit (Txt_Follow,"REC_DAT_BOLD",NULL);
-	 fprintf (Gbl.F.Out,"<div class=\"ICON_HIGHLIGHT\""
+	 fprintf (Gbl.F.Out,"<div class=\"ICO_HIGHLIGHT\""
 			    " style=\"display:inline;\" >"
 			    "<img src=\"%s/follow64x64.png\""
 			    " alt=\"%s\" title=\"%s\""
-			    " class=\"ICON40x40\" />"
+			    " class=\"ICO40x40\" />"
 			    "</div>"
 			    "</a>",
 		  Gbl.Prefs.IconsURL,
@@ -717,10 +712,10 @@ static void Fol_ShowFollowedOrFollower (const struct UsrData *UsrDat)
    if (!Gbl.Usrs.Me.Logged ||				// Not logged
        Gbl.Usrs.Me.UsrDat.UsrCod == UsrDat->UsrCod)	// It's me
       /* Inactive icon to follow/unfollow */
-      fprintf (Gbl.F.Out,"<div class=\"FOLLOW_USR_ICON ICON_HIDDEN\">"
+      fprintf (Gbl.F.Out,"<div class=\"FOLLOW_USR_ICO ICO_HIDDEN\">"
 			 "<img src=\"%s/usr64x64.gif\""
 			 " alt=\"\""
-			 " class=\"ICON25x25\" />"
+			 " class=\"ICO25x25\" />"
 			 "</div>",
 	       Gbl.Prefs.IconsURL);
    else
@@ -732,10 +727,10 @@ static void Fol_ShowFollowedOrFollower (const struct UsrData *UsrDat)
 	 Act_FormStart (ActUnfUsr);
 	 Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
 	 Act_LinkFormSubmit (Txt_Following_unfollow,NULL,NULL);
-	 fprintf (Gbl.F.Out,"<div class=\"FOLLOW_USR_ICON ICON_HIGHLIGHT\">"
+	 fprintf (Gbl.F.Out,"<div class=\"FOLLOW_USR_ICO ICO_HIGHLIGHT\">"
 			    "<img src=\"%s/following64x64.png\""
 			    " alt=\"%s\" title=\"%s\""
-			    " class=\"ICON25x25\" />"
+			    " class=\"ICO25x25\" />"
 			    "</div>"
 			    "</a>",
 		  Gbl.Prefs.IconsURL,
@@ -748,10 +743,10 @@ static void Fol_ShowFollowedOrFollower (const struct UsrData *UsrDat)
 	 Act_FormStart (ActFolUsr);
 	 Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
 	 Act_LinkFormSubmit (Txt_Follow,NULL,NULL);
-	 fprintf (Gbl.F.Out,"<div class=\"FOLLOW_USR_ICON ICON_HIGHLIGHT\">"
+	 fprintf (Gbl.F.Out,"<div class=\"FOLLOW_USR_ICO ICO_HIGHLIGHT\">"
 			    "<img src=\"%s/follow64x64.png\""
 			    " alt=\"%s\" title=\"%s\""
-			    " class=\"ICON25x25\" />"
+			    " class=\"ICO25x25\" />"
 			    "</div>"
 			    "</a>",
 		  Gbl.Prefs.IconsURL,
diff --git a/swad_forum.c b/swad_forum.c
index c6e36f182..dacc68a2c 100644
--- a/swad_forum.c
+++ b/swad_forum.c
@@ -995,7 +995,7 @@ static void For_ShowThreadPosts (long ThrCod,char *LastSubject)
 
    fprintf (Gbl.F.Out,"<img src=\"%s/%s16x16.gif\""
 	              " alt=\"%s\" title=\"%s\""
-                      " class=\"ICON20x20\" /> ",
+                      " class=\"ICO20x20\" /> ",
             Gbl.Prefs.IconsURL,
             Thr.NumUnreadPosts ? "msg-unread" :
         	                 "msg-open",
@@ -1060,8 +1060,7 @@ static void For_ShowThreadPosts (long ThrCod,char *LastSubject)
          Pag_WriteLinksToPagesCentered (Pag_POSTS_FORUM,ThrCod,&Pagination);
 
       /***** Show posts from this page, the author and the date of last reply *****/
-      Lay_StartRoundFrame (NULL,Txt_Posts,NULL,Hlp_SOCIAL_Forums);
-      fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">");
+      Lay_StartRoundFrameTable (NULL,Txt_Posts,NULL,Hlp_SOCIAL_Forums,2);
 
       mysql_data_seek (mysql_res,(my_ulonglong) (Pagination.FirstItemVisible - 1));
       for (NumRow = Pagination.FirstItemVisible;
@@ -1199,7 +1198,7 @@ static void For_ShowAForumPost (struct ForumThread *Thr,unsigned PstNum,long Pst
 	              "<td class=\"%s CENTER_TOP\" style=\"width:30px;\">"
                       "<img src=\"%s/%s16x16.gif\""
                       " alt=\"%s\" title=\"%s\""
-                      " class=\"ICON20x20\" />"
+                      " class=\"ICO20x20\" />"
                       "</td>",
             NewPst ? "MSG_TIT_BG_NEW" :
         	     "MSG_TIT_BG",
@@ -1266,7 +1265,7 @@ static void For_ShowAForumPost (struct ForumThread *Thr,unsigned PstNum,long Pst
                   PstNum);
          fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/%s-on64x64.png\""
                             " alt=\"%s\" title=\"%s\""
-                            " class=\"ICON20x20\" />",
+                            " class=\"ICO20x20\" />",
                   Gbl.Prefs.IconsURL,
                   Enabled ? "eye" :
                 	    "eye-slash",
@@ -1282,7 +1281,7 @@ static void For_ShowAForumPost (struct ForumThread *Thr,unsigned PstNum,long Pst
          fprintf (Gbl.F.Out,"<span title=\"%s\">"
                             "<img src=\"%s/%s-off64x64.png\""
                             " alt=\"%s\" title=\"%s\""
-                            " class=\"ICON20x20\" />"
+                            " class=\"ICO20x20\" />"
                             "</span>",
                   Gbl.Title,
                   Gbl.Prefs.IconsURL,
@@ -1925,7 +1924,7 @@ static void For_WriteLinkToTopLevelOfForums (void)
    Act_LinkFormSubmit (Txt_Forums,The_ClassForm[Gbl.Prefs.Theme],NULL);
    fprintf (Gbl.F.Out,"<img src=\"%s/forum64x64.gif\""
 	              " alt=\"%s\" title=\"%s\""
-	              " class=\"ICON20x20\" />"
+	              " class=\"ICO20x20\" />"
                       "&nbsp;%s"
                       "</a>",
             Gbl.Prefs.IconsURL,
@@ -2129,7 +2128,7 @@ static void For_WriteLinkToAForum (For_ForumType_t ForumType,bool ShowNumOfPosts
       case For_FORUM_GLOBAL_TCHS:
          sprintf (Icon,"<img src=\"%s/forum64x64.gif\""
                        " alt=\"%s\" title=\"%s\""
-                       " class=\"ICON20x20\" />",
+                       " class=\"ICO20x20\" />",
                   Gbl.Prefs.IconsURL,
                   ForumName,ForumName);
          break;
@@ -2137,7 +2136,7 @@ static void For_WriteLinkToAForum (For_ForumType_t ForumType,bool ShowNumOfPosts
       case For_FORUM_SWAD_TCHS:
          sprintf (Icon,"<img src=\"%s/swad64x64.gif\""
                        " alt=\"%s\" title=\"%s\""
-                       " class=\"ICON20x20\" />",
+                       " class=\"ICO20x20\" />",
                   Gbl.Prefs.IconsURL,
                   ForumName,ForumName);
          break;
@@ -2152,7 +2151,7 @@ static void For_WriteLinkToAForum (For_ForumType_t ForumType,bool ShowNumOfPosts
       case For_FORUM_COURSE_TCHS:
          sprintf (Icon,"<img src=\"%s/dot64x64.png\""
                        " alt=\"%s\" title=\"%s\""
-                       " class=\"ICON20x20\" />",
+                       " class=\"ICO20x20\" />",
                   Gbl.Prefs.IconsURL,
                   ForumName,ForumName);
          break;
@@ -2271,7 +2270,7 @@ static void For_WriteLinkToForum (For_ForumType_t ForumType,Act_Action_t NextAct
       if (For_CheckIfThrBelongsToForum (Gbl.Forum.ThreadToMove,ForumType))
          fprintf (Gbl.F.Out,"<img src=\"%s/paste_off16x16.gif\""
                             " alt=\"%s\" title=\"%s\""
-                            " class=\"ICON20x20\" />",
+                            " class=\"ICO20x20\" />",
                   Gbl.Prefs.IconsURL,
                   Txt_Copy_not_allowed,Txt_Copy_not_allowed);
       else
@@ -2282,7 +2281,7 @@ static void For_WriteLinkToForum (For_ForumType_t ForumType,Act_Action_t NextAct
          For_PutHiddenParamThrCod (Gbl.Forum.ThreadToMove);
          fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/paste_on16x16.gif\""
                             " alt=\"%s\" title=\"%s\""
-                            " class=\"ICON20x20\" />",
+                            " class=\"ICO20x20\" />",
                   Gbl.Prefs.IconsURL,
                   Txt_Paste_thread,
                   Txt_Paste_thread);
@@ -2623,8 +2622,7 @@ void For_ShowForumThrs (void)
          Pag_WriteLinksToPagesCentered (Pag_THREADS_FORUM,0,&PaginationThrs);
 
       /***** Start table *****/
-      Lay_StartRoundFrame (NULL,Txt_Threads,NULL,Hlp_SOCIAL_Forums);
-      fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">");
+      Lay_StartRoundFrameTable (NULL,Txt_Threads,NULL,Hlp_SOCIAL_Forums,2);
 
       /***** Heading row *****/
       fprintf (Gbl.F.Out,"<tr>"
@@ -3412,7 +3410,7 @@ void For_ListForumThrs (long ThrCods[Pag_ITEMS_PER_PAGE],struct Pagination *Pagi
       fprintf (Gbl.F.Out,"<td class=\"LEFT_TOP %s\" style=\"width:30px;\">"
                          "<img src=\"%s/%s16x16.gif\""
                          " alt=\"%s\" title=\"%s\""
-	                 " class=\"ICON20x20\" />",
+	                 " class=\"ICO20x20\" />",
                BgColor,
 	       Gbl.Prefs.IconsURL,
                Thr.NumUnreadPosts ? "msg-unread" :
@@ -3443,7 +3441,7 @@ void For_ListForumThrs (long ThrCods[Pag_ITEMS_PER_PAGE],struct Pagination *Pagi
          For_PutHiddenParamThrCod (Thr.ThrCod);
          fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/cut16x16.gif\""
                             " alt=\"%s\" title=\"%s\""
-                            " class=\"ICON20x20\" />",
+                            " class=\"ICO20x20\" />",
                   Gbl.Prefs.IconsURL,
                   Txt_Move_thread,
                   Txt_Move_thread);
diff --git a/swad_group.c b/swad_group.c
index e84fdc69b..26f4293c9 100644
--- a/swad_group.c
+++ b/swad_group.c
@@ -272,7 +272,7 @@ static void Grp_ShowFormSeveralGrps (Act_Action_t NextAction)
    Grp_GetListGrpTypesAndGrpsInThisCrs (Grp_ONLY_GROUP_TYPES_WITH_GROUPS);
 
    /***** List the groups for each group type *****/
-   fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">");
+   fprintf (Gbl.F.Out,"<table class=\"FRAME_TBL CELLS_PAD_2\">");
    for (NumGrpTyp = 0;
 	NumGrpTyp < Gbl.CurrentCrs.Grps.GrpTypes.Num;
 	NumGrpTyp++)
@@ -1137,8 +1137,7 @@ static void Grp_ListGroupTypesForEdition (void)
    char Id[32];
 
    /***** Write heading *****/
-   Lay_StartRoundFrame (NULL,Txt_Types_of_group,NULL,Hlp_USERS_Groups);
-   fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">");
+   Lay_StartRoundFrameTable (NULL,Txt_Types_of_group,NULL,Hlp_USERS_Groups,2);
    Grp_WriteHeadingGroupTypes ();
 
    /***** List group types with forms for edition *****/
@@ -1221,7 +1220,7 @@ static void Grp_ListGroupTypesForEdition (void)
                          "<td class=\"LEFT_MIDDLE\" style=\"width:20px;\">"
                          "<img src=\"%s/%s16x16.gif\""
                          " alt=\"%s\" title=\"%s\""
-                         " class=\"ICON20x20\" />"
+                         " class=\"ICO20x20\" />"
                          "</td>"
 	                 "<td class=\"LEFT_MIDDLE\">",
                Gbl.Prefs.IconsURL,
@@ -1313,8 +1312,7 @@ static void Grp_ListGroupsForEdition (void)
    struct Group *Grp;
 
    /***** Write heading *****/
-   Lay_StartRoundFrame (NULL,Txt_Groups,NULL,Hlp_USERS_Groups);
-   fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">");
+   Lay_StartRoundFrameTable (NULL,Txt_Groups,NULL,Hlp_USERS_Groups,2);
    Grp_WriteHeadingGroups ();
 
    /***** List the groups *****/
@@ -1349,7 +1347,7 @@ static void Grp_ListGroupsForEdition (void)
                   Grp->GrpName);
          fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/%s_on16x16.gif\""
                             " alt=\"%s\" title=\"%s\""
-                            " class=\"ICON20x20\" />",
+                            " class=\"ICO20x20\" />",
                   Gbl.Prefs.IconsURL,
                   Grp->Open ? "open" :
                 	      "closed",
@@ -1369,7 +1367,7 @@ static void Grp_ListGroupsForEdition (void)
                   Grp->GrpName);
          fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/%s16x16.gif\""
                             " alt=\"%s\" title=\"%s\""
-                            " class=\"ICON20x20\" />",
+                            " class=\"ICO20x20\" />",
                   Gbl.Prefs.IconsURL,
                   Grp->FileZones ? "folder-yes" :
                 	           "folder-no",
@@ -1431,6 +1429,7 @@ static void Grp_ListGroupsForEdition (void)
         }
      }
 
+   /***** End table *****/
    Lay_EndRoundFrameTable ();
   }
 
@@ -1587,7 +1586,7 @@ void Grp_ShowLstGrpsToChgMyGrps (bool ShowWarningsToStudents)
 	 Act_FormStart (ActChgGrp);
 
       /***** List the groups the user belongs to for change *****/
-      fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">");
+      fprintf (Gbl.F.Out,"<table class=\"FRAME_TBL CELLS_PAD_2\">");
       for (NumGrpTyp = 0;
 	   NumGrpTyp < Gbl.CurrentCrs.Grps.GrpTypes.Num;
 	   NumGrpTyp++)
@@ -1761,8 +1760,7 @@ void Grp_ShowLstGrpsToChgOtherUsrsGrps (long UsrCod)
    Grp_GetListGrpTypesAndGrpsInThisCrs (Grp_ONLY_GROUP_TYPES_WITH_GROUPS);
 
    /***** Start table *****/
-   Lay_StartRoundFrame (NULL,Txt_Groups,NULL,Hlp_USERS_Groups);
-   fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE\">");
+   Lay_StartRoundFrameTable (NULL,Txt_Groups,NULL,Hlp_USERS_Groups,0);
 
    /***** List to select the groups the user belongs to *****/
    for (NumGrpTyp = 0;
@@ -2015,7 +2013,7 @@ static void Grp_WriteRowGrp (struct Group *Grp,bool Highlight)
    fprintf (Gbl.F.Out,"\" style=\"width:15px;\">"
 	              "<img src=\"%s/%s_off16x16.gif\""
 	              " alt=\"%s\" title=\"%s\""
-	              " class=\"ICON20x20\" />"
+	              " class=\"ICO20x20\" />"
 	              "</td>",
             Gbl.Prefs.IconsURL,
             Grp->Open ? "open" :
@@ -2086,8 +2084,8 @@ static void Grp_PutFormToCreateGroupType (void)
    Act_FormStart (ActNewGrpTyp);
 
    /***** Start of frame *****/
-   Lay_StartRoundFrame (NULL,Txt_New_type_of_group,NULL,Hlp_USERS_Groups);
-   fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">");
+   Lay_StartRoundFrameTable (NULL,Txt_New_type_of_group,
+                             NULL,Hlp_USERS_Groups,2);
 
    /***** Write heading *****/
    Grp_WriteHeadingGroupTypes ();
@@ -2146,7 +2144,7 @@ static void Grp_PutFormToCreateGroupType (void)
                       "<td class=\"LEFT_MIDDLE\" style=\"width:20px;\">"
                       "<img src=\"%s/%s16x16.gif\""
                       " alt=\"%s\" title=\"%s\""
-                      " class=\"ICON20x20\" />"
+                      " class=\"ICO20x20\" />"
                       "</td>"
 	              "<td class=\"LEFT_MIDDLE\">",
             Gbl.Prefs.IconsURL,
@@ -2195,8 +2193,7 @@ static void Grp_PutFormToCreateGroup (void)
    Act_FormStart (ActNewGrp);
 
    /***** Start of frame *****/
-   Lay_StartRoundFrame (NULL,Txt_New_group,NULL,Hlp_USERS_Groups);
-   fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">");
+   Lay_StartRoundFrameTable (NULL,Txt_New_group,NULL,Hlp_USERS_Groups,2);
 
    /***** Write heading *****/
    Grp_WriteHeadingGroups ();
@@ -2209,12 +2206,12 @@ static void Grp_PutFormToCreateGroup (void)
                       "<td class=\"BM\">"
                       "<img src=\"%s/closed_off16x16.gif\""
                       " alt=\"%s\" title=\"%s\""
-                      " class=\"ICON20x20\" />"
+                      " class=\"ICO20x20\" />"
                       "</td>"
                       "<td class=\"BM\">"
                       "<img src=\"%s/folder-no_off16x16.gif\""
                       " alt=\"%s\" title=\"%s\""
-                      " class=\"ICON20x20\" />"
+                      " class=\"ICO20x20\" />"
                       "</td>",
             Gbl.Prefs.IconsURL,
             Txt_Group_closed,
diff --git a/swad_holiday.c b/swad_holiday.c
index f0629eac3..ef0f4554e 100644
--- a/swad_holiday.c
+++ b/swad_holiday.c
@@ -92,12 +92,11 @@ void Hld_SeeHolidays (void)
       Hld_GetListHolidays ();
 
       /***** Table head *****/
-      Lay_StartRoundFrame (NULL,Txt_Holidays,
-                           Gbl.Usrs.Me.LoggedRole >= Rol_INS_ADM ? Hld_PutIconToEditHlds :
-                        	                                   NULL,
-                           NULL);
-      fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">"
-                         "<tr>");
+      Lay_StartRoundFrameTable (NULL,Txt_Holidays,
+                                Gbl.Usrs.Me.LoggedRole >= Rol_INS_ADM ? Hld_PutIconToEditHlds :
+                        	                                        NULL,
+                                NULL,2);
+      fprintf (Gbl.F.Out,"<tr>");
       for (Order = Hld_ORDER_BY_PLACE;
 	   Order <= Hld_ORDER_BY_START_DATE;
 	   Order++)
@@ -166,7 +165,6 @@ void Hld_SeeHolidays (void)
 	}
 
       /***** End table *****/
-      fprintf (Gbl.F.Out,"</table>");
       Lay_EndRoundFrameTable ();
 
       /***** Free list of holidays *****/
diff --git a/swad_icon.c b/swad_icon.c
index 78df9eacf..1b790013d 100644
--- a/swad_icon.c
+++ b/swad_icon.c
@@ -90,7 +90,7 @@ void Ico_PutIconsToSelectIconSet (void)
       Act_FormStart (ActChgIco);
       Par_PutHiddenParamString ("IconSet",Ico_IconSetId[IconSet]);
       fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/%s/%s/%s/heart64x64.gif\""
-	                 " alt=\"%s\" title=\"%s\" class=\"ICON40x40B\""
+	                 " alt=\"%s\" title=\"%s\" class=\"ICO40x40B\""
 	                 " style=\"margin:0 auto; padding:0;\" />",
                Gbl.Prefs.IconsURL,
                Cfg_ICON_FOLDER_ICON_SETS,
diff --git a/swad_image.c b/swad_image.c
index 7de91c8fa..338119bf3 100644
--- a/swad_image.c
+++ b/swad_image.c
@@ -215,7 +215,7 @@ void Img_PutImageUploader (int NumImgInForm,const char *ClassImgTitURL)
    fprintf (Gbl.F.Out,"<label class=\"IMG_UPLOAD_BUTTON\">"
 	              "<img src=\"%s/photo64x64.gif\""
 	              " alt=\"%s\" title=\"%s (%s)\""
-	              " class=\"IMG_UPLOAD_ICON\" />"
+	              " class=\"IMG_UPLOAD_ICO\" />"
 	              "<input type=\"file\" name=\"%s\" accept=\"image/*\""
 	              " class=\"IMG_UPLOAD_FILE\""
 	              " onchange=\"imageUploadOnSelectFile (this,'%s');\" />"
diff --git a/swad_indicator.c b/swad_indicator.c
index d94361304..b074d02d8 100644
--- a/swad_indicator.c
+++ b/swad_indicator.c
@@ -108,7 +108,7 @@ void Ind_ReqIndicatorsCourses (void)
    /***** Form to update indicators *****/
    /* Start form */
    Act_FormStart (ActReqStaCrs);
-   fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">");
+   fprintf (Gbl.F.Out,"<table class=\"FRAME_TBL CELLS_PAD_2\">");
 
    /* Scope */
    fprintf (Gbl.F.Out,"<tr>"
diff --git a/swad_institution.c b/swad_institution.c
index 88d4379e5..218384ae2 100644
--- a/swad_institution.c
+++ b/swad_institution.c
@@ -140,10 +140,9 @@ void Ins_SeeInsWithPendingCtrs (void)
    if ((NumInss = (unsigned) DB_QuerySELECT (Query,&mysql_res,"can not get institutions with pending centres")))
      {
       /***** Write heading *****/
-      Lay_StartRoundFrame (NULL,Txt_Institutions_with_pending_centres,
-                           NULL,Hlp_SYSTEM_Pending);
-      fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">"
-	                 "<tr>"
+      Lay_StartRoundFrameTable (NULL,Txt_Institutions_with_pending_centres,
+                                NULL,Hlp_SYSTEM_Pending,2);
+      fprintf (Gbl.F.Out,"<tr>"
                          "<th class=\"LEFT_MIDDLE\">"
                          "%s"
                          "</th>"
@@ -188,6 +187,7 @@ void Ins_SeeInsWithPendingCtrs (void)
          Gbl.RowEvenOdd = 1 - Gbl.RowEvenOdd;
         }
 
+      /***** End table *****/
       Lay_EndRoundFrameTable ();
      }
    else
@@ -303,7 +303,7 @@ static void Ins_Configuration (bool PrintView)
 	                               Hlp_INSTITUTION_Information);
 
       /***** Title *****/
-      fprintf (Gbl.F.Out,"<div class=\"FRAME_TABLE_TITLE CENTER_MIDDLE\">");
+      fprintf (Gbl.F.Out,"<div class=\"FRAME_TBL_TITLE CENTER_MIDDLE\">");
       if (PutLink)
 	 fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\""
 	                    " class=\"TITLE_LOCATION\" title=\"%s\">",
@@ -317,7 +317,7 @@ static void Ins_Configuration (bool PrintView)
       fprintf (Gbl.F.Out,"</div>");
 
       /***** Start table *****/
-      fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">");
+      fprintf (Gbl.F.Out,"<table class=\"FRAME_TBL CELLS_PAD_2\">");
 
       /***** Country *****/
       fprintf (Gbl.F.Out,"<tr>"
@@ -676,7 +676,7 @@ static void Ins_ListInstitutions (void)
    if (Gbl.Inss.Num)	// There are institutions in the current country
      {
       /***** Start table *****/
-      fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE_MARGIN CELLS_PAD_2\">");
+      fprintf (Gbl.F.Out,"<table class=\"FRAME_TBL_MARGIN CELLS_PAD_2\">");
       Ins_PutHeadInstitutionsForSeeing (true);	// Order selectable
 
       /***** Write all the institutions and their nuber of users *****/
diff --git a/swad_layout.c b/swad_layout.c
index fc0fb77f7..de808a927 100644
--- a/swad_layout.c
+++ b/swad_layout.c
@@ -1048,11 +1048,10 @@ void Lay_PutIconLink (const char *Icon,const char *Title,const char *Text,
 
 void Lay_PutIconWithText (const char *Icon,const char *Alt,const char *Text)
   {
-   // margin is used because this form link may be placed after another one
-   fprintf (Gbl.F.Out,"<div class=\"CONTEXT_OPT ICON_HIGHLIGHT\">"
+   fprintf (Gbl.F.Out,"<div class=\"CONTEXT_OPT ICO_HIGHLIGHT\">"
 	              "<img src=\"%s/%s\""
 	              " alt=\"%s\" title=\"%s\""
-	              " class=\"ICON20x20\" />",
+	              " class=\"ICO20x20\" />",
             Gbl.Prefs.IconsURL,Icon,
             Alt,Text ? Text : Alt);
    if (Text)
@@ -1069,13 +1068,13 @@ void Lay_PutIconWithText (const char *Icon,const char *Alt,const char *Text)
 
 void Lay_PutCalculateIcon (const char *Alt)
   {
-   fprintf (Gbl.F.Out,"<div class=\"CONTEXT_OPT ICON_HIGHLIGHT\">"
+   fprintf (Gbl.F.Out,"<div class=\"CONTEXT_OPT ICO_HIGHLIGHT\">"
 	              "<img id=\"update_%d\" src=\"%s/recycle16x16.gif\""	// TODO: change name and resolution to refresh64x64.png
 	              " alt=\"%s\" title=\"%s\""
-		      " class=\"ICON20x20\" />"
+		      " class=\"ICO20x20\" />"
 		      "<img id=\"updating_%d\" src=\"%s/working16x16.gif\""	// TODO: change name and resolution to refreshing64x64.gif
 		      " alt=\"%s\" title=\"%s\""
-		      " class=\"ICON20x20\" style=\"display:none;\" />"	// Animated icon hidden
+		      " class=\"ICO20x20\" style=\"display:none;\" />"	// Animated icon hidden
 		      "</div>"
 		      "</a>",
 	    Gbl.Form.Num,Gbl.Prefs.IconsURL,Alt,Alt,
@@ -1089,14 +1088,14 @@ void Lay_PutCalculateIcon (const char *Alt)
 
 void Lay_PutCalculateIconWithText (const char *Alt,const char *Text)
   {
-   fprintf (Gbl.F.Out,"<div class=\"ICON_HIGHLIGHT\""
+   fprintf (Gbl.F.Out,"<div class=\"ICO_HIGHLIGHT\""
 	              " style=\"margin:0 6px 0 0; display:inline;\">"
 	              "<img id=\"update_%d\" src=\"%s/recycle16x16.gif\""
 	              " alt=\"%s\" title=\"%s\""
-		      " class=\"ICON20x20\" />"
+		      " class=\"ICO20x20\" />"
 		      "<img id=\"updating_%d\" src=\"%s/working16x16.gif\""
 		      " alt=\"%s\" title=\"%s\""
-		      " class=\"ICON20x20\" style=\"display:none;\" />"	// Animated icon hidden
+		      " class=\"ICO20x20\" style=\"display:none;\" />"	// Animated icon hidden
 		      "&nbsp;%s"
 		      "</div>"
 		      "</a>",
@@ -1115,7 +1114,7 @@ void Lay_PutIconRemovalNotAllowed (void)
 
    fprintf (Gbl.F.Out,"<img src=\"%s/remove-off64x64.png\""
 		      " alt=\"%s\" title=\"%s\""
-		      " class=\"ICON20x20\" />",
+		      " class=\"ICO20x20\" />",
 	    Gbl.Prefs.IconsURL,
 	    Txt_Removal_not_allowed,
 	    Txt_Removal_not_allowed);
@@ -1127,7 +1126,7 @@ void Lay_PutIconBRemovalNotAllowed (void)
 
    fprintf (Gbl.F.Out,"<img src=\"%s/remove-off64x64.png\""
 		      " alt=\"%s\" title=\"%s\""
-		      " class=\"ICON20x20B\" />",
+		      " class=\"ICO20x20B\" />",
 	    Gbl.Prefs.IconsURL,
 	    Txt_Removal_not_allowed,
 	    Txt_Removal_not_allowed);
@@ -1143,7 +1142,7 @@ void Lay_PutIconRemove (void)
 
    fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/remove-on64x64.png\""
 		      " alt=\"%s\" title=\"%s\""
-		      " class=\"ICON20x20\" />",
+		      " class=\"ICO20x20\" />",
 	    Gbl.Prefs.IconsURL,
 	    Txt_Remove,
 	    Txt_Remove);
@@ -1155,7 +1154,7 @@ void Lay_PutIconBRemove (void)
 
    fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/remove-on64x64.png\""
 		      " alt=\"%s\" title=\"%s\""
-		      " class=\"ICON20x20B\" />",
+		      " class=\"ICO20x20B\" />",
 	    Gbl.Prefs.IconsURL,
 	    Txt_Remove,
 	    Txt_Remove);
@@ -1231,7 +1230,7 @@ void Lay_StartRoundFrameTable (const char *Width,const char *Title,
   {
    Lay_StartRoundFrame (Width,Title,FunctionToDrawContextualIcons,HelpLink);
 
-   fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE");
+   fprintf (Gbl.F.Out,"<table class=\"FRAME_TBL");
    if (CellPadding)
       fprintf (Gbl.F.Out," CELLS_PAD_%u",CellPadding);	// CellPadding must be 0, 1, 2, 4 or 8
    fprintf (Gbl.F.Out,"\">");
@@ -1250,26 +1249,30 @@ void Lay_StartRoundFrame (const char *Width,const char *Title,
        fprintf (Gbl.F.Out," style=\"box-sizing:border-box; width:%s;\"",Width);
    fprintf (Gbl.F.Out,">");
 
-   fprintf (Gbl.F.Out,"<div class=\"FRAME_ICONS\">");
+   fprintf (Gbl.F.Out,"<div class=\"FRAME_ICO\">");
    if (FunctionToDrawContextualIcons)
      {
-      fprintf (Gbl.F.Out,"<div class=\"FRAME_ICONS_LEFT\">");
+      fprintf (Gbl.F.Out,"<div class=\"FRAME_ICO_LEFT\">");
       FunctionToDrawContextualIcons ();
       fprintf (Gbl.F.Out,"</div>");
      }
    if (HelpLink)
-     {
-      fprintf (Gbl.F.Out,"<div class=\"FRAME_ICONS_RIGHT\">"
-                         "<a href=\"%s\" target=\"_blank\">",
-	       HelpLink);
-      Lay_PutIconWithText ("help64x64.png",Txt_Help,NULL);
-      fprintf (Gbl.F.Out,"</a>"
-                         "</div>");
-     }
+      fprintf (Gbl.F.Out,"<div class=\"FRAME_ICO_RIGHT\">"
+                         "<a href=\"%s\" target=\"_blank\">"
+                         "<div class=\"CONTEXT_OPT HLP_HIGHLIGHT\">"
+	                 "<img src=\"%s/help64x64.png\""
+	                 " alt=\"%s\" title=\"%s\""
+	                 " class=\"ICO20x20\" />"
+                         "</div>"
+                         "</a>"
+                         "</div>",
+	       HelpLink,
+               Gbl.Prefs.IconsURL,
+               Txt_Help,Txt_Help);
    fprintf (Gbl.F.Out,"</div>");
 
    if (Title)
-      fprintf (Gbl.F.Out,"<div class=\"FRAME_TABLE_TITLE CENTER_MIDDLE\">"
+      fprintf (Gbl.F.Out,"<div class=\"FRAME_TBL_TITLE CENTER_MIDDLE\">"
 	                 "%s"
 	                 "</div>",
 	       Title);
@@ -1285,7 +1288,7 @@ void Lay_StartRoundFrameTableShadow (const char *Width,unsigned CellPadding)
    if (Width)
        fprintf (Gbl.F.Out," style=\"width:%s;\"",Width);
    fprintf (Gbl.F.Out,">"
-                      "<table class=\"FRAME_TABLE");
+                      "<table class=\"FRAME_TBL");
    if (CellPadding)
       fprintf (Gbl.F.Out," CELLS_PAD_%u",CellPadding);	// CellPadding must be 0, 1, 2, 4 or 8
    fprintf (Gbl.F.Out,"\">");
@@ -1722,7 +1725,7 @@ void Lay_IndentDependingOnLevel (unsigned Level,bool IsLastItemInLevel[])
 	i++)
       fprintf (Gbl.F.Out,"<img src=\"%s/%s20x20.gif\""
 	                 " alt=\"\" title=\"\""
-                         " class=\"ICON25x25\" />",
+                         " class=\"ICO25x25\" />",
 		  Gbl.Prefs.IconsURL,
 		  IsLastItemInLevel[i] ? "tr" :
 		                         "subleft");
@@ -1730,7 +1733,7 @@ void Lay_IndentDependingOnLevel (unsigned Level,bool IsLastItemInLevel[])
    /***** Level *****/
    fprintf (Gbl.F.Out,"<img src=\"%s/%s20x20.gif\""
 	              " alt=\"\" title=\"\""
-                      " class=\"ICON25x25\" />",
+                      " class=\"ICO25x25\" />",
 	    Gbl.Prefs.IconsURL,
 	    IsLastItemInLevel[Level] ? "subend" :
 				       "submid");
diff --git a/swad_logo.c b/swad_logo.c
index 0f009a92c..795b2f1a5 100644
--- a/swad_logo.c
+++ b/swad_logo.c
@@ -155,7 +155,7 @@ void Log_DrawLogo (Sco_Scope_t Scope,long Cod,const char *AltText,
 			Gbl.Prefs.IconsURL,Icon[Scope]);
 	    fprintf (Gbl.F.Out,"\""
 			       " alt=\"%s\" title=\"%s\""
-			       " class=\"ICON%ux%u",
+			       " class=\"ICO%ux%u",
 		     AltText,AltText,
 		     Size,Size);
 	    if (Class)
diff --git a/swad_mail.c b/swad_mail.c
index 691cb8f37..a07e2fcc2 100644
--- a/swad_mail.c
+++ b/swad_mail.c
@@ -101,12 +101,11 @@ void Mai_SeeMailDomains (void)
    Mai_GetListMailDomainsAllowedForNotif ();
 
    /***** Table head *****/
-   Lay_StartRoundFrame (NULL,Txt_Mail_domains_allowed_for_notifications,
-                        Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM ? Mai_PutIconToEditMailDomains :
-                                                                NULL,
-                        NULL);
-   fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">"
-	              "<tr>");
+   Lay_StartRoundFrameTable (NULL,Txt_Mail_domains_allowed_for_notifications,
+                             Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM ? Mai_PutIconToEditMailDomains :
+                                                                     NULL,
+                             NULL,2);
+   fprintf (Gbl.F.Out,"<tr>");
    for (Order = Mai_ORDER_BY_DOMAIN;
 	Order <= Mai_ORDER_BY_USERS;
 	Order++)
@@ -147,8 +146,7 @@ void Mai_SeeMailDomains (void)
                Gbl.Mails.Lst[NumMai].NumUsrs);
 
    /***** End table *****/
-   fprintf (Gbl.F.Out,"</table>");
-   Lay_EndRoundFrame ();
+   Lay_EndRoundFrameTable ();
 
    /***** Free list of mail domains *****/
    Mai_FreeListMailDomains ();
@@ -1236,7 +1234,7 @@ void Mai_ShowFormChangeUsrEmail (const struct UsrData *UsrDat,bool ItsMe)
 	 sprintf (Gbl.Title,Txt_Email_X_confirmed,row[0]);
 	 fprintf (Gbl.F.Out,"<img src=\"%s/ok_green16x16.gif\""
 			    " alt=\"%s\" title=\"%s\""
-			    " class=\"ICON20x20\" />",
+			    " class=\"ICO20x20\" />",
 		  Gbl.Prefs.IconsURL,
 		  Gbl.Title,Gbl.Title);
 	}
diff --git a/swad_menu.c b/swad_menu.c
index 8f4c98fe9..892bbe15f 100644
--- a/swad_menu.c
+++ b/swad_menu.c
@@ -270,7 +270,7 @@ void Mnu_WriteMenuThisTab (void)
                                                    The_ClassTxtMenuOff[Gbl.Prefs.Theme],NULL);
 
          /***** Icon *****/
-	 fprintf (Gbl.F.Out,"<div class=\"MENU_ICON\""
+	 fprintf (Gbl.F.Out,"<div class=\"MENU_ICO\""
 			    " style=\"background-image:url('%s/%s/%s');\">",
 	          Gbl.Prefs.PathIconSet,Cfg_ICON_ACTION,
                   Act_Actions[NumAct].Icon);
@@ -326,7 +326,7 @@ void Mnu_PutIconsToSelectMenu (void)
       Act_FormStart (ActChgMnu);
       Par_PutHiddenParamUnsigned ("Menu",(unsigned) Menu);
       fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/%s32x32.gif\""
-	                 " alt=\"%s\" title=\"%s\" class=\"ICON40x40B\""
+	                 " alt=\"%s\" title=\"%s\" class=\"ICO40x40B\""
 	                 " style=\"margin:0 auto;\" />",
                Gbl.Prefs.IconsURL,
                Mnu_MenuIcons[Menu],
diff --git a/swad_message.c b/swad_message.c
index ef57f2ad8..5fe3acac0 100644
--- a/swad_message.c
+++ b/swad_message.c
@@ -2842,7 +2842,7 @@ static void Msg_ShowASentOrReceivedMessage (long MsgNum,long MsgCod)
 	              "<td class=\"%s CENTER_TOP\" style=\"width:20px;\">"
                       "<img src=\"%s/msg-%s16x16.gif\""
                       " alt=\"%s\" title=\"%s\""
-                      " class=\"ICON20x20\" />",
+                      " class=\"ICO20x20\" />",
             Gbl.Msg.TypeOfMessages == Msg_MESSAGES_RECEIVED ? (Open ? "BG_MSG_BLUE" :
         	                                                      "BG_MSG_GREEN") :
                                                               "BG_MSG_BLUE",
@@ -3236,7 +3236,7 @@ static void Msg_WriteMsgFrom (struct UsrData *UsrDat,bool Deleted)
                       "<td class=\"LEFT_MIDDLE\" style=\"width:20px;\">"
                       "<img src=\"%s/%s16x16.gif\""
                       " alt=\"%s\" title=\"%s\""
-                      " class=\"ICON20x20\" />"
+                      " class=\"ICO20x20\" />"
                       "</td>",
             Gbl.Prefs.IconsURL,
             Deleted ? "msg-fwd-del" :
@@ -3387,7 +3387,7 @@ static void Msg_WriteMsgTo (long MsgCod)
                             "<td class=\"LEFT_MIDDLE\" style=\"width:20px;\">"
                             "<img src=\"%s/%s16x16.gif\""
                             " alt=\"%s\" title=\"%s\""
-                            " class=\"ICON20x20\" />"
+                            " class=\"ICO20x20\" />"
                             "</td>",
                   Gbl.Prefs.IconsURL,
                   OpenByDst ? (Deleted ? "msg-open-del"   :
@@ -3561,7 +3561,7 @@ static void Msg_PutFormToBanSender (struct UsrData *UsrDat)
    Msg_PutHiddenParamsMsgsFilters ();
    fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/open_on16x16.gif\""
 	              " alt=\"%s\" title=\"%s\""
-	              " class=\"ICON20x20\" style=\"margin-left:12px;\" />",
+	              " class=\"ICO20x20\" style=\"margin-left:12px;\" />",
             Gbl.Prefs.IconsURL,
             Txt_Sender_permitted_click_to_ban_him,
             Txt_Sender_permitted_click_to_ban_him);
@@ -3583,7 +3583,7 @@ static void Msg_PutFormToUnbanSender (struct UsrData *UsrDat)
    fprintf (Gbl.F.Out,"<span class=\"MSG_AUT\">&nbsp;</span>"
 	              "<input type=\"image\" src=\"%s/closed_on16x16.gif\""
 	              " alt=\"%s\" title=\"%s\""
-	              " class=\"ICON20x20\" />",
+	              " class=\"ICO20x20\" />",
             Gbl.Prefs.IconsURL,
             Txt_Sender_banned_click_to_unban_him,
             Txt_Sender_banned_click_to_unban_him);
@@ -3762,7 +3762,7 @@ void Msg_ListBannedUsrs (void)
             fprintf (Gbl.F.Out,"<input type=\"image\""
         	               " src=\"%s/closed_on16x16.gif\""
         	               " alt=\"%s\" title=\"%s\""
-        	               " class=\"ICON20x20\" />",
+        	               " class=\"ICO20x20\" />",
                      Gbl.Prefs.IconsURL,
                      Txt_Sender_banned_click_to_unban_him,
                      Txt_Sender_banned_click_to_unban_him);
diff --git a/swad_network.c b/swad_network.c
index 85ec1b22a..621a6924c 100644
--- a/swad_network.c
+++ b/swad_network.c
@@ -250,12 +250,12 @@ static void Net_ShowAWebOrSocialNet (const char *URL,
                                      const char *Icon,const char *Title)
   {
    /***** Write link and icon *****/
-   fprintf (Gbl.F.Out,"<div class=\"ICON_HIGHLIGHT\""
+   fprintf (Gbl.F.Out,"<div class=\"ICO_HIGHLIGHT\""
 		      " style=\"display:inline;\">"
 		      "<a href=\"%s\" target=\"_blank\" title=\"%s\">"
 		      "<img src=\"%s/%s\""
 		      " alt=\"%s\" title=\"%s\""
-                      " class=\"ICON20x20\" />"
+                      " class=\"ICO20x20\" />"
 		      "</a>"
 		      "</div>",
 	    URL,Title,
@@ -331,7 +331,7 @@ void Net_ShowFormMyWebsAndSocialNets (void)
 			 "<td class=\"%s LEFT_MIDDLE\">"
 			 "<img src=\"%s/%s\""
 			 " alt=\"%s\" title=\"%s\""
-                         " class=\"ICON20x20\""
+                         " class=\"ICO20x20\""
 			 " style=\"margin-right:12px;\" />"
 			 "%s:</td>"
 			 "<td class=\"LEFT_MIDDLE\" style=\"width:%upx;\">",
@@ -524,9 +524,8 @@ void Net_ShowWebAndSocialNetworksStats (void)
                                         "can not get number of users with webs / social networks");
 
    /***** Number of users *****/
-   Lay_StartRoundFrame (NULL,Txt_STAT_USE_STAT_TYPES[Sta_SOCIAL_NETWORKS],
-                        NULL,Hlp_STATS_Figures_webs_social_networks);
-   fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">");
+   Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_SOCIAL_NETWORKS],
+                             NULL,Hlp_STATS_Figures_webs_social_networks,2);
 
    fprintf (Gbl.F.Out,"<tr>"
                       "<th class=\"LEFT_MIDDLE\">"
@@ -569,7 +568,7 @@ void Net_ShowWebAndSocialNetworksStats (void)
 			    "<td class=\"DAT LEFT_MIDDLE\">"
 			    "<img src=\"%s/%s\""
 			    " alt=\"%s\" title=\"%s\""
-                            " class=\"ICON20x20\""
+                            " class=\"ICO20x20\""
 			    " style=\"margin-right:12px;\" />"
 			    "%s</td>"
 			    "<td class=\"DAT RIGHT_MIDDLE\">"
diff --git a/swad_notice.c b/swad_notice.c
index a686c0b2c..7a8eeecf7 100644
--- a/swad_notice.c
+++ b/swad_notice.c
@@ -103,8 +103,7 @@ void Not_ShowFormNotice (void)
    Act_FormStart (ActRcvNot);
 
    /***** Start frame *****/
-   Lay_StartRoundFrame (NULL,Txt_New_notice,NULL,Hlp_MESSAGES_Notices);
-   fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">");
+   Lay_StartRoundFrameTable (NULL,Txt_New_notice,NULL,Hlp_MESSAGES_Notices,2);
 
    /***** Message body *****/
    fprintf (Gbl.F.Out,"<tr>"
@@ -454,7 +453,7 @@ void Not_ShowNotices (Not_Listing_t TypeNoticesListing)
 	    fprintf (Gbl.F.Out,"\" target=\"_blank\">"
 			       "<img src=\"%s/rss16x16.gif\""
 			       " alt=\"RSS\" title=\"RSS\""
-			       " class=\"ICON20x20\" />"
+			       " class=\"ICO20x20\" />"
 			       "</a>"
 			       "</div>",
 		     Gbl.Prefs.IconsURL);
@@ -639,11 +638,11 @@ static void Not_DrawANotice (Not_Listing_t TypeNoticesListing,
 	 /* Form to remove notice */
 	 Act_FormStart (ActReqRemNot);
 	 Not_PutHiddenParamNotCod (NotCod);
-	 fprintf (Gbl.F.Out,"<div class=\"CONTEXT_OPT ICON_HIGHLIGHT\">"
+	 fprintf (Gbl.F.Out,"<div class=\"CONTEXT_OPT ICO_HIGHLIGHT\">"
         	            "<input type=\"image\""
 	                    " src=\"%s/remove-on64x64.png\""
 			    " alt=\"%s\" title=\"%s\""
-			    " class=\"ICON20x20\" />"
+			    " class=\"ICO20x20\" />"
         	            "</div>",
 		  Gbl.Prefs.IconsURL,
 		  Txt_Remove,
@@ -656,11 +655,11 @@ static void Not_DrawANotice (Not_Listing_t TypeNoticesListing,
             case Not_ACTIVE_NOTICE:
                Act_FormStart (ActHidNot);
                Not_PutHiddenParamNotCod (NotCod);
-               fprintf (Gbl.F.Out,"<div class=\"CONTEXT_OPT ICON_HIGHLIGHT\">"
+               fprintf (Gbl.F.Out,"<div class=\"CONTEXT_OPT ICO_HIGHLIGHT\">"
         	                  "<input type=\"image\""
         	                  " src=\"%s/eye-on64x64.png\""
         	                  " alt=%s\" title=\"%s\""
-        	                  " class=\"ICON20x20\" />"
+        	                  " class=\"ICO20x20\" />"
         	                  "</div>",
                         Gbl.Prefs.IconsURL,
                         Txt_NOTICE_Active_Mark_as_obsolete,
@@ -669,11 +668,11 @@ static void Not_DrawANotice (Not_Listing_t TypeNoticesListing,
             case Not_OBSOLETE_NOTICE:
                Act_FormStart (ActRevNot);
                Not_PutHiddenParamNotCod (NotCod);
-               fprintf (Gbl.F.Out,"<div class=\"CONTEXT_OPT ICON_HIGHLIGHT\">"
+               fprintf (Gbl.F.Out,"<div class=\"CONTEXT_OPT ICO_HIGHLIGHT\">"
         	                  "<input type=\"image\""
         	                  " src=\"%s/eye-slash-on64x64.png\""
         	                  " alt=\"%s\" title=\"%s\""
-        	                  " class=\"ICON20x20\" />"
+        	                  " class=\"ICO20x20\" />"
         	                  "</div>",
                         Gbl.Prefs.IconsURL,
                         Txt_NOTICE_Obsolete_Mark_as_active,
@@ -690,7 +689,7 @@ static void Not_DrawANotice (Not_Listing_t TypeNoticesListing,
                fprintf (Gbl.F.Out,"<span title=\"%s\">"
                                   "<img src=\"%s/eye-off64x64.png\""
                                   " alt=\"%s\" title=\"%s\""
-                                  " class=\"ICON20x20\" />"
+                                  " class=\"ICO20x20\" />"
                                   "</span>",
                         Txt_NOTICE_Active_SINGULAR,
                         Gbl.Prefs.IconsURL,
@@ -701,7 +700,7 @@ static void Not_DrawANotice (Not_Listing_t TypeNoticesListing,
                fprintf (Gbl.F.Out,"<span title=\"%s\">"
                                   "<img src=\"%s/eye-slash-off64x64.png\""
                                   " alt=\"%s\" title=\"%s\""
-                                  " class=\"ICON20x20\" />"
+                                  " class=\"ICO20x20\" />"
                                   "</span>",
                         Txt_NOTICE_Obsolete_SINGULAR,
                         Gbl.Prefs.IconsURL,
@@ -748,7 +747,7 @@ static void Not_DrawANotice (Not_Listing_t TypeNoticesListing,
       Act_LinkFormSubmit (Txt_See_full_notice,The_ClassForm[Gbl.Prefs.Theme],NULL);
       fprintf (Gbl.F.Out,"<img src=\"%s/ellipsis32x32.gif\""
 	                 " alt=\"%s\" title=\"%s\""
-	                 " class=\"ICON40x40\" />"
+	                 " class=\"ICO40x40\" />"
 	                 "</a>",
 	       Gbl.Prefs.IconsURL,
 	       Txt_See_full_notice,
diff --git a/swad_notification.c b/swad_notification.c
index cc23d0161..73fa9f9b9 100644
--- a/swad_notification.c
+++ b/swad_notification.c
@@ -371,9 +371,8 @@ void Ntf_ShowMyNotifications (void)
       Usr_UsrDataConstructor (&UsrDat);
 
       /***** Table start *****/
-      Lay_StartRoundFrame (NULL,Txt_Notifications,Ntf_PutIconsNotif,NULL);
-      fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\" style=\"margin:0 auto;\">"
-                         "<tr>"
+      Lay_StartRoundFrameTable (NULL,Txt_Notifications,Ntf_PutIconsNotif,NULL,2);
+      fprintf (Gbl.F.Out,"<tr>"
                          "<th colspan=\"2\" class=\"LEFT_MIDDLE\">"
                          "%s"
                          "</th>"
@@ -489,7 +488,7 @@ void Ntf_ShowMyNotifications (void)
            {
 	    fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/%s\""
 			       " alt=\"%s\" title=\"%s\""
-			       " class=\"ICON20x20\" />",
+			       " class=\"ICO20x20\" />",
 		     Gbl.Prefs.IconsURL,
 		     Ntf_Icons[NotifyEvent],
 		     Txt_NOTIFY_EVENTS_SINGULAR[NotifyEvent],
@@ -499,7 +498,7 @@ void Ntf_ShowMyNotifications (void)
          else
             fprintf (Gbl.F.Out,"<img src=\"%s/%s\""
         	               " alt=\"%s\" title=\"%s\""
-        	               " class=\"ICON20x20\" />",
+        	               " class=\"ICO20x20\" />",
                      Gbl.Prefs.IconsURL,
                      Ntf_Icons[NotifyEvent],
                      Txt_NOTIFY_EVENTS_SINGULAR[NotifyEvent],
@@ -614,8 +613,7 @@ void Ntf_ShowMyNotifications (void)
         }
 
       /***** End table *****/
-      fprintf (Gbl.F.Out,"</table>");
-      Lay_EndRoundFrame ();
+      Lay_EndRoundFrameTable ();
 
       /***** Free memory used for user's data *****/
       Usr_UsrDataDestructor (&UsrDat);
@@ -2035,7 +2033,7 @@ void Ntf_WriteNumberOfNewNtfs (void)
    if (NumNewNtfs)
       fprintf (Gbl.F.Out,"<img src=\"%s/bell16x16.png\""
 			 " alt=\"%s\" title=\"%s\""
-			 " class=\"ICON20x20\" />"
+			 " class=\"ICO20x20\" />"
 			 "&nbsp;%u<span id=\"notif_new\">&nbsp;%s</span>",
 	       Gbl.Prefs.PathTheme,
 	       Txt_Notifications,
diff --git a/swad_password.c b/swad_password.c
index dfe1f2e39..d16e69b9c 100644
--- a/swad_password.c
+++ b/swad_password.c
@@ -686,8 +686,7 @@ void Pwd_ShowFormChgPwd (void)
    Act_FormStart (ActChgPwd);
 
    /***** Start frame *****/
-   Lay_StartRoundFrame (NULL,Txt_Password,NULL,Hlp_PROFILE_Password);
-   fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">");
+   Lay_StartRoundFrameTable (NULL,Txt_Password,NULL,Hlp_PROFILE_Password,2);
 
    /* Current password */
    if (IHaveAPasswordInDB) // If I have a password in database...
diff --git a/swad_place.c b/swad_place.c
index 4b75aa187..0ff725d82 100644
--- a/swad_place.c
+++ b/swad_place.c
@@ -93,12 +93,11 @@ void Plc_SeePlaces (void)
       Plc_GetListPlaces ();
 
       /***** Table head *****/
-      Lay_StartRoundFrame (NULL,Txt_Places,
-                           Gbl.Usrs.Me.LoggedRole >= Rol_INS_ADM ? Plc_PutIconToEditPlaces :
-                        	                                   NULL,
-                           NULL);
-      fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">"
-                         "<tr>");
+      Lay_StartRoundFrameTable (NULL,Txt_Places,
+                                Gbl.Usrs.Me.LoggedRole >= Rol_INS_ADM ? Plc_PutIconToEditPlaces :
+                        	                                        NULL,
+                                NULL,2);
+      fprintf (Gbl.F.Out,"<tr>");
       for (Order = Plc_ORDER_BY_PLACE;
 	   Order <= Plc_ORDER_BY_NUM_CTRS;
 	   Order++)
@@ -171,7 +170,6 @@ void Plc_SeePlaces (void)
 	       NumCtrsWithPlc);
 
       /***** End table *****/
-      fprintf (Gbl.F.Out,"</table>");
       Lay_EndRoundFrameTable ();
 
       /***** Free list of places *****/
diff --git a/swad_plugin.c b/swad_plugin.c
index 069a11616..d54919717 100644
--- a/swad_plugin.c
+++ b/swad_plugin.c
@@ -91,14 +91,13 @@ void Plg_ListPlugins (void)
    Plg_GetListPlugins ();
 
    /***** Table start *****/
-   Lay_StartRoundFrame (NULL,Txt_Plugins,
-                        Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM ? Plg_PutIconToEditPlugins :
-                                                                NULL,
-                        NULL);
+   Lay_StartRoundFrameTable (NULL,Txt_Plugins,
+                             Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM ? Plg_PutIconToEditPlugins :
+                                                                     NULL,
+                             NULL,2);
 
    /***** Write table heading *****/
-   fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">"
-                      "<tr>"
+   fprintf (Gbl.F.Out,"<tr>"
                       "<th style=\"width:40px;\">"
                       "</th>"
                       "<th class=\"LEFT_MIDDLE\">"
@@ -123,7 +122,7 @@ void Plg_ListPlugins (void)
                          "<a href=\"%s\" title=\"%s\" class=\"DAT\" target=\"_blank\">"
                          "<img src=\"%s/%s/%s24x24.gif\""
                          " alt=\"%s\" title=\"%s\""
-                         " class=\"ICON40x40\" />"
+                         " class=\"ICO40x40\" />"
                          "</a>"
                          "</td>"
                          "<td class=\"DAT LEFT_MIDDLE\">"
@@ -140,8 +139,7 @@ void Plg_ListPlugins (void)
      }
 
    /***** End table *****/
-   fprintf (Gbl.F.Out,"</table>");
-   Lay_EndRoundFrame ();
+   Lay_EndRoundFrameTable ();
 
    /***** Free list of plugins *****/
    Plg_FreeListPlugins ();
@@ -385,7 +383,7 @@ static void Plg_ListPluginsForEdition (void)
       fprintf (Gbl.F.Out,"<td class=\"CENTER_MIDDLE\" style=\"width:45px;\">"
                          "<img src=\"%s/%s/%s24x24.gif\""
                          " alt=\"%s\" title=\"%s\""
-                         " class=\"ICON40x40\" />"
+                         " class=\"ICO40x40\" />"
                          "</td>",
                Gbl.Prefs.IconsURL,Cfg_ICON_FOLDER_PLUGINS,
                Gbl.Plugins.Lst[NumPlg].Logo,
diff --git a/swad_record.c b/swad_record.c
index f1ab6a923..bd106407f 100644
--- a/swad_record.c
+++ b/swad_record.c
@@ -1448,7 +1448,7 @@ static void Rec_WriteFormShowOfficeHours (bool ShowOfficeHours,const char *ListU
 	              " onclick=\"document.getElementById('%s').submit();\" />"
                       "<img src=\"%s/clock64x64.gif\""
                       " alt=\"%s\" title=\"%s\""
-                      " class=\"ICON20x20\" />"
+                      " class=\"ICO20x20\" />"
                       "<span class=\"%s\">&nbsp;%s</span>"
                       "</div>",
             Gbl.Form.Id,
@@ -2075,13 +2075,11 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
    sprintf (StrRecordWidth,"%upx",Rec_RECORD_WIDTH);
    Gbl.Record.UsrDat = UsrDat;
    Gbl.Record.TypeOfView = TypeOfView;
-   Lay_StartRoundFrame (StrRecordWidth,NULL,
-                        Rec_PutIconsCommands,
-                        TypeOfView == Rec_FORM_MY_COMMON_RECORD ? Hlp_PROFILE_Record :
-                                                                  NULL);
-
-   /***** Start table *****/
-   fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">");
+   Lay_StartRoundFrameTable (StrRecordWidth,NULL,
+                             Rec_PutIconsCommands,
+                             TypeOfView == Rec_FORM_MY_COMMON_RECORD ? Hlp_PROFILE_Record :
+                                                                       NULL,
+                             2);
 
    /***** Institution and user's photo *****/
    fprintf (Gbl.F.Out,"<tr>");
@@ -2113,7 +2111,7 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
       /***** Show e-mail and user's ID *****/
       if (ShowIDRows)
 	{
-         fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">");
+         fprintf (Gbl.F.Out,"<table class=\"FRAME_TBL CELLS_PAD_2\">");
 	 Rec_ShowEmail (UsrDat,ClassForm);
 	 Rec_ShowUsrIDs (UsrDat,ClassForm);
          fprintf (Gbl.F.Out,"</table>");
@@ -2141,7 +2139,7 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
             break;
         }
 
-      fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">");
+      fprintf (Gbl.F.Out,"<table class=\"FRAME_TBL CELLS_PAD_2\">");
 
       if (ShowIDRows)
 	{
@@ -2243,11 +2241,8 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
 			 "</tr>");
      }
 
-   /***** End table *****/
-   fprintf (Gbl.F.Out,"</table>");
-
    /***** End frame *****/
-   Lay_EndRoundFrame ();
+   Lay_EndRoundFrameTable ();
   }
 
 /*****************************************************************************/
@@ -2277,7 +2272,7 @@ static void Rec_PutIconsCommands (void)
        Act_Actions[Gbl.Action.Act].BrowserWindow == Act_THIS_WINDOW &&	// Only in main window
        Gbl.Usrs.Me.Logged)						// Only if I am logged
      {
-      fprintf (Gbl.F.Out,"<div class=\"FRAME_ICONS\">");
+      fprintf (Gbl.F.Out,"<div class=\"FRAME_ICO\">");
 
       /***** Button to edit my record card *****/
       if (ItsMe)
@@ -2797,7 +2792,7 @@ static void Rec_ShowRole (struct UsrData *UsrDat,
 	 fprintf (Gbl.F.Out," />"
 			    "<img src=\"%s/%s16x16.gif\""
 			    " alt=\"%s\" title=\"%s\""
-			    " class=\"ICON20x20\" />"
+			    " class=\"ICO20x20\" />"
 			    "%s",
 		  Gbl.Prefs.IconsURL,Usr_StringsSexDB[Sex],
 		  Txt_SEX_SINGULAR_Abc[Sex],
@@ -3541,14 +3536,13 @@ void Rec_ShowFormMyInsCtrDpt (void)
       Lay_ShowAlert (Lay_WARNING,Txt_Please_fill_in_your_centre_and_department);
 
    /***** Start table *****/
-   Lay_StartRoundFrame ("800px",
-                        IAmTeacher ? Txt_Institution_centre_and_department :
-	                             Txt_Institution,
-	                NULL,Hlp_PROFILE_Institution);
+   Lay_StartRoundFrameTable ("800px",
+                             IAmTeacher ? Txt_Institution_centre_and_department :
+	                                  Txt_Institution,
+	                     NULL,Hlp_PROFILE_Institution,2);
 
    /***** Country *****/
-   fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">"
-	              "<tr>"
+   fprintf (Gbl.F.Out,"<tr>"
 		      "<td class=\"%s RIGHT_MIDDLE\">"
 		      "%s:"
 		      "</td>"
diff --git a/swad_report.c b/swad_report.c
index b079d22d6..13945a367 100644
--- a/swad_report.c
+++ b/swad_report.c
@@ -269,7 +269,7 @@ static void Rep_PutLinkToMyUsageReport (struct Rep_Report *Report)
                       "<a href=\"%s\" class=\"FILENAME\""
 		      " title=\"%s\" target=\"_blank\">"
                       "<img src=\"%s/report64x64.png\" alt=\"%s\""
-	              " class=\"ICON64x64\" /><br />"
+	              " class=\"ICO64x64\" /><br />"
                       "%s"
 		      "</a>"
 		      "</div>",
diff --git a/swad_search.c b/swad_search.c
index 0566e1c23..6013ec25e 100644
--- a/swad_search.c
+++ b/swad_search.c
@@ -393,7 +393,7 @@ void Sch_PutMagnifyingGlassButton (const char *Icon)
    /***** Send button *****/
    fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/%s\""
 	              " alt=\"%s\" title=\"%s\""
-	              " class=\"ICON20x20\" />",
+	              " class=\"ICO20x20\" />",
             Gbl.Prefs.IconsURL,
 	    Icon,
             Txt_Search,
diff --git a/swad_social.c b/swad_social.c
index d78f8e7ee..28ac2323b 100644
--- a/swad_social.c
+++ b/swad_social.c
@@ -1052,10 +1052,10 @@ static void Soc_PutLinkToViewOldPublishings (void)
 		      "return false;\">"
 	              "<img id=\"get_old_timeline\""
 	              " src=\"%s/recycle16x16.gif\" alt=\"%s\" title=\"%s\""
-		      " class=\"ICON20x20\" />"
+		      " class=\"ICO20x20\" />"
 		      "<img id=\"getting_old_timeline\""
 		      " src=\"%s/working16x16.gif\" alt=\"%s\" title=\"%s\""
-		      " class=\"ICON20x20\" style=\"display:none;\" />"				// Animated icon hidden
+		      " class=\"ICO20x20\" style=\"display:none;\" />"				// Animated icon hidden
 		      "&nbsp;%s"
 	              "</a>"
 	              "</div>",
@@ -1287,7 +1287,7 @@ static void Soc_WriteSocialNote (const struct SocialNote *SocNot,
       fprintf (Gbl.F.Out,"</div>");
 
       fprintf (Gbl.F.Out,"<div class=\"SOCIAL_BOTTOM_RIGHT\">"
-	                 "<div class=\"SOCIAL_ICONS_FAV_SHA_REM\">");
+	                 "<div class=\"SOCIAL_ICOS_FAV_SHA_REM\">");
 
       /* Put icon to mark this social note as favourite */
       if (IAmTheAuthor)				// I am the author
@@ -1666,11 +1666,11 @@ static void Soc_PutFormGoToAction (const struct SocialNote *SocNot)
 	}
 
       /***** Link and end form *****/
-      sprintf (Class,"%s ICON_HIGHLIGHT",The_ClassFormBold[Gbl.Prefs.Theme]);
+      sprintf (Class,"%s ICO_HIGHLIGHT",The_ClassFormBold[Gbl.Prefs.Theme]);
       Act_LinkFormSubmitUnique (Txt_SOCIAL_NOTE[SocNot->NoteType],Class);
       fprintf (Gbl.F.Out,"<img src=\"%s/%s\""
 	                 " alt=\"%s\" title=\"%s\""
-	                 " class=\"ICON20x20\" />"
+	                 " class=\"ICO20x20\" />"
 	                 "&nbsp;%s"
 	                 "</a>",
             Gbl.Prefs.IconsURL,Soc_Icons[SocNot->NoteType],
@@ -2166,12 +2166,12 @@ static void Soc_PutIconToToggleCommentSocialNote (const char UniqueId[Act_MAX_LE
    extern const char *Txt_Comment;
 
    /***** Link to toggle on/off the form to comment a social note *****/
-   fprintf (Gbl.F.Out,"<div class=\"SOCIAL_ICON_COMMENT ICON_HIGHLIGHT\">"
+   fprintf (Gbl.F.Out,"<div class=\"SOCIAL_ICO_COMMENT ICO_HIGHLIGHT\">"
                       "<a href=\"\""
                       " onclick=\"toggleDisplay('%s');return false;\" />"
                       "<img src=\"%s/write64x64.gif\""
                       " alt=\"%s\" title=\"%s\""
-                      " class=\"ICON20x20\" />"
+                      " class=\"ICO20x20\" />"
                       "</a>"
                       "</div>",
             UniqueId,
@@ -2188,10 +2188,10 @@ static void Soc_PutIconCommentDisabled (void)
    extern const char *Txt_Comment;
 
    /***** Disabled icon to comment a social note *****/
-   fprintf (Gbl.F.Out,"<div class=\"SOCIAL_ICON_COMMENT_DISABLED\">"
+   fprintf (Gbl.F.Out,"<div class=\"SOCIAL_ICO_COMMENT_DISABLED\">"
  		      "<img src=\"%s/write64x64.gif\""
 		      " alt=\"%s\" title=\"%s\""
-		      " class=\"ICON20x20\" />"
+		      " class=\"ICO20x20\" />"
 		      "</div>",
 	    Gbl.Prefs.IconsURL,
 	    Txt_Comment,Txt_Comment);
@@ -2488,11 +2488,11 @@ static void Soc_PutFormToRemoveComment (long PubCod)
    else
       Act_FormStartUnique (ActReqRemSocComGbl);
    Soc_PutHiddenParamPubCod (PubCod);
-   fprintf (Gbl.F.Out,"<div class=\"SOCIAL_ICON_REMOVE ICON_HIGHLIGHT\">"
+   fprintf (Gbl.F.Out,"<div class=\"SOCIAL_ICO_REMOVE ICO_HIGHLIGHT\">"
 		      "<input type=\"image\""
 		      " src=\"%s/remove-on64x64.png\""
 		      " alt=\"%s\" title=\"%s\""
-		      " class=\"ICON20x20\" />"
+		      " class=\"ICO20x20\" />"
 		      "</div>",
 	    Gbl.Prefs.IconsURL,
 	    Txt_Remove,
@@ -2518,11 +2518,11 @@ static void Soc_PutFormToFavSocialComment (long PubCod)
    else
       Act_FormStartUnique (ActFavSocComGbl);
    Soc_PutHiddenParamPubCod (PubCod);
-   fprintf (Gbl.F.Out,"<div class=\"SOCIAL_ICON_FAV ICON_HIGHLIGHT\">"
+   fprintf (Gbl.F.Out,"<div class=\"SOCIAL_ICO_FAV ICO_HIGHLIGHT\">"
 		      "<input type=\"image\""
 		      " src=\"%s/fav64x64.png\""
 		      " alt=\"%s\" title=\"%s\""
-		      " class=\"ICON20x20\" />"
+		      " class=\"ICO20x20\" />"
 		      "</div>",
 	    Gbl.Prefs.IconsURL,
 	    Txt_Mark_as_favourite,Txt_Mark_as_favourite);
@@ -2544,10 +2544,10 @@ static void Soc_PutDisabledIconShare (unsigned NumShared)
       strcpy (Gbl.Title,Txt_SOCIAL_NOTE_Not_shared_by_anyone);
 
    /***** Disabled icon to share *****/
-   fprintf (Gbl.F.Out,"<div class=\"SOCIAL_ICON_SHARE_DISABLED\">"
+   fprintf (Gbl.F.Out,"<div class=\"SOCIAL_ICO_SHARE_DISABLED\">"
 		      "<img src=\"%s/share64x64.png\""
 		      " alt=\"%s\" title=\"%s\""
-		      " class=\"ICON20x20\" />"
+		      " class=\"ICO20x20\" />"
 		      "</div>",
 	    Gbl.Prefs.IconsURL,
 	    Gbl.Title,Gbl.Title);
@@ -2568,10 +2568,10 @@ static void Soc_PutDisabledIconFav (unsigned NumFavs)
       strcpy (Gbl.Title,Txt_SOCIAL_NOTE_Not_favourited_by_anyone);
 
    /***** Disabled icon to mark as favourite *****/
-   fprintf (Gbl.F.Out,"<div class=\"SOCIAL_ICON_FAV_DISABLED\">"
+   fprintf (Gbl.F.Out,"<div class=\"SOCIAL_ICO_FAV_DISABLED\">"
 		      "<img src=\"%s/fav64x64.png\""
 		      " alt=\"%s\" title=\"%s\""
-		      " class=\"ICON20x20\" />"
+		      " class=\"ICO20x20\" />"
 		      "</div>",
 	    Gbl.Prefs.IconsURL,
 	    Gbl.Title,Gbl.Title);
@@ -2595,11 +2595,11 @@ static void Soc_PutFormToShareSocialNote (long NotCod)
    else
       Act_FormStartUnique (ActShaSocNotGbl);
    Soc_PutHiddenParamNotCod (NotCod);
-   fprintf (Gbl.F.Out,"<div class=\"SOCIAL_ICON_SHARE ICON_HIGHLIGHT\">"
+   fprintf (Gbl.F.Out,"<div class=\"SOCIAL_ICO_SHARE ICO_HIGHLIGHT\">"
 		      "<input type=\"image\""
 		      " src=\"%s/share64x64.png\""
 		      " alt=\"%s\" title=\"%s\""
-		      " class=\"ICON20x20\" />"
+		      " class=\"ICO20x20\" />"
 		      "</div>",
 	    Gbl.Prefs.IconsURL,
 	    Txt_Share,Txt_Share);
@@ -2624,11 +2624,11 @@ static void Soc_PutFormToFavSocialNote (long NotCod)
    else
       Act_FormStartUnique (ActFavSocNotGbl);
    Soc_PutHiddenParamNotCod (NotCod);
-   fprintf (Gbl.F.Out,"<div class=\"SOCIAL_ICON_FAV ICON_HIGHLIGHT\">"
+   fprintf (Gbl.F.Out,"<div class=\"SOCIAL_ICO_FAV ICO_HIGHLIGHT\">"
 		      "<input type=\"image\""
 		      " src=\"%s/fav64x64.png\""
 		      " alt=\"%s\" title=\"%s\""
-		      " class=\"ICON20x20\" />"
+		      " class=\"ICO20x20\" />"
 		      "</div>",
 	    Gbl.Prefs.IconsURL,
 	    Txt_Mark_as_favourite,Txt_Mark_as_favourite);
@@ -2653,11 +2653,11 @@ static void Soc_PutFormToUnshareSocialNote (long NotCod)
    else
       Act_FormStartUnique (ActUnsSocNotGbl);
    Soc_PutHiddenParamNotCod (NotCod);
-   fprintf (Gbl.F.Out,"<div class=\"SOCIAL_ICON_SHARE ICON_HIGHLIGHT\">"
+   fprintf (Gbl.F.Out,"<div class=\"SOCIAL_ICO_SHARE ICO_HIGHLIGHT\">"
 		      "<input type=\"image\""
 		      " src=\"%s/shared64x64.png\""
 		      " alt=\"%s\" title=\"%s\""
-		      " class=\"ICON20x20\" />"
+		      " class=\"ICO20x20\" />"
 		      "</div>",
 	    Gbl.Prefs.IconsURL,
 	    Txt_SOCIAL_NOTE_Shared,Txt_SOCIAL_NOTE_Shared);
@@ -2682,11 +2682,11 @@ static void Soc_PutFormToUnfavSocialNote (long NotCod)
    else
       Act_FormStartUnique (ActUnfSocNotGbl);
    Soc_PutHiddenParamNotCod (NotCod);
-   fprintf (Gbl.F.Out,"<div class=\"SOCIAL_ICON_FAV ICON_HIGHLIGHT\">"
+   fprintf (Gbl.F.Out,"<div class=\"SOCIAL_ICO_FAV ICO_HIGHLIGHT\">"
 		      "<input type=\"image\""
 		      " src=\"%s/faved64x64.png\""
 		      " alt=\"%s\" title=\"%s\""
-		      " class=\"ICON20x20\" />"
+		      " class=\"ICO20x20\" />"
 		      "</div>",
 	    Gbl.Prefs.IconsURL,
 	    Txt_SOCIAL_NOTE_Favourite,Txt_SOCIAL_NOTE_Favourite);
@@ -2711,11 +2711,11 @@ static void Soc_PutFormToUnfavSocialComment (long PubCod)
    else
       Act_FormStartUnique (ActUnfSocComGbl);
    Soc_PutHiddenParamPubCod (PubCod);
-   fprintf (Gbl.F.Out,"<div class=\"SOCIAL_ICON_FAV ICON_HIGHLIGHT\">"
+   fprintf (Gbl.F.Out,"<div class=\"SOCIAL_ICO_FAV ICO_HIGHLIGHT\">"
 		      "<input type=\"image\""
 		      " src=\"%s/faved64x64.png\""
 		      " alt=\"%s\" title=\"%s\""
-		      " class=\"ICON20x20\" />"
+		      " class=\"ICO20x20\" />"
 		      "</div>",
 	    Gbl.Prefs.IconsURL,
 	    Txt_SOCIAL_NOTE_Favourite,Txt_SOCIAL_NOTE_Favourite);
@@ -2740,11 +2740,11 @@ static void Soc_PutFormToRemoveSocialPublishing (long NotCod)
    else
       Act_FormStartUnique (ActReqRemSocPubGbl);
    Soc_PutHiddenParamNotCod (NotCod);
-   fprintf (Gbl.F.Out,"<div class=\"SOCIAL_ICON_REMOVE ICON_HIGHLIGHT\">"
+   fprintf (Gbl.F.Out,"<div class=\"SOCIAL_ICO_REMOVE ICO_HIGHLIGHT\">"
 		      "<input type=\"image\""
 		      " src=\"%s/remove-on64x64.png\""
 		      " alt=\"%s\" title=\"%s\""
-		      " class=\"ICON20x20\" />"
+		      " class=\"ICO20x20\" />"
 		      "</div>",
 	    Gbl.Prefs.IconsURL,
 	    Txt_Remove,
@@ -4339,7 +4339,7 @@ static void Soc_ShowSharersOrFavers (unsigned NumUsrs,const char *Query)
 	 fprintf (Gbl.F.Out,"<div class=\"SOCIAL_SHARER\">"
 	                    "<img src=\"%s/ellipsis32x32.gif\""
 			    " alt=\"%u\" title=\"%u\""
-			    " class=\"ICON20x20\" />"
+			    " class=\"ICO20x20\" />"
 			    "</div>",
 		  Gbl.Prefs.IconsURL,
 		  NumUsrs - NumUsrsShown,
diff --git a/swad_statistic.c b/swad_statistic.c
index ea613d026..78417b7c2 100644
--- a/swad_statistic.c
+++ b/swad_statistic.c
@@ -609,8 +609,7 @@ void Sta_AskShowGblHits (void)
 
    /***** Start frame *****/
    fprintf (Gbl.F.Out,"<section id=\"stat_form\">");
-   Lay_StartRoundFrame (NULL,Txt_Statistics_of_all_visits,NULL,NULL);
-   fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">");
+   Lay_StartRoundFrameTable (NULL,Txt_Statistics_of_all_visits,NULL,NULL,2);
 
    /***** Start and end dates for the search *****/
    Dat_PutFormStartEndClientLocalDateTimesWithYesterdayToday ();
@@ -694,11 +693,8 @@ void Sta_AskShowGblHits (void)
    /***** Hidden param used to get client time zone *****/
    Dat_PutHiddenParBrowserTZDiff ();
 
-   /***** Send button *****/
-   Lay_PutConfirmButton (Txt_Show_hits);
-
-   /***** End frame *****/
-   Lay_EndRoundFrame ();
+   /***** End frame with button *****/
+   Lay_EndRoundFrameWithButton (Lay_CONFIRM_BUTTON,Txt_Show_hits);
    fprintf (Gbl.F.Out,"</section>");
 
    /***** End form *****/
@@ -3977,9 +3973,8 @@ static void Sta_GetAndShowUsersStats (void)
    extern const char *Txt_Average_number_of_users_belonging_to_a_course;
 
    /***** Number of users *****/
-   Lay_StartRoundFrame (NULL,Txt_STAT_USE_STAT_TYPES[Sta_USERS],
-                        NULL,Hlp_STATS_Figures_users);
-   fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">");
+   Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_USERS],
+                             NULL,Hlp_STATS_Figures_users,2);
 
    fprintf (Gbl.F.Out,"<tr>"
                       "<th class=\"RIGHT_MIDDLE\">"
@@ -4025,9 +4020,9 @@ static void Sta_GetAndShowUsersRanking (void)
    extern const char *Txt_Messages;
    extern const char *Txt_Followers;
 
-   Lay_StartRoundFrame (NULL,Txt_STAT_USE_STAT_TYPES[Sta_USERS_RANKING],
-                        NULL,Hlp_STATS_Figures_ranking);
-   fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">");
+   /***** Start table *****/
+   Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_USERS_RANKING],
+                             NULL,Hlp_STATS_Figures_ranking,2);
 
    /***** Header *****/
    fprintf (Gbl.F.Out,"<tr>"
@@ -4079,6 +4074,7 @@ static void Sta_GetAndShowUsersRanking (void)
    fprintf (Gbl.F.Out,"</td>"
 	              "</tr>");
 
+   /***** End table *****/
    Lay_EndRoundFrameTable ();
   }
 
@@ -4092,9 +4088,8 @@ static void Sta_GetAndShowHierarchyStats (void)
    extern const char *Hlp_STATS_Figures_hierarchy;
    extern const char *Txt_STAT_USE_STAT_TYPES[Sta_NUM_FIGURES];
 
-   Lay_StartRoundFrame (NULL,Txt_STAT_USE_STAT_TYPES[Sta_HIERARCHY],
-                        NULL,Hlp_STATS_Figures_hierarchy);
-   fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">");
+   Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_HIERARCHY],
+                             NULL,Hlp_STATS_Figures_hierarchy,2);
    Sta_WriteHeadDegsCrssInSWAD ();
    Sta_GetAndShowNumCtysInSWAD ();
    Sta_GetAndShowNumInssInSWAD ();
@@ -4245,7 +4240,7 @@ static void Sta_GetAndShowNumCtysInSWAD (void)
                       "<td class=\"TIT_TBL LEFT_MIDDLE\">"
                       "<img src=\"%s/cty64x64.gif\""
                       " alt=\"%s\" title=\"%s\""
-                      " class=\"ICON20x20\" />"
+                      " class=\"ICO20x20\" />"
                       "&nbsp;%s:"
                       "</td>"
                       "<td class=\"DAT RIGHT_MIDDLE\">"
@@ -4370,7 +4365,7 @@ static void Sta_GetAndShowNumInssInSWAD (void)
                       "<td class=\"TIT_TBL LEFT_MIDDLE\">"
                       "<img src=\"%s/ins64x64.gif\""
                       " alt=\"%s\" title=\"%s\""
-                      " class=\"ICON20x20\" />"
+                      " class=\"ICO20x20\" />"
                       "&nbsp;%s:"
                       "</td>"
                       "<td class=\"DAT RIGHT_MIDDLE\">"
@@ -4485,7 +4480,7 @@ static void Sta_GetAndShowNumCtrsInSWAD (void)
                       "<td class=\"TIT_TBL LEFT_MIDDLE\">"
                       "<img src=\"%s/ctr64x64.gif\""
                       " alt=\"%s\" title=\"%s\""
-                      " class=\"ICON20x20\" />"
+                      " class=\"ICO20x20\" />"
                       "&nbsp;%s:"
                       "</td>"
                       "<td class=\"DAT RIGHT_MIDDLE\">"
@@ -4590,7 +4585,7 @@ static void Sta_GetAndShowNumDegsInSWAD (void)
                       "<td class=\"TIT_TBL LEFT_MIDDLE\">"
                       "<img src=\"%s/deg64x64.gif\""
                       " alt=\"%s\" title=\"%s\""
-                      " class=\"ICON20x20\" />"
+                      " class=\"ICO20x20\" />"
                       "&nbsp;%s:"
                       "</td>"
                       "<td class=\"DAT RIGHT_MIDDLE\">"
@@ -4685,7 +4680,7 @@ static void Sta_GetAndShowNumCrssInSWAD (void)
                       "<td class=\"TIT_TBL LEFT_MIDDLE\">"
                       "<img src=\"%s/crs64x64.gif\""
                       " alt=\"%s\" title=\"%s\""
-                      " class=\"ICON20x20\" />"
+                      " class=\"ICO20x20\" />"
                       "&nbsp;%s:"
                       "</td>"
                       "<td class=\"DAT RIGHT_MIDDLE\">"
@@ -5324,10 +5319,9 @@ static void Sta_GetAndShowFileBrowsersStats (void)
      };
    unsigned NumStat;
 
-   /***** Table start *****/
-   Lay_StartRoundFrame (NULL,Txt_STAT_USE_STAT_TYPES[Sta_FOLDERS_AND_FILES],
-                        NULL,Hlp_STATS_Figures_folders_and_files);
-   fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">");
+   /***** Start table *****/
+   Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_FOLDERS_AND_FILES],
+                             NULL,Hlp_STATS_Figures_folders_and_files,2);
 
    /***** Write table heading *****/
    Sta_WriteStatsExpTreesTableHead ();
@@ -6392,10 +6386,9 @@ static void Sta_GetAndShowOERsStats (void)
    Brw_License_t License;
    unsigned long NumFiles[2];
 
-   /***** Table start *****/
-   Lay_StartRoundFrame (NULL,Txt_STAT_USE_STAT_TYPES[Sta_OER],
-                        NULL,Hlp_STATS_Figures_open_educational_resources_oer);
-   fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">");
+   /***** Start table *****/
+   Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_OER],
+                             NULL,Hlp_STATS_Figures_open_educational_resources_oer,2);
 
    /***** Write table heading *****/
    fprintf (Gbl.F.Out,"<tr>"
@@ -6583,10 +6576,9 @@ static void Sta_GetAndShowAssignmentsStats (void)
       if ((NumCoursesWithAssignments = Asg_GetNumCoursesWithAssignments (Gbl.Scope.Current)) != 0)
          NumAssignmentsPerCourse = (float) NumAssignments / (float) NumCoursesWithAssignments;
 
-   /***** Table start *****/
-   Lay_StartRoundFrame (NULL,Txt_STAT_USE_STAT_TYPES[Sta_ASSIGNMENTS],
-                        NULL,Hlp_STATS_Figures_assignments);
-   fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">");
+   /***** Start table *****/
+   Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_ASSIGNMENTS],
+                             NULL,Hlp_STATS_Figures_assignments,2);
 
    /***** Write table heading *****/
    fprintf (Gbl.F.Out,"<tr>"
@@ -6654,10 +6646,9 @@ static void Sta_GetAndShowTestsStats (void)
    Tst_AnswerType_t AnsType;
    struct Tst_Stats Stats;
 
-   /***** Table start *****/
-   Lay_StartRoundFrame (NULL,Txt_STAT_USE_STAT_TYPES[Sta_TESTS],
-                        NULL,Hlp_STATS_Figures_tests);
-   fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">");
+   /***** Start table *****/
+   Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_TESTS],
+                             NULL,Hlp_STATS_Figures_tests,2);
 
    /***** Write table heading *****/
    fprintf (Gbl.F.Out,"<tr>"
@@ -6825,9 +6816,9 @@ static void Sta_GetAndShowSocialActivityStats (void)
    unsigned NumUsrs;
    unsigned NumUsrsTotal;
 
-   Lay_StartRoundFrame (NULL,Txt_STAT_USE_STAT_TYPES[Sta_SOCIAL_ACTIVITY],
-                        NULL,Hlp_STATS_Figures_public_activity);
-   fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">");
+   /***** Start table *****/
+   Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_SOCIAL_ACTIVITY],
+                             NULL,Hlp_STATS_Figures_public_activity,2);
 
    /***** Heading row *****/
    fprintf (Gbl.F.Out,"<tr>"
@@ -7079,6 +7070,7 @@ static void Sta_GetAndShowSocialActivityStats (void)
 	    NumUsrs ? (float) NumSocialNotes / (float) NumUsrs :
 		      0.0);
 
+   /***** End table *****/
    Lay_EndRoundFrameTable ();
   }
 
@@ -7109,9 +7101,9 @@ static void Sta_GetAndShowFollowStats (void)
    unsigned NumUsrs;
    float Average;
 
-   Lay_StartRoundFrame (NULL,Txt_STAT_USE_STAT_TYPES[Sta_FOLLOW],
-                        NULL,Hlp_STATS_Figures_followed_followers);
-   fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">");
+   /***** Start table *****/
+   Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_FOLLOW],
+                             NULL,Hlp_STATS_Figures_followed_followers,2);
 
    /***** Heading row *****/
    fprintf (Gbl.F.Out,"<tr>"
@@ -7338,6 +7330,7 @@ static void Sta_GetAndShowFollowStats (void)
 	       Average);
      }
 
+   /***** End table *****/
    Lay_EndRoundFrameTable ();
   }
 
@@ -7366,17 +7359,16 @@ static void Sta_GetAndShowForumStats (void)
    StatsForum.NumPosts            = 0;
    StatsForum.NumUsrsToBeNotifiedByEMail = 0;
 
-   /***** Table start *****/
-   Lay_StartRoundFrame (NULL,Txt_STAT_USE_STAT_TYPES[Sta_FORUMS],
-                        NULL,Hlp_STATS_Figures_forums);
-   fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">");
+   /***** Start table *****/
+   Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_FORUMS],
+                             NULL,Hlp_STATS_Figures_forums,2);
 
    /***** Write table heading *****/
    fprintf (Gbl.F.Out,"<tr>"
                       "<th class=\"LEFT_TOP\" style=\"width:20px;\">"
                       "<img src=\"%s/forum64x64.gif\""
                       " alt=\"%s\" title=\"%s\""
-                      " class=\"ICON20x20\" />"
+                      " class=\"ICO20x20\" />"
                       "</th>"
                       "<th class=\"LEFT_TOP\">"
                       "%s"
@@ -7602,7 +7594,7 @@ static void Sta_WriteForumTitleAndStats (For_ForumType_t ForumType,
                       "<td class=\"LEFT_TOP\" style=\"width:20px;\">"
                       "<img src=\"%s/%s\""
                       " alt=\"%s%s\" title=\"%s%s\""
-                      " class=\"ICON20x20\" />"
+                      " class=\"ICO20x20\" />"
                       "</td>"
                       "<td class=\"DAT LEFT_TOP\">"
                       "%s%s"
@@ -7722,9 +7714,9 @@ static void Sta_GetAndShowNumUsrsPerNotifyEvent (void)
    unsigned NumMailsTotal = 0;
    unsigned NumMails[Ntf_NUM_NOTIFY_EVENTS];
 
-   Lay_StartRoundFrame (NULL,Txt_STAT_USE_STAT_TYPES[Sta_NOTIFY_EVENTS],
-                        NULL,Hlp_STATS_Figures_notifications);
-   fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">");
+   /***** Start table *****/
+   Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_NOTIFY_EVENTS],
+                             NULL,Hlp_STATS_Figures_notifications,2);
 
    /***** Heading row *****/
    fprintf (Gbl.F.Out,"<tr>"
@@ -8025,6 +8017,7 @@ static void Sta_GetAndShowNumUsrsPerNotifyEvent (void)
             NumEventsTotal,
             NumMailsTotal);
 
+   /***** End table *****/
    Lay_EndRoundFrameTable ();
   }
 
@@ -8062,10 +8055,9 @@ static void Sta_GetAndShowNoticesStats (void)
    NumTotalNotices += NumNoticesDeleted;
    NumTotalNotifications += NumNotif;
 
-   /***** Table start *****/
-   Lay_StartRoundFrame (NULL,Txt_STAT_USE_STAT_TYPES[Sta_NOTICES],
-                        NULL,Hlp_STATS_Figures_notices);
-   fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">");
+   /***** Start table *****/
+   Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_NOTICES],
+                             NULL,Hlp_STATS_Figures_notices,2);
 
    /***** Write table heading *****/
    fprintf (Gbl.F.Out,"<tr>"
@@ -8146,10 +8138,9 @@ static void Sta_GetAndShowMsgsStats (void)
    NumMsgsReceivedAndDeleted  = Msg_GetNumMsgsReceived (Gbl.Scope.Current,Msg_STATUS_DELETED );
    NumMsgsReceivedAndNotified = Msg_GetNumMsgsReceived (Gbl.Scope.Current,Msg_STATUS_NOTIFIED);
 
-   /***** Table start *****/
-   Lay_StartRoundFrame (NULL,Txt_STAT_USE_STAT_TYPES[Sta_MESSAGES],
-                        NULL,Hlp_STATS_Figures_messages);
-   fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">");
+   /***** Start table *****/
+   Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_MESSAGES],
+                             NULL,Hlp_STATS_Figures_messages,2);
 
    /***** Write table heading *****/
    fprintf (Gbl.F.Out,"<tr>"
@@ -8252,10 +8243,9 @@ static void Sta_GetAndShowSurveysStats (void)
       NumQstsPerSurvey = Svy_GetNumQstsPerCrsSurvey (Gbl.Scope.Current);
      }
 
-   /***** Table start *****/
-   Lay_StartRoundFrame (NULL,Txt_STAT_USE_STAT_TYPES[Sta_SURVEYS],
-                        NULL,Hlp_STATS_Figures_surveys);
-   fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">");
+   /***** Start table *****/
+   Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_SURVEYS],
+                             NULL,Hlp_STATS_Figures_surveys,2);
 
    /***** Write table heading *****/
    fprintf (Gbl.F.Out,"<tr>"
@@ -8320,9 +8310,9 @@ static void Sta_GetAndShowNumUsrsPerPrivacy (void)
    extern const char *Txt_Public_profile;
    extern const char *Txt_STAT_USE_STAT_TYPES[Sta_NUM_FIGURES];
 
-   Lay_StartRoundFrame (NULL,Txt_STAT_USE_STAT_TYPES[Sta_PRIVACY],
-                        NULL,Hlp_STATS_Figures_privacy);
-   fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">");
+   /***** Start table *****/
+   Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_PRIVACY],
+                             NULL,Hlp_STATS_Figures_privacy,2);
 
    /***** Privacy for photo *****/
    Sta_GetAndShowNumUsrsPerPrivacyForAnObject (Txt_Photo,"PhotoVisibility");
@@ -8330,6 +8320,7 @@ static void Sta_GetAndShowNumUsrsPerPrivacy (void)
    /***** Privacy for public profile *****/
    Sta_GetAndShowNumUsrsPerPrivacyForAnObject (Txt_Public_profile,"ProfileVisibility");
 
+   /***** End table *****/
    Lay_EndRoundFrameTable ();
   }
 
@@ -8487,9 +8478,9 @@ static void Sta_GetAndShowNumUsrsPerLanguage (void)
    unsigned NumUsrs[1+Txt_NUM_LANGUAGES];
    unsigned NumUsrsTotal = 0;
 
-   Lay_StartRoundFrame (NULL,Txt_STAT_USE_STAT_TYPES[Sta_LANGUAGES],
-                        NULL,Hlp_STATS_Figures_language);
-   fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">");
+   /***** Start table *****/
+   Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_LANGUAGES],
+                             NULL,Hlp_STATS_Figures_language,2);
 
    /***** Heading row *****/
    fprintf (Gbl.F.Out,"<tr>"
@@ -8605,6 +8596,7 @@ static void Sta_GetAndShowNumUsrsPerLanguage (void)
         	              (float) NumUsrsTotal :
         	              0);
 
+   /***** End table *****/
    Lay_EndRoundFrameTable ();
   }
 
@@ -8627,9 +8619,9 @@ static void Sta_GetAndShowNumUsrsPerFirstDayOfWeek (void)
    unsigned NumUsrs[7];	// 7: seven days in a week
    unsigned NumUsrsTotal = 0;
 
-   Lay_StartRoundFrame (NULL,Txt_STAT_USE_STAT_TYPES[Sta_FIRST_DAY_OF_WEEK],
-                        NULL,Hlp_STATS_Figures_calendar);
-   fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">");
+   /***** Start table *****/
+   Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_FIRST_DAY_OF_WEEK],
+                             NULL,Hlp_STATS_Figures_calendar,2);
 
    /***** Heading row *****/
    fprintf (Gbl.F.Out,"<tr>"
@@ -8730,7 +8722,7 @@ static void Sta_GetAndShowNumUsrsPerFirstDayOfWeek (void)
 			    "<td class=\"CENTER_MIDDLE\">"
 			    "<img src=\"%s/first-day-of-week-%u-64x64.png\""
 			    " alt=\"%s\" title=\"%s: %s\""
-			    " class=\"ICON40x40\" />"
+			    " class=\"ICO40x40\" />"
 			    "</td>"
 			    "<td class=\"DAT RIGHT_MIDDLE\">"
 			    "%u"
@@ -8747,6 +8739,7 @@ static void Sta_GetAndShowNumUsrsPerFirstDayOfWeek (void)
 				 (float) NumUsrsTotal :
 				 0);
 
+   /***** End table *****/
    Lay_EndRoundFrameTable ();
   }
 
@@ -8768,9 +8761,9 @@ static void Sta_GetAndShowNumUsrsPerTheme (void)
    unsigned NumUsrs[The_NUM_THEMES];
    unsigned NumUsrsTotal = 0;
 
-   Lay_StartRoundFrame (NULL,Txt_STAT_USE_STAT_TYPES[Sta_THEMES],
-                        NULL,Hlp_STATS_Figures_theme);
-   fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">");
+   /***** Start table *****/
+   Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_THEMES],
+                             NULL,Hlp_STATS_Figures_theme,2);
 
    /***** Heading row *****/
    fprintf (Gbl.F.Out,"<tr>"
@@ -8886,6 +8879,7 @@ static void Sta_GetAndShowNumUsrsPerTheme (void)
         	              (float) NumUsrsTotal :
         	              0);
 
+   /***** End table *****/
    Lay_EndRoundFrameTable ();
   }
 
@@ -8907,9 +8901,9 @@ static void Sta_GetAndShowNumUsrsPerIconSet (void)
    unsigned NumUsrs[Ico_NUM_ICON_SETS];
    unsigned NumUsrsTotal = 0;
 
-   Lay_StartRoundFrame (NULL,Txt_STAT_USE_STAT_TYPES[Sta_ICON_SETS],
-                        NULL,Hlp_STATS_Figures_icons);
-   fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">");
+   /***** Start table *****/
+   Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_ICON_SETS],
+                             NULL,Hlp_STATS_Figures_icons,2);
 
    /***** Heading row *****/
    fprintf (Gbl.F.Out,"<tr>"
@@ -9008,7 +9002,7 @@ static void Sta_GetAndShowNumUsrsPerIconSet (void)
                          "<td class=\"LEFT_MIDDLE\">"
                          "<img src=\"%s/%s/%s/%s/heart64x64.gif\""
                          " alt=\"%s\" title=\"%s\""
-                         " class=\"ICON40x40\" />"
+                         " class=\"ICO40x40\" />"
                          "</td>"
                          "<td class=\"DAT RIGHT_MIDDLE\">"
                          "%u"
@@ -9028,6 +9022,7 @@ static void Sta_GetAndShowNumUsrsPerIconSet (void)
         	              (float) NumUsrsTotal :
         	              0);
 
+   /***** End table *****/
    Lay_EndRoundFrameTable ();
   }
 
@@ -9049,9 +9044,9 @@ static void Sta_GetAndShowNumUsrsPerMenu (void)
    unsigned NumUsrs[Mnu_NUM_MENUS];
    unsigned NumUsrsTotal = 0;
 
-   Lay_StartRoundFrame (NULL,Txt_STAT_USE_STAT_TYPES[Sta_MENUS],
-                        NULL,Hlp_STATS_Figures_menu);
-   fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">");
+   /***** Start table *****/
+   Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_MENUS],
+                             NULL,Hlp_STATS_Figures_menu,2);
 
    /***** Heading row *****/
    fprintf (Gbl.F.Out,"<tr>"
@@ -9150,7 +9145,7 @@ static void Sta_GetAndShowNumUsrsPerMenu (void)
                          "<td class=\"CENTER_MIDDLE\">"
                          "<img src=\"%s/%s32x32.gif\""
                          " alt=\"%s\" title=\"%s\""
-                         " class=\"ICON40x40\" />"
+                         " class=\"ICO40x40\" />"
                          "</td>"
                          "<td class=\"DAT RIGHT_MIDDLE\">"
                          "%u"
@@ -9167,6 +9162,7 @@ static void Sta_GetAndShowNumUsrsPerMenu (void)
         	              (float) NumUsrsTotal :
         	              0);
 
+   /***** End table *****/
    Lay_EndRoundFrameTable ();
   }
 
@@ -9187,9 +9183,9 @@ static void Sta_GetAndShowNumUsrsPerSideColumns (void)
    unsigned NumUsrsTotal = 0;
    extern const char *Txt_LAYOUT_SIDE_COLUMNS[4];
 
-   Lay_StartRoundFrame (NULL,Txt_STAT_USE_STAT_TYPES[Sta_SIDE_COLUMNS],
-                        NULL,Hlp_STATS_Figures_columns);
-   fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">");
+   /***** Start table *****/
+   Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_SIDE_COLUMNS],
+                             NULL,Hlp_STATS_Figures_columns,2);
 
    /***** Heading row *****/
    fprintf (Gbl.F.Out,"<tr>"
@@ -9305,6 +9301,7 @@ static void Sta_GetAndShowNumUsrsPerSideColumns (void)
         	              (float) NumUsrsTotal :
         	              0);
 
+   /***** End table *****/
    Lay_EndRoundFrameTable ();
   }
 
diff --git a/swad_survey.c b/swad_survey.c
index f17c99662..19923b901 100644
--- a/swad_survey.c
+++ b/swad_survey.c
@@ -222,7 +222,7 @@ static void Svy_ListAllSurveys (struct SurveyQuestion *SvyQst)
    if (Gbl.Svys.Num)
      {
       /***** Table head *****/
-      fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE_MARGIN CELLS_PAD_2\">"
+      fprintf (Gbl.F.Out,"<table class=\"FRAME_TBL_MARGIN CELLS_PAD_2\">"
 			 "<tr>");
       for (Order = Svy_ORDER_BY_START_DATE;
 	   Order <= Svy_ORDER_BY_END_DATE;
@@ -432,7 +432,7 @@ static void Svy_ShowOneSurvey (long SvyCod,struct SurveyQuestion *SvyQst,
 
    /***** Start table *****/
    if (ShowOnlyThisSvyComplete)
-      fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">");
+      fprintf (Gbl.F.Out,"<table class=\"FRAME_TBL CELLS_PAD_2\">");
 
    /***** Start date/time *****/
    UniqueId++;
@@ -1844,13 +1844,11 @@ void Svy_RequestCreatOrEditSvy (void)
    Svy_PutParams ();
 
    /***** Start frame *****/
-   Lay_StartRoundFrame (NULL,ItsANewSurvey ? Txt_New_survey :
-	                                     Txt_Edit_survey,
-	                NULL,ItsANewSurvey ? Hlp_STATS_Surveys_new_survey :
-	                                     Hlp_STATS_Surveys_edit_survey);
-
-   /***** Start table *****/
-   fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">");
+   Lay_StartRoundFrameTable (NULL,ItsANewSurvey ? Txt_New_survey :
+	                                          Txt_Edit_survey,
+	                     NULL,ItsANewSurvey ? Hlp_STATS_Surveys_new_survey :
+	                                          Hlp_STATS_Surveys_edit_survey,
+	                     2);
 
    /***** Scope of the survey *****/
    fprintf (Gbl.F.Out,"<tr>"
@@ -2681,7 +2679,7 @@ static void Svy_ShowFormEditOneQst (long SvyCod,struct SurveyQuestion *SvyQst,ch
       Svy_PutParamQstCod (SvyQst->QstCod);
 
    /***** Start table *****/
-   fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">");
+   fprintf (Gbl.F.Out,"<table class=\"FRAME_TBL CELLS_PAD_2\">");
 
    /***** Stem *****/
    fprintf (Gbl.F.Out,"<tr>"
@@ -3210,7 +3208,7 @@ static void Svy_ListSvyQuestions (struct Survey *Svy,struct SurveyQuestion *SvyQ
 	}
 
       /***** Write the heading *****/
-      fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">"
+      fprintf (Gbl.F.Out,"<table class=\"FRAME_TBL CELLS_PAD_2\">"
                          "<tr>");
       if (Svy->Status.ICanEdit)
          fprintf (Gbl.F.Out,"<th colspan=\"2\"></th>");
@@ -3261,7 +3259,7 @@ static void Svy_ListSvyQuestions (struct Survey *Svy,struct SurveyQuestion *SvyQ
             Svy_PutParamQstCod (SvyQst->QstCod);
             fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/edit64x64.png\""
         	               " alt=\"%s\" title=\"%s\""
-        	               " class=\"ICON20x20\" />",
+        	               " class=\"ICO20x20\" />",
                      Gbl.Prefs.IconsURL,
                      Txt_Edit_question,
                      Txt_Edit_question);
diff --git a/swad_syllabus.c b/swad_syllabus.c
index e5422534b..2c13f141a 100644
--- a/swad_syllabus.c
+++ b/swad_syllabus.c
@@ -235,12 +235,10 @@ bool Syl_CheckAndEditSyllabus (void)
       ICanEdit = Gbl.Usrs.Me.LoggedRole == Rol_TEACHER ||
 		 Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM;
       PutIconToEdit = ICanEdit && !Gbl.Syllabus.EditionIsActive;
-      Lay_StartRoundFrame (NULL,Txt_INFO_TITLE[Gbl.CurrentCrs.Info.Type],
-			   PutIconToEdit ? Inf_PutIconToEditInfo :
-					   NULL,
-			   NULL);
-
-      fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_1\">");
+      Lay_StartRoundFrameTable (NULL,Txt_INFO_TITLE[Gbl.CurrentCrs.Info.Type],
+			        PutIconToEdit ? Inf_PutIconToEditInfo :
+					        NULL,
+			        NULL,1);
 
       /***** Write the current syllabus *****/
       Syl_ShowSyllabus ();
@@ -618,7 +616,7 @@ static void Syl_ShowRowSyllabus (unsigned NumItem,
                      StrItemCod);
 	    fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/up_on16x16.gif\""
 		               " alt=\"%s\" title=\"%s\""
-		               " class=\"ICON20x20\" />",
+		               " class=\"ICO20x20\" />",
                      Gbl.Prefs.IconsURL,
                      Gbl.Title,
                      Gbl.Title);
@@ -627,7 +625,7 @@ static void Syl_ShowRowSyllabus (unsigned NumItem,
 	 else
 	    fprintf (Gbl.F.Out,"<img src=\"%s/up_off16x16.gif\""
 		               " alt=\"%s\" title=\"%s\""
-		               " class=\"ICON20x20\" />",
+		               " class=\"ICO20x20\" />",
                      Gbl.Prefs.IconsURL,
                      Txt_Movement_not_allowed,
                      Txt_Movement_not_allowed);
@@ -648,7 +646,7 @@ static void Syl_ShowRowSyllabus (unsigned NumItem,
 	    fprintf (Gbl.F.Out,"<input type=\"image\""
 		               " src=\"%s/down_on16x16.gif\""
 		               " alt=\"%s\" title=\"%s\""
-		               " class=\"ICON20x20\" />",
+		               " class=\"ICO20x20\" />",
                      Gbl.Prefs.IconsURL,
                      Gbl.Title,
                      Gbl.Title);
@@ -657,7 +655,7 @@ static void Syl_ShowRowSyllabus (unsigned NumItem,
 	 else
 	    fprintf (Gbl.F.Out,"<img src=\"%s/down_off16x16.gif\""
 		               " alt=\"%s\" title=\"%s\""
-		               " class=\"ICON20x20\" />",
+		               " class=\"ICO20x20\" />",
                      Gbl.Prefs.IconsURL,
                      Txt_Movement_not_allowed,
                      Txt_Movement_not_allowed);
@@ -675,7 +673,7 @@ static void Syl_ShowRowSyllabus (unsigned NumItem,
 	    fprintf (Gbl.F.Out,"<input type=\"image\""
 		               " src=\"%s/left_on16x16.gif\""
 		               " alt=\"%s\" title=\"%s\""
-		               " class=\"ICON20x20\" />",
+		               " class=\"ICO20x20\" />",
                      Gbl.Prefs.IconsURL,
                      Gbl.Title,
                      Gbl.Title);
@@ -684,7 +682,7 @@ static void Syl_ShowRowSyllabus (unsigned NumItem,
 	 else
 	    fprintf (Gbl.F.Out,"<img src=\"%s/left_off16x16.gif\""
 		               " alt=\"%s\" title=\"%s\""
-		               " class=\"ICON20x20\" />",
+		               " class=\"ICO20x20\" />",
                      Gbl.Prefs.IconsURL,
                      Txt_Movement_not_allowed,
                      Txt_Movement_not_allowed);
@@ -703,7 +701,7 @@ static void Syl_ShowRowSyllabus (unsigned NumItem,
 	    fprintf (Gbl.F.Out,"<input type=\"image\""
 		               " src=\"%s/right_on16x16.gif\""
 		               " alt=\"%s\" title=\"%s\""
-		               " class=\"ICON20x20\" />",
+		               " class=\"ICO20x20\" />",
                      Gbl.Prefs.IconsURL,
                      Gbl.Title,
                      Gbl.Title);
@@ -712,7 +710,7 @@ static void Syl_ShowRowSyllabus (unsigned NumItem,
 	 else
 	    fprintf (Gbl.F.Out,"<img src=\"%s/right_off16x16.gif\""
 		               " alt=\"%s\" title=\"%s\""
-		               " class=\"ICON20x20\" />",
+		               " class=\"ICO20x20\" />",
                      Gbl.Prefs.IconsURL,
                      Txt_Movement_not_allowed,
                      Txt_Movement_not_allowed);
diff --git a/swad_tab.c b/swad_tab.c
index 3aaf144fa..589b3156c 100644
--- a/swad_tab.c
+++ b/swad_tab.c
@@ -119,7 +119,7 @@ void Tab_DrawTabs (void)
 	   {
 	    fprintf (Gbl.F.Out,"<div");	// This div must be present even in current tab in order to render properly the tab
 	    if (NumTab != Gbl.Action.Tab)
-	       fprintf (Gbl.F.Out," class=\"ICON_HIGHLIGHT\"");
+	       fprintf (Gbl.F.Out," class=\"ICO_HIGHLIGHT\"");
 	    fprintf (Gbl.F.Out,">");
 	    Act_FormStart (ActMnu);
 	    Par_PutHiddenParamUnsigned ("NxtTab",(unsigned) NumTab);
@@ -128,7 +128,7 @@ void Tab_DrawTabs (void)
 			                                   The_ClassTxtTabOff[Gbl.Prefs.Theme],NULL);
 	    fprintf (Gbl.F.Out,"<img src=\"%s/%s/%s\""
 			       " alt=\"%s\" title=\"%s\""
-			       " class=\"ICON40x40\" style=\"margin:3px;\" />"
+			       " class=\"ICO40x40\" style=\"margin:3px;\" />"
 			       "<div class=\"TAB_TXT %s\">%s</div>"
 			       "</a>",
 		     Gbl.Prefs.PathIconSet,Cfg_ICON_ACTION,
@@ -141,10 +141,10 @@ void Tab_DrawTabs (void)
 	    Act_FormEnd ();
 	   }
 	 else
-	    fprintf (Gbl.F.Out,"<div class=\"ICON_HIDDEN\">"
+	    fprintf (Gbl.F.Out,"<div class=\"ICO_HIDDEN\">"
 			       "<img src=\"%s/%s/%s\""
 			       " alt=\"%s\" title=\"%s\""
-			       " class=\"ICON40x40\" style=\"margin:3px;\" />"
+			       " class=\"ICO40x40\" style=\"margin:3px;\" />"
 			       "<div class=\"TAB_TXT %s\">%s</div>",
 		     Gbl.Prefs.PathIconSet,Cfg_ICON_ACTION,
 		     Tab_TabIcons[NumTab],
diff --git a/swad_test.c b/swad_test.c
index 30d846f60..df747f61c 100644
--- a/swad_test.c
+++ b/swad_test.c
@@ -427,7 +427,7 @@ void Tst_ShowNewTestExam (void)
             Par_PutHiddenParamUnsigned ("NumQst",Gbl.Test.NumQsts);
 
             /***** List the questions *****/
-	    fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_10\">");
+	    fprintf (Gbl.F.Out,"<table class=\"FRAME_TBL CELLS_PAD_10\">");
             Tst_ShowTestQuestionsWhenSeeing (mysql_res);
 	    fprintf (Gbl.F.Out,"</table>");
 
@@ -525,7 +525,7 @@ void Tst_AssessTestExam (void)
 	   }
 
 	 /***** Write answers and solutions *****/
-	 fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_10\">");
+	 fprintf (Gbl.F.Out,"<table class=\"FRAME_TBL CELLS_PAD_10\">");
 	 Tst_ShowTstResultAfterAssess (TstCod,&NumQstsNotBlank,&TotalScore);
 	 fprintf (Gbl.F.Out,"</table>");
 
@@ -1662,7 +1662,7 @@ static void Tst_ShowFormSelTags (unsigned long NumRows,MYSQL_RES *mysql_res,
             fprintf (Gbl.F.Out,"eye-off64x64.png\" alt=\"%s\" title=\"%s",
                      Txt_Tag_allowed,
                      Txt_Tag_allowed);
-         fprintf (Gbl.F.Out,"\" class=\"ICON20x20\" />"
+         fprintf (Gbl.F.Out,"\" class=\"ICO20x20\" />"
                             "</td>");
         }
       fprintf (Gbl.F.Out,"<td class=\"DAT LEFT_MIDDLE\">"
@@ -1708,8 +1708,7 @@ static void Tst_ShowFormEditTags (void)
    if ((NumRows = Tst_GetAllTagsFromCurrentCrs (&mysql_res)))
      {
       /***** Start table *****/
-      Lay_StartRoundFrame (NULL,Txt_Tags,NULL,Hlp_ASSESSMENT_Tests);
-      fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">");
+      Lay_StartRoundFrameTable (NULL,Txt_Tags,NULL,Hlp_ASSESSMENT_Tests,2);
 
       /***** Show tags *****/
       for (NumRow = 0;
@@ -1765,7 +1764,7 @@ static void Tst_PutIconEnable (long TagCod,const char *TagTxt)
    sprintf (Gbl.Title,Txt_Tag_X_not_allowed_Click_to_allow_it,TagTxt);
    fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/eye-slash-on64x64.png\""
 	              " alt=\"%s\" title=\"%s\""
-	              " class=\"ICON20x20\" />",
+	              " class=\"ICO20x20\" />",
             Gbl.Prefs.IconsURL,
             Gbl.Title,
             Gbl.Title);
@@ -1787,7 +1786,7 @@ static void Tst_PutIconDisable (long TagCod,const char *TagTxt)
    sprintf (Gbl.Title,Txt_Tag_X_allowed_Click_to_disable_it,TagTxt);
    fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/eye-on64x64.png\""
 	              " alt=\"%s\" title=\"%s\""
-	              " class=\"ICON20x20\" />",
+	              " class=\"ICO20x20\" />",
             Gbl.Prefs.IconsURL,
             Gbl.Title,
             Gbl.Title);
@@ -2678,7 +2677,7 @@ static void Tst_ListOneOrMoreQuestionsToEdit (unsigned long NumRows,MYSQL_RES *m
                         Tst_PutIconsTests,Hlp_ASSESSMENT_Tests);
 
    /***** Write the heading *****/
-   fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE_MARGIN CELLS_PAD_2\">"
+   fprintf (Gbl.F.Out,"<table class=\"FRAME_TBL_MARGIN CELLS_PAD_2\">"
 	              "<tr>"
                       "<th colspan=\"2\"></th>"
                       "<th class=\"CENTER_TOP\">"
@@ -2785,7 +2784,7 @@ static void Tst_ListOneOrMoreQuestionsToEdit (unsigned long NumRows,MYSQL_RES *m
       Par_PutHiddenParamLong ("QstCod",Gbl.Test.QstCod);
       fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/edit64x64.png\""
 	                 " alt=\"%s\" title=\"%s\""
-	                 " class=\"ICON20x20\" />",
+	                 " class=\"ICO20x20\" />",
                Gbl.Prefs.IconsURL,
                Txt_Edit_question,
                Txt_Edit_question);
@@ -3071,7 +3070,7 @@ static void Tst_WriteAnswersOfAQstEdit (long QstCod)
             if (row[6][0] == 'Y')
                fprintf (Gbl.F.Out,"<img src=\"%s/ok_on16x16.gif\""
         	                  " alt=\"%s\" title=\"%s\""
-        	                  " class=\"ICON20x20\" />",
+        	                  " class=\"ICO20x20\" />",
                         Gbl.Prefs.IconsURL,
                         Txt_TEST_Correct_answer,
                         Txt_TEST_Correct_answer);
@@ -3534,7 +3533,7 @@ static void Tst_WriteChoiceAnsAssessExam (unsigned NumQst,MYSQL_RES *mysql_res,
       if (AnswersUsr[Indexes[NumOpt]] == true)	// This answer has been selected by the user
          fprintf (Gbl.F.Out,"<img src=\"%s/%s16x16.gif\""
                             " alt=\"%s\" title=\"%s\""
-                            " class=\"ICON20x20\" />",
+                            " class=\"ICO20x20\" />",
                   Gbl.Prefs.IconsURL,
                   (Gbl.Test.Config.FeedbackType == Tst_FEEDBACK_EACH_GOOD_BAD ||
                    Gbl.Test.Config.FeedbackType == Tst_FEEDBACK_FULL_FEEDBACK) ?
@@ -3553,7 +3552,7 @@ static void Tst_WriteChoiceAnsAssessExam (unsigned NumQst,MYSQL_RES *mysql_res,
          if (Gbl.Test.Answer.Options[Indexes[NumOpt]].Correct)
             fprintf (Gbl.F.Out,"<img src=\"%s/ok_on16x16.gif\""
         	               " alt=\"%s\" title=\"%s\""
-        	               " class=\"ICON20x20\" />",
+        	               " class=\"ICO20x20\" />",
                      Gbl.Prefs.IconsURL,
                      Txt_TEST_Correct_answer,
                      Txt_TEST_Correct_answer);
@@ -4742,7 +4741,7 @@ static void Tst_PutFormEditOneQst (char *Stem,char *Feedback)
 	 fprintf (Gbl.F.Out," style=\"display:none;\"");	// Hide icon
       fprintf (Gbl.F.Out," onclick=\"toggleAnswer('%u'); return false;\" />"
                          "<img src=\"%s/expand64x64.png\""
-			 " alt=\"%s\" title=\"%s\" class=\"ICON20x20\" />"
+			 " alt=\"%s\" title=\"%s\" class=\"ICO20x20\" />"
 	                 "</a>",
                NumOpt,Gbl.Prefs.IconsURL,
 	       Gbl.Title,Gbl.Title);
@@ -4754,7 +4753,7 @@ static void Tst_PutFormEditOneQst (char *Stem,char *Feedback)
 	 fprintf (Gbl.F.Out," style=\"display:none;\"");	// Hide icon
       fprintf (Gbl.F.Out," onclick=\"toggleAnswer(%u); return false;\" />"
                          "<img src=\"%s/contract64x64.png\""
-			 " alt=\"%s\" title=\"%s\" class=\"ICON20x20\" />"
+			 " alt=\"%s\" title=\"%s\" class=\"ICO20x20\" />"
 	                 "</a>",
                NumOpt,Gbl.Prefs.IconsURL,
 	       Gbl.Title,Gbl.Title);
@@ -6940,8 +6939,7 @@ void Tst_SelDatesToSeeMyExams (void)
    Act_FormStart (ActSeeMyTstExa);
 
    /***** Starting and ending dates in the search *****/
-   Lay_StartRoundFrame (NULL,Txt_Exams,NULL,Hlp_ASSESSMENT_Tests);
-   fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">");
+   Lay_StartRoundFrameTable (NULL,Txt_Exams,NULL,Hlp_ASSESSMENT_Tests,2);
    Dat_PutFormStartEndClientLocalDateTimesWithYesterdayToday ();
 
    /***** Send button and end frame *****/
@@ -7008,11 +7006,10 @@ void Tst_ShowUsrsExams (void)
    Dat_GetIniEndDatesFromForm ();
 
    /***** Check the number of users whose tests results will be shown *****/
-   if (Usr_CountNumUsrsInListOfSelectedUsrs ())				// If some users are selected...
+   if (Usr_CountNumUsrsInListOfSelectedUsrs ())	// If some users are selected...
      {
       /***** Header of the table with the list of users *****/
-      Lay_StartRoundFrame (NULL,Txt_Exams,NULL,Hlp_ASSESSMENT_Tests);
-      fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">");
+      Lay_StartRoundFrameTable (NULL,Txt_Exams,NULL,Hlp_ASSESSMENT_Tests,2);
       Tst_ShowHeaderTestResults ();
 
       /***** List the assignments and works of the selected users *****/
@@ -7105,8 +7102,7 @@ void Tst_ShowMyExams (void)
    Dat_GetIniEndDatesFromForm ();
 
    /***** Header of the table with the list of users *****/
-   Lay_StartRoundFrame (NULL,Txt_Exams,NULL,Hlp_ASSESSMENT_Tests);
-   fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">");
+   Lay_StartRoundFrameTable (NULL,Txt_Exams,NULL,Hlp_ASSESSMENT_Tests,2);
    Tst_ShowHeaderTestResults ();
 
    /***** List my results in test exams *****/
@@ -7279,7 +7275,7 @@ static void Tst_ShowResultsOfTestExams (struct UsrData *UsrDat)
 	    Tst_PutParamTstCod (TstCod);
 	    fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/file64x64.gif\""
 			       " alt=\"%s\" title=\"%s\""
-			       " class=\"ICON20x20B\" />",
+			       " class=\"ICO20x20B\" />",
 		     Gbl.Prefs.IconsURL,
 		     Txt_See_exam,
 		     Txt_See_exam);
@@ -7503,7 +7499,7 @@ void Tst_ShowOneExam (void)
                               Gbl.CurrentCrs.Crs.CrsCod);
 
    /***** Start table *****/
-   fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_10\">");
+   fprintf (Gbl.F.Out,"<table class=\"FRAME_TBL CELLS_PAD_10\">");
 
    /***** Header row *****/
    /* Get data of the user who made the exam */
diff --git a/swad_test_import.c b/swad_test_import.c
index 587349131..69e2267e4 100644
--- a/swad_test_import.c
+++ b/swad_test_import.c
@@ -965,7 +965,7 @@ static void TsI_WriteHeadingListImportedQst (void)
    extern const char *Txt_Question;
 
    /***** Write the heading *****/
-   fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">"
+   fprintf (Gbl.F.Out,"<table class=\"FRAME_TBL CELLS_PAD_2\">"
 	              "<tr>"
                       "<th></th>"
                       "<th class=\"CENTER_TOP\">"
@@ -1029,7 +1029,7 @@ static void TsI_WriteRowImportedQst (struct XMLElement *StemElem,
 	              "<td class=\"BT%u CENTER_TOP\">"
                       "<img src=\"%s/%s16x16.gif\""
                       " alt=\"%s\" title=\"%s\""
-                      " class=\"ICON20x20\" />"
+                      " class=\"ICO20x20\" />"
                       "</td>",
             Gbl.RowEvenOdd,
             Gbl.Prefs.IconsURL,
@@ -1091,7 +1091,7 @@ static void TsI_WriteRowImportedQst (struct XMLElement *StemElem,
       if (Gbl.Test.Shuffle)
          fprintf (Gbl.F.Out,"<img src=\"%s/%s16x16.gif\""
                             " alt=\"%s\" title=\"%s\""
-                            " class=\"ICON20x20\" />",
+                            " class=\"ICO20x20\" />",
                   Gbl.Prefs.IconsURL,
                   QuestionExists ? "ok_off" :
                 	           "ok_on",
@@ -1159,7 +1159,7 @@ static void TsI_WriteRowImportedQst (struct XMLElement *StemElem,
             if (Gbl.Test.Answer.Options[NumOpt].Correct)
                fprintf (Gbl.F.Out,"<img src=\"%s/%s16x16.gif\""
         	                  " alt=\"%s\" title=\"%s\""
-        	                  " class=\"ICON20x20\" />",
+        	                  " class=\"ICO20x20\" />",
                         Gbl.Prefs.IconsURL,
                         QuestionExists ? "ok_off" :
                                          "ok_on",
diff --git a/swad_timetable.c b/swad_timetable.c
index 81ceca812..d20574fc9 100644
--- a/swad_timetable.c
+++ b/swad_timetable.c
@@ -278,7 +278,7 @@ void TT_ShowClassTimeTable (void)
       /***** Show form to change first day of week *****/
       Cal_ShowFormToSelFirstDayOfWeek (Gbl.TimeTable.Type == TT_COURSE_TIMETABLE ? ActChgCrsTT1stDay :
 	                                                                           ActChgMyTT1stDay,
-	                               "ICON25x25");
+	                               "ICO25x25");
      }
 
    /***** Show the time table *****/
diff --git a/swad_user.c b/swad_user.c
index 2a08e7dd7..b74ba56c6 100644
--- a/swad_user.c
+++ b/swad_user.c
@@ -1755,15 +1755,14 @@ void Usr_WriteFormLogin (void)
    /***** Start form *****/
    fprintf (Gbl.F.Out,"<div class=\"CENTER_MIDDLE\">");
    Act_FormStart (ActAutUsrInt);
-   Lay_StartRoundFrame (NULL,Txt_Log_in,NULL,Hlp_PROFILE_Log_in);
+   Lay_StartRoundFrameTable (NULL,Txt_Log_in,NULL,Hlp_PROFILE_Log_in,2);
 
    /***** User's ID/nickname and password *****/
-   fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">"
-	              "<tr>"
+   fprintf (Gbl.F.Out,"<tr>"
                       "<td class=\"BM\">"
                       "<img src=\"%s/user64x64.gif\""
                       " alt=\"%s\" title=\"%s\""
-	              " class=\"ICON20x20\" />"
+	              " class=\"ICO20x20\" />"
                       "</td>"
                       "<td class=\"LEFT_MIDDLE\">"
                       "<input type=\"text\" id=\"UsrId\" name=\"UsrId\""
@@ -1775,7 +1774,7 @@ void Usr_WriteFormLogin (void)
 		      "<td class=\"BM\">"
                       "<img src=\"%s/key64x64.gif\""
                       " alt=\"%s\" title=\"%s\""
-	              " class=\"ICON20x20\" />"
+	              " class=\"ICO20x20\" />"
 		      "</td>"
 		      "<td class=\"LEFT_MIDDLE\">"
 		      "<input type=\"password\" name=\"UsrPwd\""
@@ -1795,15 +1794,7 @@ void Usr_WriteFormLogin (void)
             Txt_password);
 
    /***** Send button and form end *****/
-   fprintf (Gbl.F.Out,"<tr>"
-	              "<td colspan=\"2\" class=\"CENTER_MIDDLE\">"
-                      "<button type=\"submit\" class=\"BT_SUBMIT BT_CONFIRM\">"
-                      "%s"
-                      "</button>"
-                      "</td>"
-	              "</tr>",
-	              Txt_Log_in);
-   Lay_EndRoundFrameTable ();
+   Lay_EndRoundFrameTableWithButton (Lay_CONFIRM_BUTTON,Txt_Log_in);
    Act_FormEnd ();
 
    fprintf (Gbl.F.Out,"</div>");
@@ -1841,7 +1832,7 @@ void Usr_WelcomeUsr (void)
                   Usr_InsertMyBirthday ();
                   fprintf (Gbl.F.Out,"<img src=\"%s/%s/cake128x128.gif\""
                 	             " alt=\"%s\" title=\"%s\""
-                                     " class=\"ICON160x160\" />",
+                                     " class=\"ICO160x160\" />",
                            Gbl.Prefs.PathIconSet,Cfg_ICON_128x128,
                            Txt_Happy_birthday,
                            Txt_Happy_birthday);
@@ -1938,7 +1929,7 @@ void Usr_PutFormLogIn (void)
    Act_LinkFormSubmit (Txt_Log_in,The_ClassHead[Gbl.Prefs.Theme],NULL);
    fprintf (Gbl.F.Out,"<img src=\"%s/login-green64x64.png\""
                       " alt=\"%s\" title=\"%s\""
-                      " class=\"ICON20x20\" />"
+                      " class=\"ICO20x20\" />"
                       "<span id=\"login_txt\">&nbsp;%s</span>"
                       "</a>",
             Gbl.Prefs.IconsURL,
@@ -2014,7 +2005,7 @@ void Usr_PutFormLogOut (void)
    Act_LinkFormSubmit (Txt_Log_out,The_ClassHead[Gbl.Prefs.Theme],NULL);
    fprintf (Gbl.F.Out,"<img src=\"%s/logout-red64x64.png\""
 	              " alt=\"%s\" title=\"%s\""
-                      " class=\"ICON20x20\" />"
+                      " class=\"ICO20x20\" />"
                       "<span id=\"login_txt\">&nbsp;%s</span>"
                       "</a>",
             Gbl.Prefs.IconsURL,
@@ -2864,7 +2855,7 @@ void Usr_WriteRowUsrMainData (unsigned NumUsr,struct UsrData *UsrDat,
    fprintf (Gbl.F.Out,"\">"
 	              "<img src=\"%s/%s16x16.gif\""
 	              " alt=\"%s\" title=\"%s\""
-	              " class=\"ICON20x20\" />"
+	              " class=\"ICO20x20\" />"
 	              "</td>",
             Gbl.Prefs.IconsURL,
             UsrDat->Accepted ? "ok_on" :
@@ -5218,7 +5209,7 @@ static void Usr_FormToSelectUsrListType (Act_Action_t NextAction,Usr_ShowUsrsTyp
                                                     NULL);
    fprintf (Gbl.F.Out,"<img src=\"%s/%s\""
                       " alt=\"%s\" title=\"%s\""
-                      " class=\"ICON20x20\" />"
+                      " class=\"ICO20x20\" />"
                       " %s</a>",
             Gbl.Prefs.IconsURL,
             Usr_IconsClassPhotoOrList[ListType],
diff --git a/swad_zip.c b/swad_zip.c
index 692e44f6b..bd0b33e0e 100644
--- a/swad_zip.c
+++ b/swad_zip.c
@@ -344,7 +344,7 @@ void ZIP_PutButtonToDownloadZIPOfAFolder (const char *PathInTree,const char *Fil
    Act_LinkFormSubmit (Txt_Create_ZIP_file,The_ClassForm[Gbl.Prefs.Theme],NULL);
    fprintf (Gbl.F.Out,"<img src=\"%s/download64x64.png\""
 	              " alt=\"%s\" title=\"%s\""
-	              " class=\"ICON20x20B\" />"
+	              " class=\"ICO20x20B\" />"
 		      "</a>",
 	 Gbl.Prefs.IconsURL,
 	 Txt_Create_ZIP_file,
@@ -592,11 +592,11 @@ static void ZIP_ShowLinkToDownloadZIP (const char *FileName,const char *URL,
                       "<a href=\"%s\" class=\"FILENAME\" title=\"%s\" target=\"_blank\">"
                       "<img src=\"%s/%s32x32/zip32x32.gif\""
                       " alt=\"%s\" title=\"%s\""
-                      " class=\"ICON40x40\" />"
+                      " class=\"ICO40x40\" />"
                       "&nbsp;%s&nbsp;"
 		      "<img src=\"%s/download64x64.png\""
 		      " alt=\"%s\" title=\"%s\""
-		      " class=\"ICON40x40\" />"
+		      " class=\"ICO40x40\" />"
 		      "</a>"
 		      "</td>"
 		      "</tr>",