Index: uspace/app/fontedit/fontedit.c
===================================================================
--- uspace/app/fontedit/fontedit.c	(revision e2776ffdf31bd32d05faaf0fc2af21961158e6d2)
+++ uspace/app/fontedit/fontedit.c	(revision a57c70c02b983d06f045f7ca96065e0be8a9c3bd)
@@ -120,4 +120,25 @@
 }
 
+/** Handle font editor keyboard event.
+ *
+ * @param widget Canvas widget
+ * @param data Position event
+ */
+static void font_edit_kbd_event(widget_t *widget, void *data)
+{
+	kbd_event_t *event = (kbd_event_t *) data;
+	font_edit_t *fedit;
+
+	fedit = (font_edit_t *) widget_get_data(widget);
+
+	if (event->type == KEY_PRESS) {
+		if (event->key == KC_S) {
+			printf("Save!\n");
+			(void) gfx_glyph_bmp_save(fedit->gbmp);
+			font_edit_paint(fedit);
+		}
+	}
+}
+
 /** Convert glyph pixel coordinates to displayed rectangle.
  *
@@ -139,4 +160,41 @@
 	drect->p1.x = glyph_orig_x + (x + 1) * glyph_scale;
 	drect->p1.y = glyph_orig_y + (y + 1) * glyph_scale;
+}
+
+/** Paint font preview.
+ *
+ * @param fedit Font editor
+ */
+static errno_t font_edit_paint_preview(font_edit_t *fedit)
+{
+	gfx_glyph_metrics_t gmetrics;
+	size_t stradv;
+	const char *cp;
+	gfx_glyph_t *glyph;
+	gfx_coord2_t pos;
+	errno_t rc;
+
+	cp = "ABCD";
+	pos.x = 20;
+	pos.y = 20;
+
+	while (*cp != '\0') {
+		rc = gfx_font_search_glyph(fedit->font, cp, &glyph, &stradv);
+		if (rc != EOK) {
+			++cp;
+			continue;
+		}
+
+		gfx_glyph_get_metrics(glyph, &gmetrics);
+
+		rc = gfx_glyph_render(glyph, &pos);
+		if (rc != EOK)
+			return rc;
+
+		cp += stradv;
+		pos.x += gmetrics.advance;
+	}
+
+	return EOK;
 }
 
@@ -224,4 +282,8 @@
 
 	rc = font_edit_paint_gbmp(fedit);
+	if (rc != EOK)
+		return rc;
+
+	rc = font_edit_paint_preview(fedit);
 	if (rc != EOK)
 		return rc;
@@ -334,4 +396,10 @@
 	}
 
+	rc = gfx_glyph_set_pattern(glyph, "A");
+	if (rc != EOK) {
+		printf("Error setting glyph pattern.\n");
+		goto error;
+	}
+
 	rc = gfx_glyph_bmp_open(glyph, &bmp);
 	if (rc != EOK) {
@@ -342,4 +410,6 @@
 	sig_connect(&canvas->position_event, &canvas->widget,
 	    font_edit_pos_event);
+	sig_connect(&canvas->keyboard_event, &canvas->widget,
+	    font_edit_kbd_event);
 
 	fedit->cgc = cgc;
@@ -348,4 +418,5 @@
 	fedit->height = vh;
 	fedit->typeface = tface;
+	fedit->font = font;
 	fedit->glyph = glyph;
 	fedit->gbmp = bmp;
Index: uspace/app/fontedit/fontedit.h
===================================================================
--- uspace/app/fontedit/fontedit.h	(revision e2776ffdf31bd32d05faaf0fc2af21961158e6d2)
+++ uspace/app/fontedit/fontedit.h	(revision a57c70c02b983d06f045f7ca96065e0be8a9c3bd)
@@ -54,4 +54,6 @@
 	/** Typeface */
 	gfx_typeface_t *typeface;
+	/** Font */
+	gfx_font_t *font;
 	/** Glyph */
 	gfx_glyph_t *glyph;
Index: uspace/lib/gfxfont/include/gfx/font.h
===================================================================
--- uspace/lib/gfxfont/include/gfx/font.h	(revision e2776ffdf31bd32d05faaf0fc2af21961158e6d2)
+++ uspace/lib/gfxfont/include/gfx/font.h	(revision a57c70c02b983d06f045f7ca96065e0be8a9c3bd)
@@ -56,5 +56,5 @@
 extern gfx_glyph_t *gfx_font_first_glyph(gfx_font_t *);
 extern gfx_glyph_t *gfx_font_next_glyph(gfx_glyph_t *);
-extern int gfx_font_search_glyph(gfx_font_t *, const char *, gfx_glyph_t **,
+extern errno_t gfx_font_search_glyph(gfx_font_t *, const char *, gfx_glyph_t **,
     size_t *);
 
Index: uspace/lib/gfxfont/include/gfx/glyph.h
===================================================================
--- uspace/lib/gfxfont/include/gfx/glyph.h	(revision e2776ffdf31bd32d05faaf0fc2af21961158e6d2)
+++ uspace/lib/gfxfont/include/gfx/glyph.h	(revision a57c70c02b983d06f045f7ca96065e0be8a9c3bd)
@@ -55,4 +55,5 @@
 extern gfx_glyph_pattern_t *gfx_glyph_next_pattern(gfx_glyph_pattern_t *);
 extern const char *gfx_glyph_pattern_str(gfx_glyph_pattern_t *);
+extern errno_t gfx_glyph_render(gfx_glyph_t *, gfx_coord2_t *);
 
 #endif
Index: uspace/lib/gfxfont/src/font.c
===================================================================
--- uspace/lib/gfxfont/src/font.c	(revision e2776ffdf31bd32d05faaf0fc2af21961158e6d2)
+++ uspace/lib/gfxfont/src/font.c	(revision a57c70c02b983d06f045f7ca96065e0be8a9c3bd)
@@ -248,5 +248,5 @@
  * @return EOK on success, ENOENT if no matching glyph was found
  */
-int gfx_font_search_glyph(gfx_font_t *font, const char *str,
+errno_t gfx_font_search_glyph(gfx_font_t *font, const char *str,
     gfx_glyph_t **rglyph, size_t *rsize)
 {
Index: uspace/lib/gfxfont/src/glyph.c
===================================================================
--- uspace/lib/gfxfont/src/glyph.c	(revision e2776ffdf31bd32d05faaf0fc2af21961158e6d2)
+++ uspace/lib/gfxfont/src/glyph.c	(revision a57c70c02b983d06f045f7ca96065e0be8a9c3bd)
@@ -254,4 +254,18 @@
 }
 
+/** Render glyph to GC.
+ *
+ * @param glyph Glyph
+ * @param pos Position to render to (where glyph origin is placed)
+ */
+errno_t gfx_glyph_render(gfx_glyph_t *glyph, gfx_coord2_t *pos)
+{
+	gfx_coord2_t offs;
+
+	gfx_coord2_subtract(pos, &glyph->origin, &offs);
+
+	return gfx_bitmap_render(glyph->font->bitmap, &glyph->rect, &offs);
+}
+
 /** Transfer glyph to new font bitmap.
  *