diff --git a/drw.c b/drw.c
index 570f383..f8c4613 100644
--- a/drw.c
+++ b/drw.c
@@ -49,13 +49,13 @@ drw_draw_text(struct drwsurf *d, Color color, uint32_t x, uint32_t y,
 	if (width < (w - (b*2))) {
 		cairo_rel_move_to(d->cairo, - width / 2, 0);
 	} else {
-		cairo_rel_move_to(d->cairo, - w / 2 + b, 0);
+		cairo_rel_move_to(d->cairo, - (w / 2) + b, 0);
 	}
 
 	if (height < (h - (b*2))) {
 		cairo_rel_move_to(d->cairo, 0, - height / 2);
 	} else {
-		cairo_rel_move_to(d->cairo, 0, - h / 2);
+		cairo_rel_move_to(d->cairo, 0, - (h / 2) + b);
 	}
 
 	pango_cairo_show_layout(d->cairo, d->layout);
diff --git a/keyboard.c b/keyboard.c
index a04597d..18e2073 100644
--- a/keyboard.c
+++ b/keyboard.c
@@ -521,13 +521,10 @@ kbd_draw_key(struct kbd *kb, struct key *k, enum key_draw_type type) {
 	drw_draw_text(d, scheme->text, k->x, k->y, k->w, k->h, KBD_KEY_BORDER, label);
 
 	// cleanup cairo mess right side if words too long
-	uint32_t right_part_x = k->x + k->w - 2 * KBD_KEY_BORDER;
-	drw_do_rectangle(d, kb->scheme.bg, right_part_x, k->y,
-		kb->w - right_part_x, k->h, false);
-
-	uint32_t bottom_part_y = k->y + k->h - 1 * KBD_KEY_BORDER;
-	drw_do_rectangle(d, kb->scheme.bg, k->x, bottom_part_y,
-		kb->h - bottom_part_y, k->w, false);
+	drw_do_rectangle(d, kb->scheme.bg, k->x + k->w - KBD_KEY_BORDER, k->y,
+		kb->w, k->h, false);
+	drw_do_rectangle(d, kb->scheme.bg, k->x, k->y + k->h - KBD_KEY_BORDER,
+		kb->h, k->w, false);
 
 	wl_surface_damage(d->surf, k->x, k->y, k->w, k->h);
 }