diff --git a/xi/xilm3.c b/xi/xilm3.c
index 7fb3790cc..4ef598c8b 100755
--- a/xi/xilm3.c
+++ b/xi/xilm3.c
@@ -490,7 +490,7 @@ draw_column_headings( LM_DATA * lmp, XinRect * actual_rct )
                     temp_rct.right = temp_rct.left + bitmap_width;
                   }
                   else
-                    temp_rct.left = cell_rct.right - 32;
+                    temp_rct.left = cell_rct.right - (short)XinMetricGet(XinMetricIconWidth);
                   if ( temp_rct.left < cell_rct.left - 1 )
                     temp_rct.left = cell_rct.left - 1;
                 }
@@ -510,7 +510,7 @@ draw_column_headings( LM_DATA * lmp, XinRect * actual_rct )
               if ( col_data->bitmap != NULL )
                 cell_rct.left += bitmap_width;
               else
-                cell_rct.left += 32;
+                cell_rct.left += (short)XinMetricGet(XinMetricIconWidth);
               if ( cell_rct.left > cell_rct.right )
                 cell_rct.left = cell_rct.right;
             }
@@ -519,7 +519,7 @@ draw_column_headings( LM_DATA * lmp, XinRect * actual_rct )
               if ( col_data->bitmap != NULL )
                 cell_rct.right -= bitmap_width;
               else
-                cell_rct.right -= 32;
+                cell_rct.right -= (short)XinMetricGet(XinMetricIconWidth);
               if ( cell_rct.right < cell_rct.left )
                 cell_rct.right = cell_rct.left;
             }
@@ -1063,8 +1063,8 @@ redraw_cell_button( LM_DATA * lmp, int row, int col, XinRect * clip_rct,
   // Guy was here: le icone vanno centrate nel bottone
   // cell_btn_icon_x = ( int ) xi_get_pref( XI_PREF_CELL_BTN_ICON_X );
   // cell_btn_icon_y = ( int ) xi_get_pref( XI_PREF_CELL_BTN_ICON_Y );
-  cell_btn_icon_x = (r.right-r.left)/2 - 16;
-  cell_btn_icon_y = (r.bottom-r.top)/2 - 16;
+  cell_btn_icon_x = (r.right-r.left - XinMetricGet(XinMetricIconWidth))/2;
+  cell_btn_icon_y = (r.bottom-r.top - XinMetricGet(XinMetricIconHeight))/2;
   
   r.left = max( r.left, col_rct.left );
   r.right = min( r.right, col_rct.right );