diff --git a/cmake/Modules/BuildFLTK.cmake b/cmake/Modules/BuildFLTK.cmake
index 59a4ff480..885803ad9 100644
--- a/cmake/Modules/BuildFLTK.cmake
+++ b/cmake/Modules/BuildFLTK.cmake
@@ -5,8 +5,8 @@
 include( ExternalProject )
 
 #set( FLTK_GIT_TAG master )
-set(FLTK_GIT_TAG 265e5cd77b30581e7701927930d8fa887e0361df) # stable, has paths
-#set(FLTK_GIT_TAG a9d3d3e3fbefc80278392a88c0a81a5bbb97eb51) # breaks win64 builds
+#set(FLTK_GIT_TAG 265e5cd77b30581e7701927930d8fa887e0361df) # stable, has paths
+set(FLTK_GIT_TAG d2bd3c62408945227bb13133ad6ce270851b4872) # windows fix
 
 set( FLTK_BUILD_SHARED_LIBS ON )  # We no longer compile static.
 
diff --git a/mrv2/lib/mrvWidgets/mrViewer.fl b/mrv2/lib/mrvWidgets/mrViewer.fl
index 59ca60e78..79ccaeada 100644
--- a/mrv2/lib/mrvWidgets/mrViewer.fl
+++ b/mrv2/lib/mrvWidgets/mrViewer.fl
@@ -1070,8 +1070,8 @@ Value is:  pow( 2, 1/x );} xywh {651 26 39 25} type {Horz Knob} labelsize 10 max
               Fl_Button uiScrub {
                 user_data this user_data_type {ViewerUI*}
                 callback {uiView->setActionMode( mrv::ActionMode::kScrub );}
-                tooltip {Scrubbing Tool} xywh {2 53 40 35} down_box DOWN_BOX value 1 selection_color 95
-                code0 {o->image(mrv::load_svg("Scrub.svg"));}
+                tooltip {Scrubbing Tool} image {../../icons/Scrub.svg} compress_image 1 xywh {2 53 40 35} down_box DOWN_BOX value 1 selection_color 95
+                code0 {//o->image(mrv::load_svg("Scrub.svg"));}
                 class {mrv::Button}
               }
               Fl_Button uiSelection {
@@ -1083,8 +1083,8 @@ if (Fl::event_clicks() >= 1)
    mrv::panel::color_area_panel_cb( nullptr, v);
    Fl::event_clicks(0);
 }}
-                tooltip {Area Select Tool} xywh {2 88 40 35} down_box DOWN_BOX selection_color 95
-                code0 {o->image(mrv::load_svg("Selection.svg"));}
+                tooltip {Area Select Tool} image {../../icons/Selection.svg} compress_image 1 xywh {2 88 40 35} down_box DOWN_BOX selection_color 95
+                code0 {//o->image(mrv::load_svg("Selection.svg"));}
                 class {mrv::Button}
               }
               Fl_Button uiDraw {
@@ -1096,8 +1096,8 @@ if (Fl::event_clicks() >= 1)
    mrv::panel::annotations_panel_cb( nullptr, v);
    Fl::event_clicks(0);
 }}
-                tooltip {Freehand Drawing Tool} xywh {2 123 40 35} down_box DOWN_BOX selection_color 95
-                code0 {o->image(mrv::load_svg("Draw.svg"));}
+                tooltip {Freehand Drawing Tool} image {../../icons/Draw.svg} compress_image 1 xywh {2 123 40 35} down_box DOWN_BOX selection_color 95
+                code0 {//o->image(mrv::load_svg("Draw.svg"));}
                 class {mrv::Button}
               }
               Fl_Button uiErase {
@@ -1108,9 +1108,9 @@ if (Fl::event_clicks() >= 1)
 {
    mrv::panel::annotations_panel_cb( nullptr, v);
    Fl::event_clicks(0);
-}} selected
-                tooltip {Eraser Tool} xywh {2 158 40 35} down_box DOWN_BOX selection_color 95
-                code0 {o->image(mrv::load_svg("Erase.svg"));}
+}}
+                tooltip {Eraser Tool} image {../../icons/Erase.svg} compress_image 1 xywh {2 158 40 35} down_box DOWN_BOX selection_color 95
+                code0 {//o->image(mrv::load_svg("Erase.svg"));}
                 class {mrv::Button}
               }
               Fl_Button uiCircle {
@@ -1122,8 +1122,8 @@ if (Fl::event_clicks() >= 1)
    mrv::panel::annotations_panel_cb( nullptr, v);
    Fl::event_clicks(0);
 }}
-                tooltip {Circle Tool} xywh {2 193 40 35} down_box DOWN_BOX selection_color 95
-                code0 {o->image(mrv::load_svg("Circle.svg"));}
+                tooltip {Circle Tool} image {../../icons/Circle.svg} compress_image 1 xywh {2 193 40 35} down_box DOWN_BOX selection_color 95
+                code0 {//o->image(mrv::load_svg("Circle.svg"));}
                 class {mrv::Button}
               }
               Fl_Button uiRectangle {
@@ -1135,8 +1135,8 @@ if (Fl::event_clicks() >= 1)
    mrv::panel::annotations_panel_cb( nullptr, v);
    Fl::event_clicks(0);
 }}
-                tooltip {Rectangle Tool} xywh {2 228 40 35} down_box DOWN_BOX selection_color 95
-                code0 {o->image(mrv::load_svg("Rectangle.svg"));}
+                tooltip {Rectangle Tool} image {../../icons/Rectangle.svg} compress_image 1 xywh {2 228 40 35} down_box DOWN_BOX selection_color 95
+                code0 {//o->image(mrv::load_svg("Rectangle.svg"));}
                 class {mrv::Button}
               }
               Fl_Button uiArrow {
@@ -1148,8 +1148,8 @@ if (Fl::event_clicks() >= 1)
    mrv::panel::annotations_panel_cb( nullptr, v);
    Fl::event_clicks(0);
 }}
-                tooltip {Arrow Tool} xywh {2 263 40 35} down_box DOWN_BOX selection_color 95
-                code0 {o->image(mrv::load_svg("Arrow.svg"));}
+                tooltip {Arrow Tool} image {../../icons/Arrow.svg} compress_image 1 xywh {2 263 40 35} down_box DOWN_BOX selection_color 95
+                code0 {//o->image(mrv::load_svg("Arrow.svg"));}
                 class {mrv::Button}
               }
               Fl_Button uiText {
@@ -1168,8 +1168,8 @@ if (Fl::event_clicks() >= 1)
    mrv::panel::annotations_panel_cb( nullptr, v);
    Fl::event_clicks(0);
 }}
-                tooltip {Text Tool.   Right click to edit previously stamped text.} xywh {1 298 40 35} down_box DOWN_BOX selection_color 95 labelfont 8 labelsize 24 labelcolor 7
-                code0 {o->image(mrv::load_svg("Text.svg"));}
+                tooltip {Text Tool.   Right click to edit previously stamped text.} image {../../icons/Text.svg} compress_image 1 xywh {1 298 40 35} down_box DOWN_BOX selection_color 95 labelfont 8 labelsize 24 labelcolor 7
+                code0 {//o->image(mrv::load_svg("Text.svg"));}
                 class {mrv::Button}
               }
               Fl_Button uiPenColor {
@@ -1199,15 +1199,15 @@ settings->setValue( mrv::kPenColorA, a);}
                 Fl_Button uiUndoDraw {
                   user_data this user_data_type {ViewerUI*}
                   callback {uiView->undo();}
-                  tooltip {Undo Last Shape Drawn in Current Frame.} xywh {0 396 40 35} deactivate
-                  code0 {o->image(mrv::load_svg("Undo.svg"));}
+                  tooltip {Undo Last Shape Drawn in Current Frame.} image {../../icons/Undo.svg} compress_image 1 xywh {0 396 40 35} deactivate
+                  code0 {//o->image(mrv::load_svg("Undo.svg"));}
                   class {mrv::Button}
                 }
                 Fl_Button uiRedoDraw {
                   user_data this user_data_type {ViewerUI*}
-                  callback {uiView->redo();}
-                  tooltip {Redo Previous Shape Drawn in Current Frame.} xywh {0 431 40 36} deactivate
-                  code0 {o->image(mrv::load_svg("Redo.svg"));}
+                  callback {uiView->redo();} selected
+                  tooltip {Redo Previous Shape Drawn in Current Frame.} image {../../icons/Redo.svg} compress_image 1 xywh {0 431 40 36} deactivate
+                  code0 {//o->image(mrv::load_svg("Redo.svg"));}
                   class {mrv::Button}
                 }
               }