--- xfce4-xkb-plugin-0.5.3.3.orig/panel-plugin/xkb-cairo.c	2009-03-06 19:16:03.000000000 +0600
+++ xfce4-xkb-plugin-0.5.3.3/panel-plugin/xkb-cairo.c	2010-05-10 23:02:22.628089613 +0700
@@ -162,6 +162,7 @@
     double xx, yy;
     gint i;
     gint radius;
+    gint size_i;
 
     normalized_group_name = xkb_util_normalize_group_name (group_name);
 
@@ -170,7 +171,9 @@
     layout = pango_cairo_create_layout (cr);
 
     pango_layout_set_text (layout, normalized_group_name, -1);
-    g_sprintf (font_str, XKB_PREFERRED_FONT, font_sizes[panel_size - 16]);
+    size_i=panel_size - 16;
+    if (variant_markers_count == 0 && size_i < (113-2))  size_i += 2;
+    g_sprintf (font_str, XKB_PREFERRED_FONT, font_sizes[size_i]);
     desc = pango_font_description_from_string (font_str);
     pango_layout_set_font_description (layout, desc);
     pango_font_description_free (desc);
--- xfce4-xkb-plugin-0.5.3.3.orig/panel-plugin/xkb-util.c	2009-03-06 19:16:03.000000000 +0600
+++ xfce4-xkb-plugin-0.5.3.3/panel-plugin/xkb-util.c	2010-05-10 23:08:29.008079401 +0700
@@ -64,7 +64,7 @@
 {
     if (strlen (group_name) <= 3)
     {
-        return g_strdup (group_name);
+        return g_ascii_strup (group_name,-1);
     }
 
     gchar *c = group_name;
@@ -85,7 +85,7 @@
 
     cut_length = (index_of_na != -1 && index_of_na <= 3) ? index_of_na : 3;
 
-    result = g_strndup (group_name, cut_length);
+    result = g_ascii_strup (group_name, cut_length);
 
     return result;
 }