diff --git a/build.bat b/build.bat
index 6809c165..130dbd30 100644
--- a/build.bat
+++ b/build.bat
@@ -47,8 +47,8 @@ set cl_debug=      call cl /Od %cl_common% %auto_compile_flags%
 set cl_release=    call cl /O2 /DNDEBUG %cl_common% %auto_compile_flags%
 set clang_debug=   call clang -g -O0 %clang_common% %auto_compile_flags%
 set clang_release= call clang -g -O3 -DNDEBUG %clang_common% %auto_compile_flags%
-set cl_link=       /link /MANIFEST:EMBED /INCREMENTAL:NO /natvis:"%~dp0\src\natvis\base.natvis"
-set clang_link=    -fuse-ld=lld -Xlinker /MANIFEST:EMBED -Xlinker /natvis:"%~dp0\src\natvis\base.natvis"
+set cl_link=       /link /MANIFEST:EMBED /INCREMENTAL:NO /natvis:"%~dp0\src\natvis\base.natvis" logo.res
+set clang_link=    -fuse-ld=lld -Xlinker /MANIFEST:EMBED -Xlinker /natvis:"%~dp0\src\natvis\base.natvis" logo.res
 set cl_out=        /out:
 set clang_out=     -o
 
@@ -77,6 +77,11 @@ if "%release%"=="1"   set compile=%compile_release%
 if not exist build mkdir build
 if not exist local mkdir local
 
+:: --- Produce Logo Icon File -------------------------------------------------
+pushd build
+rc /nologo /fo logo.res ..\data\logo.rc
+popd
+
 :: --- Build & Run Metaprogram ------------------------------------------------
 if "%no_meta%"=="1" echo [skipping metagen]
 if not "%no_meta%"=="1" (
diff --git a/data/logo.ico b/data/logo.ico
new file mode 100644
index 00000000..7591f203
Binary files /dev/null and b/data/logo.ico differ
diff --git a/data/logo.rc b/data/logo.rc
new file mode 100644
index 00000000..eac03c68
--- /dev/null
+++ b/data/logo.rc
@@ -0,0 +1 @@
+1 ICON DISCARDABLE "logo.ico"
\ No newline at end of file
diff --git a/src/df/gfx/df_gfx.c b/src/df/gfx/df_gfx.c
index d04e7f0e..cb7707e4 100644
--- a/src/df/gfx/df_gfx.c
+++ b/src/df/gfx/df_gfx.c
@@ -3884,8 +3884,8 @@ df_window_update_and_render(Arena *arena, OS_EventList *events, DF_Window *ws, D
           DF_View *view = df_view_from_handle(panel->selected_tab_view);
           if(!df_view_is_nil(view) &&
              contains_2f32(panel_rect, ui_mouse()) &&
-             abs_f32(view->scroll_pos.x.off) > 0.01f ||
-             abs_f32(view->scroll_pos.y.off) > 0.01f)
+             (abs_f32(view->scroll_pos.x.off) > 0.01f ||
+              abs_f32(view->scroll_pos.y.off) > 0.01f))
           {
             build_hover_eval = 0;
             ws->hover_eval_first_frame_idx = df_frame_index();
diff --git a/src/os/gfx/win32/os_gfx_win32.c b/src/os/gfx/win32/os_gfx_win32.c
index 9ead413f..1e9ccae6 100644
--- a/src/os/gfx/win32/os_gfx_win32.c
+++ b/src/os/gfx/win32/os_gfx_win32.c
@@ -571,6 +571,7 @@ os_graphical_init(void)
     wndclass.hInstance = w32_h_instance;
     wndclass.lpszClassName = L"graphical-window";
     wndclass.hCursor = LoadCursorA(0, IDC_ARROW);
+    wndclass.hIcon = LoadIcon(w32_h_instance, MAKEINTRESOURCE(1));
     ATOM wndatom = RegisterClassExW(&wndclass);
     (void)wndatom;
   }