Index: uspace/lib/ui/include/types/ui/wdecor.h
===================================================================
--- uspace/lib/ui/include/types/ui/wdecor.h	(revision 153dd3b99323e2e6be2a28e55bc73734e9573f6e)
+++ uspace/lib/ui/include/types/ui/wdecor.h	(revision ed1a948bd3e432a2b365592aefbf84cf73a3fa9f)
@@ -52,6 +52,6 @@
 	/** Window has a title bar */
 	ui_wds_titlebar = 0x2,
-	/** Window has a system menu */
-	ui_wds_sysmenu = 0x4,
+	/** Window has a system menu handle */
+	ui_wds_sysmenu_hdl = 0x4,
 	/** Window has a minimize button */
 	ui_wds_minimize_btn = 0x8,
@@ -63,5 +63,5 @@
 	ui_wds_resizable = 0x40,
 	/** Window is decorated (default decoration) */
-	ui_wds_decorated = ui_wds_frame | ui_wds_titlebar | ui_wds_sysmenu |
+	ui_wds_decorated = ui_wds_frame | ui_wds_titlebar | ui_wds_sysmenu_hdl |
 	    ui_wds_minimize_btn | ui_wds_close_btn
 } ui_wdecor_style_t;
Index: uspace/lib/ui/include/ui/wdecor.h
===================================================================
--- uspace/lib/ui/include/ui/wdecor.h	(revision 153dd3b99323e2e6be2a28e55bc73734e9573f6e)
+++ uspace/lib/ui/include/ui/wdecor.h	(revision ed1a948bd3e432a2b365592aefbf84cf73a3fa9f)
@@ -54,4 +54,5 @@
 extern void ui_wdecor_set_maximized(ui_wdecor_t *, bool);
 extern errno_t ui_wdecor_set_caption(ui_wdecor_t *, const char *);
+extern void ui_wdecor_sysmenu_hdl_set_active(ui_wdecor_t *, bool);
 extern errno_t ui_wdecor_paint(ui_wdecor_t *);
 extern ui_evclaim_t ui_wdecor_kbd_event(ui_wdecor_t *, kbd_event_t *);
Index: uspace/lib/ui/private/wdecor.h
===================================================================
--- uspace/lib/ui/private/wdecor.h	(revision 153dd3b99323e2e6be2a28e55bc73734e9573f6e)
+++ uspace/lib/ui/private/wdecor.h	(revision ed1a948bd3e432a2b365592aefbf84cf73a3fa9f)
@@ -66,4 +66,6 @@
 	/** Window is maximized */
 	bool maximized;
+	/** System menu handle is active */
+	bool sysmenu_hdl_active;
 	/** Minimize button */
 	struct ui_pbutton *btn_min;
@@ -83,4 +85,6 @@
 	/** Title bar rectangle */
 	gfx_rect_t title_bar_rect;
+	/** System menu handle rectangle */
+	gfx_rect_t sysmenu_hdl_rect;
 	/** Window caption rectangle */
 	gfx_rect_t caption_rect;
@@ -105,4 +109,7 @@
 extern void ui_wdecor_set_cursor(ui_wdecor_t *, ui_stock_cursor_t);
 extern void ui_wdecor_get_geom(ui_wdecor_t *, ui_wdecor_geom_t *);
+extern errno_t ui_wdecor_sysmenu_hdl_paint_gfx(ui_wdecor_t *, gfx_rect_t *);
+extern errno_t ui_wdecor_sysmenu_hdl_paint_text(ui_wdecor_t *, gfx_rect_t *);
+extern errno_t ui_wdecor_sysmenu_hdl_paint(ui_wdecor_t *, gfx_rect_t *);
 extern void ui_wdecor_frame_pos_event(ui_wdecor_t *, pos_event_t *);
 extern ui_wdecor_rsztype_t ui_wdecor_get_rsztype(ui_wdecor_t *,
Index: uspace/lib/ui/src/wdecor.c
===================================================================
--- uspace/lib/ui/src/wdecor.c	(revision 153dd3b99323e2e6be2a28e55bc73734e9573f6e)
+++ uspace/lib/ui/src/wdecor.c	(revision ed1a948bd3e432a2b365592aefbf84cf73a3fa9f)
@@ -104,4 +104,12 @@
 	/** Window caption horizontal margin in text mode */
 	wdecor_cap_hmargin_text = 1,
+	/** System menu handle width */
+	wdecor_sysmenu_hdl_w = 20,
+	/** System menu handle height */
+	wdecor_sysmenu_hdl_h = 20,
+	/** System menu handle width in text mode */
+	wdecor_sysmenu_hdl_w_text = 3,
+	/** System menu handle height in text mode */
+	wdecor_sysmenu_hdl_h_text = 1,
 	/** Close button cross leg length */
 	wdecor_close_cross_n = 5,
@@ -296,4 +304,108 @@
 }
 
+/** Paint system menu handle in graphics mode.
+ *
+ * @param wdecor Window decoration
+ * @param rect System menu handle rectangle
+ * @return EOK on success or an error code
+ */
+errno_t ui_wdecor_sysmenu_hdl_paint_gfx(ui_wdecor_t *wdecor, gfx_rect_t *rect)
+{
+	errno_t rc;
+	gfx_rect_t mrect;
+	gfx_rect_t inside;
+	gfx_coord2_t center;
+
+	rc = gfx_set_color(wdecor->res->gc, wdecor->sysmenu_hdl_active ?
+	    wdecor->res->btn_shadow_color : wdecor->res->btn_face_color);
+	if (rc != EOK)
+		return rc;
+
+	rc = gfx_fill_rect(wdecor->res->gc, rect);
+	if (rc != EOK)
+		return rc;
+
+	center.x = (rect->p0.x + rect->p1.x) / 2;
+	center.y = (rect->p0.y + rect->p1.y) / 2;
+	mrect.p0.x = center.x - 7;
+	mrect.p0.y = center.y - 1;
+	mrect.p1.x = center.x + 7;
+	mrect.p1.y = center.y + 1 + 1;
+
+	/* XXX Not really a bevel, just a frame */
+	rc = ui_paint_bevel(wdecor->res->gc, &mrect,
+	    wdecor->res->btn_text_color, wdecor->res->btn_text_color, 1,
+	    &inside);
+	if (rc != EOK)
+		return rc;
+
+	rc = gfx_set_color(wdecor->res->gc, wdecor->res->btn_highlight_color);
+	if (rc != EOK)
+		return rc;
+
+	rc = gfx_fill_rect(wdecor->res->gc, &inside);
+	if (rc != EOK)
+		return rc;
+
+	return EOK;
+}
+
+/** Paint system menu handle in text mode.
+ *
+ * @param wdecor Window decoration
+ * @param rect System menu handle rectangle
+ * @return EOK on success or an error code
+ */
+errno_t ui_wdecor_sysmenu_hdl_paint_text(ui_wdecor_t *wdecor, gfx_rect_t *rect)
+{
+	errno_t rc;
+	gfx_text_fmt_t fmt;
+
+	gfx_text_fmt_init(&fmt);
+	fmt.font = wdecor->res->font;
+	fmt.color = wdecor->res->tbar_act_text_color;
+	fmt.halign = gfx_halign_left;
+	fmt.valign = gfx_valign_top;
+
+	rc = gfx_puttext(&rect->p0, &fmt, "[\u2261]");
+	if (rc != EOK)
+		return rc;
+
+	return EOK;
+}
+
+/** Paint system menu handle.
+ *
+ * @param wdecor Window decoration
+ * @param rect System menu handle rectangle
+ * @return EOK on success or an error code
+ */
+errno_t ui_wdecor_sysmenu_hdl_paint(ui_wdecor_t *wdecor, gfx_rect_t *rect)
+{
+	errno_t rc;
+
+	if (wdecor->res->textmode)
+		rc = ui_wdecor_sysmenu_hdl_paint_text(wdecor, rect);
+	else
+		rc = ui_wdecor_sysmenu_hdl_paint_gfx(wdecor, rect);
+
+	return rc;
+}
+
+/** Set system menu handle active flag.
+ *
+ * @param wdecor Window decoration
+ * @param active @c true iff handle should be active
+ */
+void ui_wdecor_sysmenu_hdl_set_active(ui_wdecor_t *wdecor, bool active)
+{
+	ui_wdecor_geom_t geom;
+
+	wdecor->sysmenu_hdl_active = active;
+
+	ui_wdecor_get_geom(wdecor, &geom);
+	(void) ui_wdecor_sysmenu_hdl_paint(wdecor, &geom.sysmenu_hdl_rect);
+}
+
 /** Paint window decoration.
  *
@@ -395,4 +507,11 @@
 			return rc;
 
+		if ((wdecor->style & ui_wds_sysmenu_hdl) != 0) {
+			rc = ui_wdecor_sysmenu_hdl_paint(wdecor,
+			    &geom.sysmenu_hdl_rect);
+			if (rc != EOK)
+				return rc;
+		}
+
 		if (wdecor->btn_min != NULL) {
 			rc = ui_pbutton_paint(wdecor->btn_min);
@@ -520,4 +639,9 @@
 	gfx_coord_t btn_y;
 	gfx_coord_t cap_hmargin;
+	gfx_coord_t cap_x;
+	gfx_coord_t hdl_x_off;
+	gfx_coord_t hdl_y_off;
+	gfx_coord_t hdl_w;
+	gfx_coord_t hdl_h;
 
 	/* Does window have a frame? */
@@ -568,4 +692,35 @@
 	}
 
+	/* Does window have a sysmenu handle? */
+	if ((wdecor->style & ui_wds_sysmenu_hdl) != 0) {
+		if (wdecor->res->textmode) {
+			hdl_x_off = 2;
+			hdl_y_off = 0;
+			hdl_w = wdecor_sysmenu_hdl_w_text;
+			hdl_h = wdecor_sysmenu_hdl_h_text;
+		} else {
+			hdl_x_off = 1;
+			hdl_y_off = 1;
+			hdl_w = wdecor_sysmenu_hdl_w;
+			hdl_h = wdecor_sysmenu_hdl_h;
+		}
+
+		geom->sysmenu_hdl_rect.p0.x = geom->title_bar_rect.p0.x +
+		    hdl_x_off;
+		geom->sysmenu_hdl_rect.p0.y = geom->title_bar_rect.p0.y +
+		    hdl_y_off;
+		geom->sysmenu_hdl_rect.p1.x = geom->sysmenu_hdl_rect.p0.x +
+		    hdl_w;
+		geom->sysmenu_hdl_rect.p1.y = geom->sysmenu_hdl_rect.p0.y +
+		    hdl_h;
+		cap_x = hdl_w;
+	} else {
+		geom->sysmenu_hdl_rect.p0.x = 0;
+		geom->sysmenu_hdl_rect.p0.y = 0;
+		geom->sysmenu_hdl_rect.p1.x = 0;
+		geom->sysmenu_hdl_rect.p1.y = 0;
+		cap_x = 0;
+	}
+
 	/* Does window have a close button? */
 	if ((wdecor->style & ui_wds_close_btn) != 0) {
@@ -640,14 +795,21 @@
 	}
 
-	if (wdecor->res->textmode == false)
-		cap_hmargin = wdecor_cap_hmargin;
-	else
-		cap_hmargin = wdecor_cap_hmargin_text;
-
-	geom->caption_rect.p0.x = geom->title_bar_rect.p0.x +
-	    cap_hmargin;
-	geom->caption_rect.p0.y = geom->title_bar_rect.p0.y;
-	geom->caption_rect.p1.x = btn_x - cap_hmargin;
-	geom->caption_rect.p1.y = geom->title_bar_rect.p1.y;
+	if ((wdecor->style & ui_wds_titlebar) != 0) {
+		if (wdecor->res->textmode == false)
+			cap_hmargin = wdecor_cap_hmargin;
+		else
+			cap_hmargin = wdecor_cap_hmargin_text;
+
+		geom->caption_rect.p0.x = geom->title_bar_rect.p0.x +
+		    cap_hmargin + cap_x;
+		geom->caption_rect.p0.y = geom->title_bar_rect.p0.y;
+		geom->caption_rect.p1.x = btn_x - cap_hmargin;
+		geom->caption_rect.p1.y = geom->title_bar_rect.p1.y;
+	} else {
+		geom->caption_rect.p0.x = 0;
+		geom->caption_rect.p0.y = 0;
+		geom->caption_rect.p1.x = 0;
+		geom->caption_rect.p1.y = 0;
+	}
 }
 
@@ -828,6 +990,8 @@
 	if (event->type == KEY_PRESS && (event->mods & (KM_CTRL | KM_ALT |
 	    KM_SHIFT)) == 0) {
-		if (event->key == KC_F9)
+		if (event->key == KC_F9) {
+			ui_wdecor_sysmenu_hdl_set_active(wdecor, true);
 			ui_wdecor_sysmenu(wdecor, event->kbd_id);
+		}
 	}
 
@@ -881,4 +1045,13 @@
 
 	ui_wdecor_get_geom(wdecor, &geom);
+
+	if ((wdecor->style & ui_wds_sysmenu_hdl) != 0) {
+		if (event->type == POS_PRESS &&
+		    gfx_pix_inside_rect(&pos, &geom.sysmenu_hdl_rect)) {
+			ui_wdecor_sysmenu_hdl_set_active(wdecor, true);
+			ui_wdecor_sysmenu(wdecor, event->pos_id);
+			return ui_claimed;
+		}
+	}
 
 	if (wdecor->btn_min != NULL) {
Index: uspace/lib/ui/src/window.c
===================================================================
--- uspace/lib/ui/src/window.c	(revision 153dd3b99323e2e6be2a28e55bc73734e9573f6e)
+++ uspace/lib/ui/src/window.c	(revision ed1a948bd3e432a2b365592aefbf84cf73a3fa9f)
@@ -1517,6 +1517,7 @@
 static void wnd_sysmenu_close_req(ui_menu_t *sysmenu, void *arg)
 {
-	(void)arg;
-
+	ui_window_t *window = (ui_window_t *)arg;
+
+	ui_wdecor_sysmenu_hdl_set_active(window->wdecor, false);
 	ui_menu_close(sysmenu);
 }
Index: uspace/lib/ui/test/wdecor.c
===================================================================
--- uspace/lib/ui/test/wdecor.c	(revision 153dd3b99323e2e6be2a28e55bc73734e9573f6e)
+++ uspace/lib/ui/test/wdecor.c	(revision ed1a948bd3e432a2b365592aefbf84cf73a3fa9f)
@@ -119,5 +119,5 @@
 } test_cb_resp_t;
 
-/** Create and destroy button */
+/** Create and destroy window decoration */
 PCUT_TEST(create_destroy)
 {
@@ -217,6 +217,6 @@
 }
 
-/** Paint button */
-PCUT_TEST(paint)
+/** Setting system menu handle as active/inactive */
+PCUT_TEST(sysmenu_hdl_set_active)
 {
 	errno_t rc;
@@ -234,5 +234,70 @@
 	PCUT_ASSERT_NOT_NULL(resource);
 
-	rc = ui_wdecor_create(resource, "Hello", ui_wds_none, &wdecor);
+	rc = ui_wdecor_create(resource, "Hello", ui_wds_decorated, &wdecor);
+	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+	PCUT_ASSERT_FALSE(wdecor->sysmenu_hdl_active);
+	ui_wdecor_sysmenu_hdl_set_active(wdecor, true);
+	PCUT_ASSERT_TRUE(wdecor->sysmenu_hdl_active);
+	ui_wdecor_sysmenu_hdl_set_active(wdecor, false);
+	PCUT_ASSERT_FALSE(wdecor->sysmenu_hdl_active);
+
+	ui_wdecor_destroy(wdecor);
+	ui_resource_destroy(resource);
+
+	rc = gfx_context_delete(gc);
+	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+}
+
+/** Paint system menu handle */
+PCUT_TEST(sysmenu_hdl_paint)
+{
+	errno_t rc;
+	gfx_context_t *gc = NULL;
+	test_gc_t tgc;
+	ui_resource_t *resource = NULL;
+	ui_wdecor_t *wdecor;
+	ui_wdecor_geom_t geom;
+
+	memset(&tgc, 0, sizeof(tgc));
+	rc = gfx_context_new(&ops, &tgc, &gc);
+	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+	rc = ui_resource_create(gc, false, &resource);
+	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+	PCUT_ASSERT_NOT_NULL(resource);
+
+	rc = ui_wdecor_create(resource, "Hello", ui_wds_decorated, &wdecor);
+	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+	ui_wdecor_get_geom(wdecor, &geom);
+	rc = ui_wdecor_sysmenu_hdl_paint(wdecor, &geom.sysmenu_hdl_rect);
+	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+	ui_wdecor_destroy(wdecor);
+	ui_resource_destroy(resource);
+
+	rc = gfx_context_delete(gc);
+	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+}
+
+/** Paint window decoration */
+PCUT_TEST(paint)
+{
+	errno_t rc;
+	gfx_context_t *gc = NULL;
+	test_gc_t tgc;
+	ui_resource_t *resource = NULL;
+	ui_wdecor_t *wdecor;
+
+	memset(&tgc, 0, sizeof(tgc));
+	rc = gfx_context_new(&ops, &tgc, &gc);
+	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+	rc = ui_resource_create(gc, false, &resource);
+	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+	PCUT_ASSERT_NOT_NULL(resource);
+
+	rc = ui_wdecor_create(resource, "Hello", ui_wds_decorated, &wdecor);
 	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
@@ -676,4 +741,24 @@
 	PCUT_ASSERT_INT_EQUALS(0, geom.title_bar_rect.p1.y);
 
+	PCUT_ASSERT_INT_EQUALS(0, geom.sysmenu_hdl_rect.p0.x);
+	PCUT_ASSERT_INT_EQUALS(0, geom.sysmenu_hdl_rect.p0.y);
+	PCUT_ASSERT_INT_EQUALS(0, geom.sysmenu_hdl_rect.p1.x);
+	PCUT_ASSERT_INT_EQUALS(0, geom.sysmenu_hdl_rect.p1.y);
+
+	PCUT_ASSERT_INT_EQUALS(0, geom.caption_rect.p0.x);
+	PCUT_ASSERT_INT_EQUALS(0, geom.caption_rect.p0.y);
+	PCUT_ASSERT_INT_EQUALS(0, geom.caption_rect.p1.x);
+	PCUT_ASSERT_INT_EQUALS(0, geom.caption_rect.p1.y);
+
+	PCUT_ASSERT_INT_EQUALS(0, geom.btn_min_rect.p0.x);
+	PCUT_ASSERT_INT_EQUALS(0, geom.btn_min_rect.p0.y);
+	PCUT_ASSERT_INT_EQUALS(0, geom.btn_min_rect.p1.x);
+	PCUT_ASSERT_INT_EQUALS(0, geom.btn_min_rect.p1.y);
+
+	PCUT_ASSERT_INT_EQUALS(0, geom.btn_max_rect.p0.x);
+	PCUT_ASSERT_INT_EQUALS(0, geom.btn_max_rect.p0.y);
+	PCUT_ASSERT_INT_EQUALS(0, geom.btn_max_rect.p1.x);
+	PCUT_ASSERT_INT_EQUALS(0, geom.btn_max_rect.p1.y);
+
 	PCUT_ASSERT_INT_EQUALS(0, geom.btn_close_rect.p0.x);
 	PCUT_ASSERT_INT_EQUALS(0, geom.btn_close_rect.p0.y);
@@ -733,4 +818,24 @@
 	PCUT_ASSERT_INT_EQUALS(0, geom.title_bar_rect.p1.y);
 
+	PCUT_ASSERT_INT_EQUALS(0, geom.sysmenu_hdl_rect.p0.x);
+	PCUT_ASSERT_INT_EQUALS(0, geom.sysmenu_hdl_rect.p0.y);
+	PCUT_ASSERT_INT_EQUALS(0, geom.sysmenu_hdl_rect.p1.x);
+	PCUT_ASSERT_INT_EQUALS(0, geom.sysmenu_hdl_rect.p1.y);
+
+	PCUT_ASSERT_INT_EQUALS(0, geom.caption_rect.p0.x);
+	PCUT_ASSERT_INT_EQUALS(0, geom.caption_rect.p0.y);
+	PCUT_ASSERT_INT_EQUALS(0, geom.caption_rect.p1.x);
+	PCUT_ASSERT_INT_EQUALS(0, geom.caption_rect.p1.y);
+
+	PCUT_ASSERT_INT_EQUALS(0, geom.btn_min_rect.p0.x);
+	PCUT_ASSERT_INT_EQUALS(0, geom.btn_min_rect.p0.y);
+	PCUT_ASSERT_INT_EQUALS(0, geom.btn_min_rect.p1.x);
+	PCUT_ASSERT_INT_EQUALS(0, geom.btn_min_rect.p1.y);
+
+	PCUT_ASSERT_INT_EQUALS(0, geom.btn_max_rect.p0.x);
+	PCUT_ASSERT_INT_EQUALS(0, geom.btn_max_rect.p0.y);
+	PCUT_ASSERT_INT_EQUALS(0, geom.btn_max_rect.p1.x);
+	PCUT_ASSERT_INT_EQUALS(0, geom.btn_max_rect.p1.y);
+
 	PCUT_ASSERT_INT_EQUALS(0, geom.btn_close_rect.p0.x);
 	PCUT_ASSERT_INT_EQUALS(0, geom.btn_close_rect.p0.y);
@@ -791,4 +896,24 @@
 	PCUT_ASSERT_INT_EQUALS(46, geom.title_bar_rect.p1.y);
 
+	PCUT_ASSERT_INT_EQUALS(0, geom.sysmenu_hdl_rect.p0.x);
+	PCUT_ASSERT_INT_EQUALS(0, geom.sysmenu_hdl_rect.p0.y);
+	PCUT_ASSERT_INT_EQUALS(0, geom.sysmenu_hdl_rect.p1.x);
+	PCUT_ASSERT_INT_EQUALS(0, geom.sysmenu_hdl_rect.p1.y);
+
+	PCUT_ASSERT_INT_EQUALS(18, geom.caption_rect.p0.x);
+	PCUT_ASSERT_INT_EQUALS(24, geom.caption_rect.p0.y);
+	PCUT_ASSERT_INT_EQUALS(91, geom.caption_rect.p1.x);
+	PCUT_ASSERT_INT_EQUALS(46, geom.caption_rect.p1.y);
+
+	PCUT_ASSERT_INT_EQUALS(0, geom.btn_min_rect.p0.x);
+	PCUT_ASSERT_INT_EQUALS(0, geom.btn_min_rect.p0.y);
+	PCUT_ASSERT_INT_EQUALS(0, geom.btn_min_rect.p1.x);
+	PCUT_ASSERT_INT_EQUALS(0, geom.btn_min_rect.p1.y);
+
+	PCUT_ASSERT_INT_EQUALS(0, geom.btn_max_rect.p0.x);
+	PCUT_ASSERT_INT_EQUALS(0, geom.btn_max_rect.p0.y);
+	PCUT_ASSERT_INT_EQUALS(0, geom.btn_max_rect.p1.x);
+	PCUT_ASSERT_INT_EQUALS(0, geom.btn_max_rect.p1.y);
+
 	PCUT_ASSERT_INT_EQUALS(0, geom.btn_close_rect.p0.x);
 	PCUT_ASSERT_INT_EQUALS(0, geom.btn_close_rect.p0.y);
@@ -847,4 +972,25 @@
 	PCUT_ASSERT_INT_EQUALS(96, geom.title_bar_rect.p1.x);
 	PCUT_ASSERT_INT_EQUALS(46, geom.title_bar_rect.p1.y);
+
+	PCUT_ASSERT_INT_EQUALS(15, geom.sysmenu_hdl_rect.p0.x);
+	PCUT_ASSERT_INT_EQUALS(25, geom.sysmenu_hdl_rect.p0.y);
+	PCUT_ASSERT_INT_EQUALS(35, geom.sysmenu_hdl_rect.p1.x);
+	PCUT_ASSERT_INT_EQUALS(45, geom.sysmenu_hdl_rect.p1.y);
+
+	PCUT_ASSERT_INT_EQUALS(38, geom.caption_rect.p0.x);
+	PCUT_ASSERT_INT_EQUALS(24, geom.caption_rect.p0.y);
+	PCUT_ASSERT_INT_EQUALS(51, geom.caption_rect.p1.x);
+	PCUT_ASSERT_INT_EQUALS(46, geom.caption_rect.p1.y);
+
+	PCUT_ASSERT_INT_EQUALS(55, geom.btn_min_rect.p0.x);
+	PCUT_ASSERT_INT_EQUALS(25, geom.btn_min_rect.p0.y);
+	PCUT_ASSERT_INT_EQUALS(75, geom.btn_min_rect.p1.x);
+	PCUT_ASSERT_INT_EQUALS(45, geom.btn_min_rect.p1.y);
+
+	/* Maximize button is not in ui_wds_decorated */
+	PCUT_ASSERT_INT_EQUALS(0, geom.btn_max_rect.p0.x);
+	PCUT_ASSERT_INT_EQUALS(0, geom.btn_max_rect.p0.y);
+	PCUT_ASSERT_INT_EQUALS(0, geom.btn_max_rect.p1.x);
+	PCUT_ASSERT_INT_EQUALS(0, geom.btn_max_rect.p1.y);
 
 	PCUT_ASSERT_INT_EQUALS(75, geom.btn_close_rect.p0.x);