diff --git a/utils/themeeditor/skin_scan.c b/utils/themeeditor/skin_scan.c
index 599683db54..19e959b5b8 100644
--- a/utils/themeeditor/skin_scan.c
+++ b/utils/themeeditor/skin_scan.c
@@ -101,9 +101,9 @@ char* scan_string(char** document)
 int scan_int(char** document)
 {
 
-    char* cursor = *document;
+    char* cursor = *document, *end;
     int length = 0;
-    char* buffer = NULL;
+    char buffer[16];
     int retval;
     int i;
 
@@ -118,9 +118,9 @@ int scan_int(char** document)
         length++;
         cursor++;
     }
-
-    buffer = skin_alloc_string(length);
-
+    if (length > 15)
+        length = 15;
+    end = cursor;
     /* Copying to the buffer while avoiding comments */
     cursor = *document;
     buffer[length] = '\0';
@@ -138,9 +138,8 @@ int scan_int(char** document)
 
     }
     retval = atoi(buffer);
-    free(buffer);
 
-    *document = cursor;
+    *document = end;
     return retval;
 }
 
diff --git a/utils/themeeditor/tag_table.c b/utils/themeeditor/tag_table.c
index d128e5c0fa..eaf490833c 100644
--- a/utils/themeeditor/tag_table.c
+++ b/utils/themeeditor/tag_table.c
@@ -167,7 +167,7 @@ struct tag_info legal_tags[] =
     { SKIN_TOKEN_DISABLE_THEME,         "wd", "" },
     { SKIN_TOKEN_DRAW_INBUILTBAR,       "wi", "" },
     
-    { SKIN_TOKEN_IMAGE_PRELOAD,         "xl", "SFIIi" },
+    { SKIN_TOKEN_IMAGE_PRELOAD,         "xl", "SFII|I" },
     { SKIN_TOKEN_IMAGE_PRELOAD_DISPLAY, "xd", "S" },
     { SKIN_TOKEN_IMAGE_PRELOAD,         "x", "SFII" },