diff --git a/lv_core/lv_refr.c b/lv_core/lv_refr.c
index 6bd523306c..593ecab358 100644
--- a/lv_core/lv_refr.c
+++ b/lv_core/lv_refr.c
@@ -260,7 +260,6 @@ static void lv_refr_area_with_vdb(const lv_area_t * area_p)
     /*Calculate the max row num*/
     lv_coord_t w = lv_area_get_width(area_p);
     lv_coord_t h = lv_area_get_height(area_p);
-    lv_coord_t x2;
     lv_coord_t y2 = area_p->y2 >= LV_VER_RES ? y2 = LV_VER_RES - 1 : area_p->y2;
 
     uint32_t max_row = (uint32_t) LV_VDB_SIZE / (w << LV_AA);
diff --git a/lv_objx/lv_btnm.c b/lv_objx/lv_btnm.c
index de6baf08a5..6ade661ba8 100644
--- a/lv_objx/lv_btnm.c
+++ b/lv_objx/lv_btnm.c
@@ -223,6 +223,13 @@ void lv_btnm_set_map(lv_obj_t * btnm, const char ** map)
 			}
 		}
 		act_y += btn_h + style_bg->body.padding.inner;
+
+		/*If no vertical padding then make sure the last row is at the bottom of 'btnm'*/
+		if(style_bg->body.padding.ver == 0  &&
+		   act_y + btn_h * 2 > max_h) {         /*Last row?*/
+		    btn_h = max_h - act_y;
+		}
+
 		if(strlen(map_p_tmp[btn_cnt]) == 0) break; /*Break on end of map*/
 		map_p_tmp = &map_p_tmp[btn_cnt + 1]; /*Set the map to the next line*/
 		i_tot ++;	/*Skip the '\n'*/
diff --git a/lvgl.h b/lvgl.h
index 01900495c3..244c223063 100644
--- a/lvgl.h
+++ b/lvgl.h
@@ -54,9 +54,9 @@ extern "C" {
  *      DEFINES
  *********************/
 /*Current version of LittlevGL*/
-#define LVGL_VERSION_MAJOR  5
-#define LVGL_VERSION_MINOR  0
-#define LVGL_VERSION_PATH   0
+#define LVGL_VERSION_MAJOR   5
+#define LVGL_VERSION_MINOR   0
+#define LVGL_VERSION_PATCH   0
 #define LVGL_VERSION_INFO   "rc-1"
 
 /**********************