diff --git a/neat_bar b/neat_bar
index 147a230..1f07cf7 160000
--- a/neat_bar
+++ b/neat_bar
@@ -1 +1 @@
-Subproject commit 147a230c977b07904551f5678fe4cc3c61afb3fa
+Subproject commit 1f07cf7563955c7a58c712d7128626f84c333ac3
diff --git a/resources/reset.png b/resources/reset.png
index d178b82..b221625 100644
Binary files a/resources/reset.png and b/resources/reset.png differ
diff --git a/src/c/main.c b/src/c/main.c
index 665ba62..ae416ee 100644
--- a/src/c/main.c
+++ b/src/c/main.c
@@ -73,16 +73,25 @@ void window_load(Window *window) {
 	neat_bar_layer_set_icon(s_neat_bar_layer, BUTTON_ID_SELECT, s_action_icon_plus);
 	neat_bar_layer_set_icon(s_neat_bar_layer, BUTTON_ID_DOWN, s_action_icon_minus);
 #if PBL_RECT
-	neat_bar_layer_set_corner_radius(s_neat_bar_layer, 3);
-	neat_bar_layer_set_height(s_neat_bar_layer, PBL_DISPLAY_HEIGHT - 28);
-	neat_bar_layer_set_y_offset(s_neat_bar_layer, 24);
+	neat_bar_layer_set_rect_bar_corner_radius(s_neat_bar_layer, 3);
+#if PBL_DISPLAY_HEIGHT >= 228
+	neat_bar_layer_set_bar_height(s_neat_bar_layer, PBL_DISPLAY_HEIGHT - 28);
+	neat_bar_layer_set_bar_y_offset(s_neat_bar_layer, 24);
+#else
+	neat_bar_layer_set_bar_width(s_neat_bar_layer, ACTION_BAR_WIDTH - 10);
+	neat_bar_layer_set_bar_height(s_neat_bar_layer, PBL_DISPLAY_HEIGHT - 22);
+	neat_bar_layer_set_bar_y_offset(s_neat_bar_layer, 19);
+	neat_bar_layer_set_icons_x_offset(s_neat_bar_layer, 0);
+	neat_bar_layer_set_icons_y_offset(s_neat_bar_layer, 8);
+	neat_bar_layer_set_icons_spread(s_neat_bar_layer, 48);
+	neat_bar_layer_set_animations_move_distance(s_neat_bar_layer, 2);
+#endif
 #endif
 	neat_bar_layer_add_to_window(s_neat_bar_layer, window);
 
 	GRect bounds = layer_get_frame(window_layer);
-	const int16_t width = layer_get_frame(window_layer).size.w - ACTION_BAR_WIDTH;
 
-	s_text_layer = text_layer_create(GRect(0, PBL_DISPLAY_HEIGHT / 2 - 27, width, bounds.size.h));
+	s_text_layer = text_layer_create(GRect(0, PBL_DISPLAY_HEIGHT / 2 - 19, PBL_DISPLAY_WIDTH - 20, bounds.size.h));
 	text_layer_set_font(s_text_layer, fonts_get_system_font(FONT_KEY_BITHAM_42_BOLD));
 	text_layer_set_background_color(s_text_layer, GColorClear);
 	update();