Index: uspace/app/uidemo/uidemo.c
===================================================================
--- uspace/app/uidemo/uidemo.c	(revision 943f032bca13744ba4e76927adfbff79febc57e4)
+++ uspace/app/uidemo/uidemo.c	(revision de0c55aad2546db54f4c4e371de34886eb068742)
@@ -673,8 +673,15 @@
 
 	gfx_bitmap_params_init(&bparams);
-	bparams.rect.p0.x = 0;
-	bparams.rect.p0.y = 0;
-	bparams.rect.p1.x = 188;
-	bparams.rect.p1.y = 24;
+	if (ui_is_textmode(ui)) {
+		bparams.rect.p0.x = 0;
+		bparams.rect.p0.y = 0;
+		bparams.rect.p1.x = 40;
+		bparams.rect.p1.y = 2;
+	} else {
+		bparams.rect.p0.x = 0;
+		bparams.rect.p0.y = 0;
+		bparams.rect.p1.x = 188;
+		bparams.rect.p1.y = 24;
+	}
 
 	rc = gfx_bitmap_create(gc, &bparams, NULL, &bitmap);
@@ -692,13 +699,22 @@
 	}
 
-	off.x = 15;
-	off.y = 155;
+	if (ui_is_textmode(ui)) {
+		off.x = 20;
+		off.y = 10;
+	} else {
+		off.x = 15;
+		off.y = 155;
+	}
+
 	gfx_rect_translate(&off, &bparams.rect, &rect);
 
 	/* Adjust for frame width (2 x 1 pixel) */
-	rect.p1.x += 2;
-	rect.p1.y += 2;
+	if (!ui_is_textmode(ui)) {
+		ui_image_set_flags(demo.image, ui_imgf_frame);
+		rect.p1.x += 2;
+		rect.p1.y += 2;
+	}
+
 	ui_image_set_rect(demo.image, &rect);
-	ui_image_set_flags(demo.image, ui_imgf_frame);
 
 	rc = ui_fixed_add(demo.fixed, ui_image_ctl(demo.image));
@@ -719,7 +735,7 @@
 	if (ui_is_textmode(ui)) {
 		rect.p0.x = 20;
-		rect.p0.y = 12;
+		rect.p0.y = 13;
 		rect.p1.x = 40;
-		rect.p1.y = 13;
+		rect.p1.y = 14;
 	} else {
 		rect.p0.x = 15;
@@ -728,4 +744,5 @@
 		rect.p1.y = 210;
 	}
+
 	ui_checkbox_set_rect(demo.checkbox, &rect);
 
@@ -755,7 +772,7 @@
 	if (ui_is_textmode(ui)) {
 		rect.p0.x = 20;
-		rect.p0.y = 14;
+		rect.p0.y = 15;
 		rect.p1.x = 40;
-		rect.p1.y = 15;
+		rect.p1.y = 16;
 	} else {
 		rect.p0.x = 15;
@@ -782,7 +799,7 @@
 	if (ui_is_textmode(ui)) {
 		rect.p0.x = 20;
-		rect.p0.y = 15;
+		rect.p0.y = 16;
 		rect.p1.x = 40;
-		rect.p1.y = 16;
+		rect.p1.y = 17;
 	} else {
 		rect.p0.x = 15;
@@ -810,7 +827,7 @@
 	if (ui_is_textmode(ui)) {
 		rect.p0.x = 20;
-		rect.p0.y = 16;
+		rect.p0.y = 17;
 		rect.p1.x = 40;
-		rect.p1.y = 17;
+		rect.p1.y = 18;
 	} else {
 		rect.p0.x = 15;
@@ -838,7 +855,7 @@
 	if (ui_is_textmode(ui)) {
 		rect.p0.x = 20;
-		rect.p0.y = 18;
+		rect.p0.y = 19;
 		rect.p1.x = 40;
-		rect.p1.y = 19;
+		rect.p1.y = 20;
 	} else {
 		rect.p0.x = 15;
@@ -900,5 +917,5 @@
 			k = i * i + j * j;
 			pixelmap_put_pixel(&pixelmap, i, j,
-			    PIXEL(255, k, k, 255 - k));
+			    PIXEL(0, k, k, 255 - k));
 		}
 	}