diff --git a/include/controls.cpp b/include/controls.cpp
index 115b3e78b..3e9f505f4 100755
--- a/include/controls.cpp
+++ b/include/controls.cpp
@@ -105,49 +105,6 @@ XVT_FNTID xvt_default_font(bool bold)
     if (font_ser_desc.empty())
       font_ser_desc << "01\\Courier\\0\\10\\WIN01/-13/0/0/0/400/0/0/0/0/1/2/1/49/Courier";
     xvt_font_deserialize(DEF_FONT, (char *)(const char *) font_ser_desc);  
-/*
-#if XVT_OS == XVT_OS_WIN
-    HFONT NormalFont = (HFONT)GetStockObject(ANSI_FIXED_FONT);
-    LOGFONT LogFont;
-    GetObject(NormalFont, sizeof(LOGFONT), &LogFont);
-
-    TConfig font(CONFIG_USER, "Font");
-    CHARY = (int)font.get_long("Height");
-    if (CHARY > 0)
-    {
-      LogFont.lfHeight = CHARY;
-      LogFont.lfWeight = font.get_int("Weight");
-      LogFont.lfPitchAndFamily = font.get_int("Pitch");
-      strcpy(LogFont.lfFaceName, font.get("Name"));
-    }
-    else
-    {
-      LogFont.lfHeight = CHARY = 10;
-      LogFont.lfWeight = 300;             // Normal weight
-    }
-    NormalFont = CreateFontIndirect(&LogFont);
-    
-    TToken_string desc(128, '/');
-    desc.add("WIN01");                           // 0
-    desc.add(LogFont.lfHeight);                  // 1
-    desc.add(LogFont.lfWidth);                   // 2
-    desc.add(LogFont.lfEscapement);              // 3
-    desc.add(LogFont.lfOrientation);             // 4
-    desc.add(LogFont.lfWeight);                  // 5
-    desc.add(LogFont.lfItalic);                  // 6
-    desc.add(LogFont.lfUnderline);               
-    desc.add(LogFont.lfStrikeOut);              
-    desc.add(LogFont.lfCharSet);
-    desc.add(LogFont.lfOutPrecision);
-    desc.add(LogFont.lfClipPrecision);
-    desc.add(LogFont.lfQuality);
-    desc.add(LogFont.lfPitchAndFamily);
-    desc.add(LogFont.lfFaceName);
-
-    xvt_font_set_native_desc(DEF_FONT, (char*)(const char*)desc);
-    CHECK(xvt_font_has_valid_native_desc(DEF_FONT), "Bad font description");  
-#endif
-*/
     xvt_font_map_using_default(DEF_FONT);
     CHECK(xvt_font_is_mapped(DEF_FONT), "Can't map native font");        
     
@@ -157,11 +114,6 @@ XVT_FNTID xvt_default_font(bool bold)
     FAT_FONT = xvt_font_create();
     xvt_font_copy(FAT_FONT, DEF_FONT, XVT_FA_ALL); 
     xvt_font_set_style(FAT_FONT, XVT_FS_BOLD);
-/*
-    desc.add(600, 5);
-    xvt_font_set_native_desc(FAT_FONT, (char*)(const char*)desc);
-    CHECK(xvt_font_has_valid_native_desc(FAT_FONT), "Bad font description");
-*/
     xvt_font_map_using_default(FAT_FONT);
     CHECK(xvt_font_is_mapped(FAT_FONT), "Can't map native font");       
     // Get true text size              
@@ -1058,6 +1010,8 @@ void TButton_control::create(WINDOW win, short cid,
   }
   
   const unsigned long attrib = flags2attr(flags);
+  if (wc == WC_CHECKBOX)
+    rct.right += XI_FU_MULTIPLE / 2;
   XI_OBJ_DEF* def = xi_add_button_def(NULL, cid, &rct, attrib, (char*)t, cid);
   CHECKD(def, "Can't create the interface of TButton_control ", cid);
   def->v.btn->fore_color = color;