diff --git a/roo-e/src/gui/wmwindow.c b/roo-e/src/gui/wmwindow.c
index 4c81f68..f83fa0d 100644
--- a/roo-e/src/gui/wmwindow.c
+++ b/roo-e/src/gui/wmwindow.c
@@ -266,6 +266,7 @@ WindowT *windowCreate(uint16_t x, uint16_t y, uint16_t w, uint16_t h, char *titl
 		if (flags & WIN_SCROLL_V) sflags |= SCROLLABLE_SCROLL_V;
 	}
 
+	//***TODO*** We shouldn't be doing this for non-resizable windows that don't scroll.  Or maybe it's simpler to just leave it?
 	win->scroll = scrollableCreate(visibleSize.x, visibleSize.y, totalSize.x, totalSize.y, sflags);
 	win->scroll->base.flags |= WIDGET_IS_WINDOW;
 	widgetAdd(W(win), 0, 0, W(win->scroll));
@@ -689,15 +690,14 @@ void wmUpdate(EventT *event) {
 		_iconCount = 0;
 		for (i=0; i<arrlen(_windowList); i++) {
 			widget = (WidgetT *)_windowList[i];
-			widget->reg->paint(widget, 0);
+			widget->reg->paint(widget, WINDOW_PAINT_ICONS);
 		}
 
 		// Paint all windows.
-		_iconCount = 0;
 		for (i=0; i<arrlen(_windowList); i++) {
 			surfaceSet(__guiBackBuffer);
 			widget = (WidgetT *)_windowList[i];
-			widget->reg->paint(widget, 1);
+			widget->reg->paint(widget, WINDOW_PAINT_NORMAL);
 		}
 
 		// Get top window.