diff --git a/src/c/neat_bar.c b/src/c/neat_bar.c
index ee3a24e..26d6188 100644
--- a/src/c/neat_bar.c
+++ b/src/c/neat_bar.c
@@ -8,6 +8,10 @@
 const uint16_t UP_Y = 45;
 const uint16_t SELECT_Y = 105;
 const uint16_t DOWN_Y = 165;
+#elif PBL_PLATFORM_GABBRO // TODO Improve button positions (validate against official)
+const uint16_t UP_Y = 90;
+const uint16_t SELECT_Y = 121;
+const uint16_t DOWN_Y = 160;
 #else
 const uint16_t UP_Y = 50;
 const uint16_t SELECT_Y = 90;
diff --git a/src/c/neat_bar.h b/src/c/neat_bar.h
index 6896d2c..681ff7a 100644
--- a/src/c/neat_bar.h
+++ b/src/c/neat_bar.h
@@ -26,7 +26,6 @@ typedef struct {
 NeatBarLayer *neat_bar_layer_create();
 void neat_bar_layer_set_icon(NeatBarLayer *layer, ButtonId button_id, GBitmap *icon);
 void neat_bar_layer_set_theme_default_rect(NeatBarLayer *neat_bar);
-void neat_bar_layer_set_theme_default_round(NeatBarLayer *neat_bar);
 void neat_bar_layer_set_theme_legacy_rect(NeatBarLayer *neat_bar);
 void neat_bar_layer_set_floating(NeatBarLayer *neat_bar, bool floating);
 void neat_bar_layer_set_corner_radius(NeatBarLayer *neat_bar, uint16_t corner_radius);