diff --git a/data/flags/Makefile.am b/data/flags/Makefile.am
index 327a7f22c..ce80dd759 100644
--- a/data/flags/Makefile.am
+++ b/data/flags/Makefile.am
@@ -63,6 +63,7 @@ lt_flag.png \
 lv_flag.png \
 ma_flag.png \
 mao_flag.png \
+md_flag.png \
 me_flag.png \
 mk_flag.png \
 ml_flag.png \
diff --git a/data/flags/ara_flag.png b/data/flags/ara_flag.png
index bfc10352f..a0c0890de 100644
Binary files a/data/flags/ara_flag.png and b/data/flags/ara_flag.png differ
diff --git a/data/flags/brai_flag.png b/data/flags/brai_flag.png
index fc215195d..7822bcaee 100644
Binary files a/data/flags/brai_flag.png and b/data/flags/brai_flag.png differ
diff --git a/data/flags/latam_flag.png b/data/flags/latam_flag.png
index 1025ca25c..8ecd78b05 100644
Binary files a/data/flags/latam_flag.png and b/data/flags/latam_flag.png differ
diff --git a/data/flags/md_flag.png b/data/flags/md_flag.png
new file mode 100644
index 000000000..4b0e9bc9e
Binary files /dev/null and b/data/flags/md_flag.png differ
diff --git a/data/flags/np_flag.png b/data/flags/np_flag.png
index 738805ebb..99c8116df 100644
Binary files a/data/flags/np_flag.png and b/data/flags/np_flag.png differ
diff --git a/data/flags/unknown_flag.png b/data/flags/unknown_flag.png
index 0a613b8e4..9f9b097fe 100644
Binary files a/data/flags/unknown_flag.png and b/data/flags/unknown_flag.png differ
diff --git a/src/modules/wizard/page_010.c b/src/modules/wizard/page_010.c
index b7a63c3ab..d47d8f9c3 100644
--- a/src/modules/wizard/page_010.c
+++ b/src/modules/wizard/page_010.c
@@ -159,7 +159,7 @@ wizard_page_show(E_Wizard_Page *pg)
    o = e_widget_list_add(pg->evas, 1, 0);
    e_wizard_title_set(_("Language"));
    of = e_widget_framelist_add(pg->evas, _("Select one"), 0);
-   ob = e_widget_ilist_add(pg->evas, 32 * e_scale, 32 * e_scale, &lang);
+   ob = e_widget_ilist_add(pg->evas,10 * e_scale, 10 * e_scale, &lang);
    e_widget_size_min_set(ob, 140 * e_scale, 140 * e_scale);
 
    e_widget_ilist_freeze(ob);
@@ -180,7 +180,9 @@ wizard_page_show(E_Wizard_Page *pg)
           }
         else
           ic = NULL;
-        
+        if (ic)
+          evas_object_size_hint_aspect_set
+          (ic, EVAS_ASPECT_CONTROL_VERTICAL, 20, 10);
         if (e_intl_language_get())
           {
              if (!strcmp(pair->locale_key, e_intl_language_get()))
diff --git a/src/modules/wizard/page_011.c b/src/modules/wizard/page_011.c
index 6dbfdbc7a..2681dfc61 100644
--- a/src/modules/wizard/page_011.c
+++ b/src/modules/wizard/page_011.c
@@ -145,7 +145,7 @@ wizard_page_show(E_Wizard_Page *pg)
    o = e_widget_list_add(pg->evas, 1, 0);
    e_wizard_title_set(_("Keyboard"));
    of = e_widget_framelist_add(pg->evas, _("Select one"), 0);
-   ob = e_widget_ilist_add(pg->evas, 32 * e_scale, 32 * e_scale, &layout);
+   ob = e_widget_ilist_add(pg->evas, 10 * e_scale, 10 * e_scale, &layout);
    e_widget_size_min_set(ob, 140 * e_scale, 140 * e_scale);
 
    e_widget_ilist_freeze(ob);
@@ -159,6 +159,9 @@ wizard_page_show(E_Wizard_Page *pg)
         e_xkb_e_icon_flag_setup(ic, lay->name);
         label = lay->label;
         if (!label) label = "Unknown";
+        if (ic)
+          evas_object_size_hint_aspect_set
+          (ic, EVAS_ASPECT_CONTROL_VERTICAL, 20, 10);
         e_widget_ilist_append(ob, ic, _(label), NULL, NULL, lay->name);
         if (lay->name)
           {