diff --git a/swad_changelog.h b/swad_changelog.h
index cb673446..debbb758 100644
--- a/swad_changelog.h
+++ b/swad_changelog.h
@@ -129,13 +129,14 @@
 /****************************** Public constants *****************************/
 /*****************************************************************************/
 
-#define Log_PLATFORM_VERSION	"SWAD 15.146.1 (2016-03-16)"
+#define Log_PLATFORM_VERSION	"SWAD 15.146.2 (2016-03-16)"
 #define CSS_FILE		"swad15.146.css"
 #define JS_FILE			"swad15.131.3.js"
 
 // Number of lines (includes comments but not blank lines) has been got with the following command:
 // nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*.h sql/swad*.sql | tail -1
 /*
+        Version 15.146.2: Mar 16, 2016	Icons to edit countries integrated in frame. (195781 lines)
         Version 15.146.1: Mar 16, 2016	Icons to remove/edit/print an exam announcement integrated in frame. (195771 lines)
         Version 15.146:   Mar 16, 2016	Now frame rectangles can have icons at top.
 					Icon to edit banners integrated in frame. (195772 lines)
diff --git a/swad_country.c b/swad_country.c
index 7b6e7604..fa29de39 100644
--- a/swad_country.c
+++ b/swad_country.c
@@ -66,6 +66,8 @@ extern struct Act_Actions Act_Actions[Act_NUM_ACTIONS];
 
 static void Cty_Configuration (bool PrintView);
 
+static void Cty_PutIconToEdit (void);
+
 static unsigned Cty_GetNumUsrsWhoClaimToBelongToCty (long CtyCod);
 static void Cty_GetParamCtyOrderType (void);
 static void Cty_GetMapAttribution (long CtyCod,char **MapAttribution);
@@ -498,13 +500,10 @@ void Cty_ListCountries2 (void)
    unsigned NumCty;
    const char *BgColor;
 
-   /***** Put link (form) to edit countries *****/
-   if (Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM)
-      Lay_PutFormToEdit (ActEdiCty);
-
    /***** Table head *****/
-   Lay_StartRoundFrameTable (NULL,2,Txt_Countries);
-   fprintf (Gbl.F.Out,"<tr>");
+   Lay_StartRoundFrame (NULL,Txt_Countries,Cty_PutIconToEdit);
+   fprintf (Gbl.F.Out,"<table class=\"CELLS_PAD_2\" style=\"margin:0 auto;\">"
+                      "<tr>");
    for (Order = Cty_ORDER_BY_COUNTRY;
 	Order <= Cty_ORDER_BY_NUM_USRS;
 	Order++)
@@ -662,7 +661,8 @@ void Cty_ListCountries2 (void)
             Crs_GetNumCrssInCty (-1L));
 
    /***** Table end *****/
-   Lay_EndRoundFrameTable ();
+   fprintf (Gbl.F.Out,"</table>");
+   Lay_EndRoundFrame ();
 
    /***** Div for Google Geochart *****/
    if (Gbl.Action.Act == ActSeeCty)
@@ -676,6 +676,18 @@ void Cty_ListCountries2 (void)
    Cty_FreeListCountries ();
   }
 
+/*****************************************************************************/
+/********************* Put link (form) to edit countries *********************/
+/*****************************************************************************/
+
+static void Cty_PutIconToEdit (void)
+  {
+   extern const char *Txt_Edit;
+
+   if (Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM)
+      Lay_PutContextualLink (ActEdiCty,NULL,"edit64x64.png",Txt_Edit,NULL);
+  }
+
 /*****************************************************************************/
 /******** Get number of users who claim to belong to other countries *********/
 /*****************************************************************************/