Index: uspace/app/calculator/calculator.c
===================================================================
--- uspace/app/calculator/calculator.c	(revision 77ffa018e96bf200a6d7a188492a0574ecda4c99)
+++ uspace/app/calculator/calculator.c	(revision 9c7dc8e93da9abc90efb24bba56e275432050f20)
@@ -95,6 +95,15 @@
 } stack_item_t;
 
+/** Dimensions. Most of this should not be needed with auto layout */
+typedef struct {
+	gfx_rect_t entry_rect;
+	gfx_coord2_t btn_orig;
+	gfx_coord2_t btn_stride;
+	gfx_coord2_t btn_dim;
+} calc_geom_t;
+
 typedef struct {
 	ui_t *ui;
+	ui_resource_t *ui_res;
 	ui_pbutton_t *btn_eval;
 	ui_pbutton_t *btn_clear;
@@ -113,4 +122,5 @@
 	ui_pbutton_t *btn_8;
 	ui_pbutton_t *btn_9;
+	calc_geom_t geom;
 } calc_t;
 
@@ -650,5 +660,5 @@
 }
 
-static errno_t calc_button_create(ui_resource_t *ui_res, ui_fixed_t *fixed,
+static errno_t calc_button_create(calc_t *calc, ui_fixed_t *fixed,
     int x, int y, const char *text, ui_pbutton_cb_t *cb, void *arg,
     ui_pbutton_t **rbutton)
@@ -658,5 +668,5 @@
 	errno_t rc;
 
-	rc = ui_pbutton_create(ui_res, text, &pb);
+	rc = ui_pbutton_create(calc->ui_res, text, &pb);
 	if (rc != EOK) {
 		printf("Error creating button.\n");
@@ -666,8 +676,8 @@
 	ui_pbutton_set_cb(pb, cb, arg);
 
-	rect.p0.x = 10 + 60 * x;
-	rect.p0.y = 90 + 45 * y;
-	rect.p1.x = 60 + 60 * x;
-	rect.p1.y = 125 + 45 * y;
+	rect.p0.x = calc->geom.btn_orig.x + calc->geom.btn_stride.x * x;
+	rect.p0.y = calc->geom.btn_orig.y + calc->geom.btn_stride.y * y;
+	rect.p1.x = rect.p0.x + calc->geom.btn_dim.x;
+	rect.p1.y = rect.p0.y + calc->geom.btn_dim.y;
 	ui_pbutton_set_rect(pb, &rect);
 
@@ -696,5 +706,4 @@
 	ui_wnd_params_t params;
 	ui_window_t *window;
-	gfx_rect_t rect;
 	calc_t calc;
 	errno_t rc;
@@ -732,4 +741,28 @@
 	params.rect.p1.y = 270;
 
+	if (ui_is_textmode(ui)) {
+		calc.geom.entry_rect.p0.x = 4;
+		calc.geom.entry_rect.p0.y = 2;
+		calc.geom.entry_rect.p1.x = 60;
+		calc.geom.entry_rect.p1.y = 4;
+		calc.geom.btn_orig.x = 4;
+		calc.geom.btn_orig.y = 4;
+		calc.geom.btn_dim.x = 12;
+		calc.geom.btn_dim.y = 7;
+		calc.geom.btn_stride.x = 15;
+		calc.geom.btn_stride.y = 6;
+	} else {
+		calc.geom.entry_rect.p0.x = 15;
+		calc.geom.entry_rect.p0.y = 45;
+		calc.geom.entry_rect.p1.x = 235;
+		calc.geom.entry_rect.p1.y = 70;
+		calc.geom.btn_orig.x = 10;
+		calc.geom.btn_orig.y = 90;
+		calc.geom.btn_dim.x = 50;
+		calc.geom.btn_dim.y = 35;
+		calc.geom.btn_stride.x = 60;
+		calc.geom.btn_stride.y = 45;
+	}
+
 	rc = ui_window_create(ui, &params, &window);
 	if (rc != EOK) {
@@ -742,4 +775,5 @@
 
 	ui_res = ui_window_get_res(window);
+	calc.ui_res = ui_res;
 
 	rc = ui_fixed_create(&fixed);
@@ -755,9 +789,5 @@
 	}
 
-	rect.p0.x = 15;
-	rect.p0.y = 45;
-	rect.p1.x = 235;
-	rect.p1.y = 70;
-	ui_entry_set_rect(display, &rect);
+	ui_entry_set_rect(display, &calc.geom.entry_rect);
 	ui_entry_set_halign(display, gfx_halign_right);
 
@@ -768,80 +798,80 @@
 	}
 
-	rc = calc_button_create(ui_res, fixed, 0, 0, "7", &calc_pbutton_cb,
+	rc = calc_button_create(&calc, fixed, 0, 0, "7", &calc_pbutton_cb,
 	    (void *) "7", &calc.btn_7);
 	if (rc != EOK)
 		return rc;
 
-	rc = calc_button_create(ui_res, fixed, 1, 0, "8", &calc_pbutton_cb,
+	rc = calc_button_create(&calc, fixed, 1, 0, "8", &calc_pbutton_cb,
 	    (void *) "8", &calc.btn_8);
 	if (rc != EOK)
 		return rc;
 
-	rc = calc_button_create(ui_res, fixed, 2, 0, "9", &calc_pbutton_cb,
+	rc = calc_button_create(&calc, fixed, 2, 0, "9", &calc_pbutton_cb,
 	    (void *) "9", &calc.btn_9);
 	if (rc != EOK)
 		return rc;
 
-	rc = calc_button_create(ui_res, fixed, 3, 0, "/", &calc_pbutton_cb,
+	rc = calc_button_create(&calc, fixed, 3, 0, "/", &calc_pbutton_cb,
 	    (void *) "/", &calc.btn_div);
 	if (rc != EOK)
 		return rc;
 
-	rc = calc_button_create(ui_res, fixed, 0, 1, "4", &calc_pbutton_cb,
+	rc = calc_button_create(&calc, fixed, 0, 1, "4", &calc_pbutton_cb,
 	    (void *) "4", &calc.btn_4);
 	if (rc != EOK)
 		return rc;
 
-	rc = calc_button_create(ui_res, fixed, 1, 1, "5", &calc_pbutton_cb,
+	rc = calc_button_create(&calc, fixed, 1, 1, "5", &calc_pbutton_cb,
 	    (void *) "5", &calc.btn_5);
 	if (rc != EOK)
 		return rc;
 
-	rc = calc_button_create(ui_res, fixed, 2, 1, "6", &calc_pbutton_cb,
+	rc = calc_button_create(&calc, fixed, 2, 1, "6", &calc_pbutton_cb,
 	    (void *) "6", &calc.btn_6);
 	if (rc != EOK)
 		return rc;
 
-	rc = calc_button_create(ui_res, fixed, 3, 1, "*", &calc_pbutton_cb,
+	rc = calc_button_create(&calc, fixed, 3, 1, "*", &calc_pbutton_cb,
 	    (void *) "*", &calc.btn_mul);
 	if (rc != EOK)
 		return rc;
 
-	rc = calc_button_create(ui_res, fixed, 0, 2, "1", &calc_pbutton_cb,
+	rc = calc_button_create(&calc, fixed, 0, 2, "1", &calc_pbutton_cb,
 	    (void *) "1", &calc.btn_1);
 	if (rc != EOK)
 		return rc;
 
-	rc = calc_button_create(ui_res, fixed, 1, 2, "2", &calc_pbutton_cb,
+	rc = calc_button_create(&calc, fixed, 1, 2, "2", &calc_pbutton_cb,
 	    (void *) "2", &calc.btn_2);
 	if (rc != EOK)
 		return rc;
 
-	rc = calc_button_create(ui_res, fixed, 2, 2, "3", &calc_pbutton_cb,
+	rc = calc_button_create(&calc, fixed, 2, 2, "3", &calc_pbutton_cb,
 	    (void *) "3", &calc.btn_3);
 	if (rc != EOK)
 		return rc;
 
-	rc = calc_button_create(ui_res, fixed, 3, 2, "-", &calc_pbutton_cb,
+	rc = calc_button_create(&calc, fixed, 3, 2, "-", &calc_pbutton_cb,
 	    (void *) "-", &calc.btn_sub);
 	if (rc != EOK)
 		return rc;
 
-	rc = calc_button_create(ui_res, fixed, 0, 3, "0", &calc_pbutton_cb,
+	rc = calc_button_create(&calc, fixed, 0, 3, "0", &calc_pbutton_cb,
 	    (void *) "0", &calc.btn_0);
 	if (rc != EOK)
 		return rc;
 
-	rc = calc_button_create(ui_res, fixed, 1, 3, "C", &calc_clear_cb,
+	rc = calc_button_create(&calc, fixed, 1, 3, "C", &calc_clear_cb,
 	    (void *) "C", &calc.btn_clear);
 	if (rc != EOK)
 		return rc;
 
-	rc = calc_button_create(ui_res, fixed, 2, 3, "=", &calc_eval_cb,
+	rc = calc_button_create(&calc, fixed, 2, 3, "=", &calc_eval_cb,
 	    (void *) "=", &calc.btn_eval);
 	if (rc != EOK)
 		return rc;
 
-	rc = calc_button_create(ui_res, fixed, 3, 3, "+", &calc_pbutton_cb,
+	rc = calc_button_create(&calc, fixed, 3, 3, "+", &calc_pbutton_cb,
 	    (void *) "+", &calc.btn_add);
 	if (rc != EOK)
Index: uspace/lib/ui/include/ui/resource.h
===================================================================
--- uspace/lib/ui/include/ui/resource.h	(revision 77ffa018e96bf200a6d7a188492a0574ecda4c99)
+++ uspace/lib/ui/include/ui/resource.h	(revision 9c7dc8e93da9abc90efb24bba56e275432050f20)
@@ -39,7 +39,8 @@
 #include <errno.h>
 #include <gfx/context.h>
+#include <stdbool.h>
 #include <types/ui/resource.h>
 
-extern errno_t ui_resource_create(gfx_context_t *, ui_resource_t **);
+extern errno_t ui_resource_create(gfx_context_t *, bool, ui_resource_t **);
 extern void ui_resource_destroy(ui_resource_t *);
 
Index: uspace/lib/ui/include/ui/ui.h
===================================================================
--- uspace/lib/ui/include/ui/ui.h	(revision 77ffa018e96bf200a6d7a188492a0574ecda4c99)
+++ uspace/lib/ui/include/ui/ui.h	(revision 9c7dc8e93da9abc90efb24bba56e275432050f20)
@@ -40,4 +40,5 @@
 #include <errno.h>
 #include <io/console.h>
+#include <stdbool.h>
 #include <types/ui/ui.h>
 
@@ -48,4 +49,5 @@
 extern void ui_quit(ui_t *);
 extern void ui_run(ui_t *);
+extern bool ui_is_textmode(ui_t *);
 
 #endif
Index: uspace/lib/ui/private/resource.h
===================================================================
--- uspace/lib/ui/private/resource.h	(revision 77ffa018e96bf200a6d7a188492a0574ecda4c99)
+++ uspace/lib/ui/private/resource.h	(revision 9c7dc8e93da9abc90efb24bba56e275432050f20)
@@ -42,4 +42,5 @@
 #include <gfx/font.h>
 #include <gfx/typeface.h>
+#include <stdbool.h>
 
 /** Actual structure of UI resources.
@@ -54,4 +55,6 @@
 	/** Font */
 	gfx_font_t *font;
+	/** Text mode */
+	bool textmode;
 
 	/** Button frame color */
Index: uspace/lib/ui/src/entry.c
===================================================================
--- uspace/lib/ui/src/entry.c	(revision 77ffa018e96bf200a6d7a188492a0574ecda4c99)
+++ uspace/lib/ui/src/entry.c	(revision 9c7dc8e93da9abc90efb24bba56e275432050f20)
@@ -46,4 +46,5 @@
 #include <ui/paint.h>
 #include <ui/entry.h>
+#include <ui/ui.h>
 #include "../private/entry.h"
 #include "../private/resource.h"
@@ -55,5 +56,7 @@
 enum {
 	ui_entry_hpad = 4,
-	ui_entry_vpad = 4
+	ui_entry_vpad = 4,
+	ui_entry_hpad_text = 1,
+	ui_entry_vpad_text = 0
 };
 
@@ -173,6 +176,16 @@
 	gfx_text_fmt_t fmt;
 	gfx_coord2_t pos;
+	gfx_coord_t hpad;
+	gfx_coord_t vpad;
 	gfx_rect_t inside;
 	errno_t rc;
+
+	if (entry->res->textmode) {
+		hpad = ui_entry_hpad_text;
+		vpad = ui_entry_vpad_text;
+	} else {
+		hpad = ui_entry_hpad;
+		vpad = ui_entry_vpad;
+	}
 
 	/* Paint inset frame */
@@ -195,5 +208,5 @@
 	case gfx_halign_left:
 	case gfx_halign_justify:
-		pos.x = inside.p0.x + ui_entry_hpad;
+		pos.x = inside.p0.x + hpad;
 		break;
 	case gfx_halign_center:
@@ -201,9 +214,9 @@
 		break;
 	case gfx_halign_right:
-		pos.x = inside.p1.x - ui_entry_hpad;
+		pos.x = inside.p1.x - hpad;
 		break;
 	}
 
-	pos.y = inside.p0.y + ui_entry_vpad;
+	pos.y = inside.p0.y + vpad;
 
 	gfx_text_fmt_init(&fmt);
Index: uspace/lib/ui/src/resource.c
===================================================================
--- uspace/lib/ui/src/resource.c	(revision 77ffa018e96bf200a6d7a188492a0574ecda4c99)
+++ uspace/lib/ui/src/resource.c	(revision 9c7dc8e93da9abc90efb24bba56e275432050f20)
@@ -50,8 +50,10 @@
  *
  * @param gc Graphic context
+ * @param textmode @c true if running in text mode
  * @param rresource Place to store pointer to new UI resource
  * @return EOK on success, ENOMEM if out of memory
  */
-errno_t ui_resource_create(gfx_context_t *gc, ui_resource_t **rresource)
+errno_t ui_resource_create(gfx_context_t *gc, bool textmode,
+    ui_resource_t **rresource)
 {
 	ui_resource_t *resource;
@@ -83,17 +85,28 @@
 		return ENOMEM;
 
-	rc = gfx_typeface_open(gc, ui_typeface_path, &tface);
-	if (rc != EOK)
-		goto error;
-
-	finfo = gfx_typeface_first_font(tface);
-	if (finfo == NULL) {
-		rc = EIO;
-		goto error;
+	if (textmode) {
+		/* Create dummy font for text mode */
+		rc = gfx_typeface_create(gc, &tface);
+		if (rc != EOK)
+			goto error;
+
+		rc = gfx_font_create_textmode(tface, &font);
+		if (rc != EOK)
+			goto error;
+	} else {
+		rc = gfx_typeface_open(gc, ui_typeface_path, &tface);
+		if (rc != EOK)
+			goto error;
+
+		finfo = gfx_typeface_first_font(tface);
+		if (finfo == NULL) {
+			rc = EIO;
+			goto error;
+		}
+
+		rc = gfx_font_open(finfo, &font);
+		if (rc != EOK)
+			goto error;
 	}
-
-	rc = gfx_font_open(finfo, &font);
-	if (rc != EOK)
-		goto error;
 
 	rc = gfx_color_new_rgb_i16(0, 0, 0, &btn_frame_color);
@@ -177,4 +190,5 @@
 	resource->tface = tface;
 	resource->font = font;
+	resource->textmode = textmode;
 
 	resource->btn_frame_color = btn_frame_color;
Index: uspace/lib/ui/src/ui.c
===================================================================
--- uspace/lib/ui/src/ui.c	(revision 77ffa018e96bf200a6d7a188492a0574ecda4c99)
+++ uspace/lib/ui/src/ui.c	(revision 9c7dc8e93da9abc90efb24bba56e275432050f20)
@@ -254,4 +254,18 @@
 }
 
+/** Determine if we are running in text mode.
+ *
+ * @param ui User interface
+ * @return @c true iff we are running in text mode
+ */
+bool ui_is_textmode(ui_t *ui)
+{
+	/*
+	 * XXX Currently console is always text and display is always
+	 * graphics, but this need not always be true.
+	 */
+	return (ui->console != NULL);
+}
+
 /** @}
  */
Index: uspace/lib/ui/src/window.c
===================================================================
--- uspace/lib/ui/src/window.c	(revision 77ffa018e96bf200a6d7a188492a0574ecda4c99)
+++ uspace/lib/ui/src/window.c	(revision 9c7dc8e93da9abc90efb24bba56e275432050f20)
@@ -47,4 +47,5 @@
 #include <ui/control.h>
 #include <ui/resource.h>
+#include <ui/ui.h>
 #include <ui/wdecor.h>
 #include <ui/window.h>
@@ -255,5 +256,5 @@
 	window->gc = gc;
 #endif
-	rc = ui_resource_create(window->gc, &res);
+	rc = ui_resource_create(window->gc, ui_is_textmode(ui), &res);
 	if (rc != EOK)
 		goto error;
Index: uspace/lib/ui/test/checkbox.c
===================================================================
--- uspace/lib/ui/test/checkbox.c	(revision 77ffa018e96bf200a6d7a188492a0574ecda4c99)
+++ uspace/lib/ui/test/checkbox.c	(revision 9c7dc8e93da9abc90efb24bba56e275432050f20)
@@ -160,5 +160,5 @@
 	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
-	rc = ui_resource_create(gc, &resource);
+	rc = ui_resource_create(gc, false, &resource);
 	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 	PCUT_ASSERT_NOT_NULL(resource);
@@ -217,5 +217,5 @@
 	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
-	rc = ui_resource_create(gc, &resource);
+	rc = ui_resource_create(gc, false, &resource);
 	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 	PCUT_ASSERT_NOT_NULL(resource);
@@ -264,5 +264,5 @@
 	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
-	rc = ui_resource_create(gc, &resource);
+	rc = ui_resource_create(gc, false, &resource);
 	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 	PCUT_ASSERT_NOT_NULL(resource);
@@ -316,5 +316,5 @@
 	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
-	rc = ui_resource_create(gc, &resource);
+	rc = ui_resource_create(gc, false, &resource);
 	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 	PCUT_ASSERT_NOT_NULL(resource);
@@ -377,5 +377,5 @@
 	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
-	rc = ui_resource_create(gc, &resource);
+	rc = ui_resource_create(gc, false, &resource);
 	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 	PCUT_ASSERT_NOT_NULL(resource);
@@ -438,5 +438,5 @@
 	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
-	rc = ui_resource_create(gc, &resource);
+	rc = ui_resource_create(gc, false, &resource);
 	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 	PCUT_ASSERT_NOT_NULL(resource);
Index: uspace/lib/ui/test/entry.c
===================================================================
--- uspace/lib/ui/test/entry.c	(revision 77ffa018e96bf200a6d7a188492a0574ecda4c99)
+++ uspace/lib/ui/test/entry.c	(revision 9c7dc8e93da9abc90efb24bba56e275432050f20)
@@ -192,5 +192,5 @@
 	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
-	rc = ui_resource_create(gc, &resource);
+	rc = ui_resource_create(gc, false, &resource);
 	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 	PCUT_ASSERT_NOT_NULL(resource);
Index: uspace/lib/ui/test/label.c
===================================================================
--- uspace/lib/ui/test/label.c	(revision 77ffa018e96bf200a6d7a188492a0574ecda4c99)
+++ uspace/lib/ui/test/label.c	(revision 9c7dc8e93da9abc90efb24bba56e275432050f20)
@@ -192,5 +192,5 @@
 	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
-	rc = ui_resource_create(gc, &resource);
+	rc = ui_resource_create(gc, false, &resource);
 	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 	PCUT_ASSERT_NOT_NULL(resource);
Index: uspace/lib/ui/test/paint.c
===================================================================
--- uspace/lib/ui/test/paint.c	(revision 77ffa018e96bf200a6d7a188492a0574ecda4c99)
+++ uspace/lib/ui/test/paint.c	(revision 9c7dc8e93da9abc90efb24bba56e275432050f20)
@@ -122,5 +122,5 @@
 	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
-	rc = ui_resource_create(gc, &resource);
+	rc = ui_resource_create(gc, false, &resource);
 	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 	PCUT_ASSERT_NOT_NULL(resource);
Index: uspace/lib/ui/test/pbutton.c
===================================================================
--- uspace/lib/ui/test/pbutton.c	(revision 77ffa018e96bf200a6d7a188492a0574ecda4c99)
+++ uspace/lib/ui/test/pbutton.c	(revision 9c7dc8e93da9abc90efb24bba56e275432050f20)
@@ -178,5 +178,5 @@
 	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
-	rc = ui_resource_create(gc, &resource);
+	rc = ui_resource_create(gc, false, &resource);
 	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 	PCUT_ASSERT_NOT_NULL(resource);
@@ -235,5 +235,5 @@
 	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
-	rc = ui_resource_create(gc, &resource);
+	rc = ui_resource_create(gc, false, &resource);
 	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 	PCUT_ASSERT_NOT_NULL(resource);
@@ -279,5 +279,5 @@
 	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
-	rc = ui_resource_create(gc, &resource);
+	rc = ui_resource_create(gc, false, &resource);
 	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 	PCUT_ASSERT_NOT_NULL(resource);
@@ -328,5 +328,5 @@
 	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
-	rc = ui_resource_create(gc, &resource);
+	rc = ui_resource_create(gc, false, &resource);
 	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 	PCUT_ASSERT_NOT_NULL(resource);
@@ -384,5 +384,5 @@
 	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
-	rc = ui_resource_create(gc, &resource);
+	rc = ui_resource_create(gc, false, &resource);
 	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 	PCUT_ASSERT_NOT_NULL(resource);
@@ -445,5 +445,5 @@
 	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
-	rc = ui_resource_create(gc, &resource);
+	rc = ui_resource_create(gc, false, &resource);
 	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 	PCUT_ASSERT_NOT_NULL(resource);
Index: uspace/lib/ui/test/rbutton.c
===================================================================
--- uspace/lib/ui/test/rbutton.c	(revision 77ffa018e96bf200a6d7a188492a0574ecda4c99)
+++ uspace/lib/ui/test/rbutton.c	(revision 9c7dc8e93da9abc90efb24bba56e275432050f20)
@@ -176,5 +176,5 @@
 	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
-	rc = ui_resource_create(gc, &resource);
+	rc = ui_resource_create(gc, false, &resource);
 	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 	PCUT_ASSERT_NOT_NULL(resource);
@@ -244,5 +244,5 @@
 	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
-	rc = ui_resource_create(gc, &resource);
+	rc = ui_resource_create(gc, false, &resource);
 	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 	PCUT_ASSERT_NOT_NULL(resource);
@@ -303,5 +303,5 @@
 	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
-	rc = ui_resource_create(gc, &resource);
+	rc = ui_resource_create(gc, false, &resource);
 	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 	PCUT_ASSERT_NOT_NULL(resource);
@@ -368,5 +368,5 @@
 	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
-	rc = ui_resource_create(gc, &resource);
+	rc = ui_resource_create(gc, false, &resource);
 	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 	PCUT_ASSERT_NOT_NULL(resource);
@@ -440,5 +440,5 @@
 	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
-	rc = ui_resource_create(gc, &resource);
+	rc = ui_resource_create(gc, false, &resource);
 	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 	PCUT_ASSERT_NOT_NULL(resource);
@@ -506,5 +506,5 @@
 	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
-	rc = ui_resource_create(gc, &resource);
+	rc = ui_resource_create(gc, false, &resource);
 	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 	PCUT_ASSERT_NOT_NULL(resource);
Index: uspace/lib/ui/test/resource.c
===================================================================
--- uspace/lib/ui/test/resource.c	(revision 77ffa018e96bf200a6d7a188492a0574ecda4c99)
+++ uspace/lib/ui/test/resource.c	(revision 9c7dc8e93da9abc90efb24bba56e275432050f20)
@@ -80,5 +80,5 @@
 	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
-	rc = ui_resource_create(gc, &resource);
+	rc = ui_resource_create(gc, false, &resource);
 	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 	PCUT_ASSERT_NOT_NULL(resource);
Index: uspace/lib/ui/test/slider.c
===================================================================
--- uspace/lib/ui/test/slider.c	(revision 77ffa018e96bf200a6d7a188492a0574ecda4c99)
+++ uspace/lib/ui/test/slider.c	(revision 9c7dc8e93da9abc90efb24bba56e275432050f20)
@@ -161,5 +161,5 @@
 	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
-	rc = ui_resource_create(gc, &resource);
+	rc = ui_resource_create(gc, false, &resource);
 	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 	PCUT_ASSERT_NOT_NULL(resource);
@@ -222,5 +222,5 @@
 	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
-	rc = ui_resource_create(gc, &resource);
+	rc = ui_resource_create(gc, false, &resource);
 	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 	PCUT_ASSERT_NOT_NULL(resource);
@@ -278,5 +278,5 @@
 	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
-	rc = ui_resource_create(gc, &resource);
+	rc = ui_resource_create(gc, false, &resource);
 	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 	PCUT_ASSERT_NOT_NULL(resource);
@@ -342,5 +342,5 @@
 	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
-	rc = ui_resource_create(gc, &resource);
+	rc = ui_resource_create(gc, false, &resource);
 	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 	PCUT_ASSERT_NOT_NULL(resource);
@@ -403,5 +403,5 @@
 	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
-	rc = ui_resource_create(gc, &resource);
+	rc = ui_resource_create(gc, false, &resource);
 	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 	PCUT_ASSERT_NOT_NULL(resource);
Index: uspace/lib/ui/test/wdecor.c
===================================================================
--- uspace/lib/ui/test/wdecor.c	(revision 77ffa018e96bf200a6d7a188492a0574ecda4c99)
+++ uspace/lib/ui/test/wdecor.c	(revision 9c7dc8e93da9abc90efb24bba56e275432050f20)
@@ -177,5 +177,5 @@
 	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
-	rc = ui_resource_create(gc, &resource);
+	rc = ui_resource_create(gc, false, &resource);
 	PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 	PCUT_ASSERT_NOT_NULL(resource);