diff --git a/tabs/osd.js b/tabs/osd.js
index e64066b34..dc52b7d88 100644
--- a/tabs/osd.js
+++ b/tabs/osd.js
@@ -3793,7 +3793,8 @@ function openIconPicker($targetInput) {
     var $grid = $('<div>').addClass('ce-icon-picker-grid');
     var currentVal = parseInt($targetInput.val()) || 0;
 
-    for (var c = 1; c <= 255; c++) {
+    let maxFontChar = (FONT.data && FONT.data.character_image_urls.length > 0) ? FONT.data.character_image_urls.length - 1 : 511;
+    for (let c = 1; c <= maxFontChar; c++) {
         var url = (FONT.data && FONT.data.character_image_urls[c]) ? FONT.draw(c) : '';
         var $tile = $('<div>').addClass('ce-icon-picker-tile')
             .attr('data-char', c)
@@ -3919,7 +3920,7 @@ function buildSlotRow(i, ii) {
     $formatSelect.on('change', updateHiddenType);
 
     // Icon picker: hidden input + clickable preview button
-    var $icoInput = $('<input>').addClass('value').addClass('ico').attr('type', 'hidden').attr('min', 1).attr('max', 255);
+    let $icoInput = $('<input>').addClass('value').addClass('ico').attr('type', 'hidden').attr('min', 1).attr('max', 65535);
     var $icoBtn = $('<div>').addClass('value ico ce-ico-picker-btn').hide()
         .append($('<img>').addClass('ce-ico-preview'))
         .append($('<span>').addClass('ce-ico-label'));
@@ -4372,7 +4373,7 @@ function customElementNormaliseRow(row){
                 valueCell.find('.text').val(valueCell.find('.text').val().replace(/[^A-Z0-9!.\* ]/g, ""));
                 break;
             case 2:
-                valueCell.find('.ico').val(valueCell.find('.ico').val() > 255 ? 255 : valueCell.find('.ico').val());
+                valueCell.find('.ico').val(Math.min(valueCell.find('.ico').val(), 65535));
                 valueCell.find('.ico').val((valueCell.find('.ico').val() != '' && valueCell.find('.ico').val() < 1 )? 1 : valueCell.find('.ico').val());
         }
     }