diff --git a/src/include/v3270/trace.h b/src/include/v3270/trace.h
index b80d523..6ab5ddc 100644
--- a/src/include/v3270/trace.h
+++ b/src/include/v3270/trace.h
@@ -52,6 +52,9 @@
  LIB3270_EXPORT void				  v3270_trace_vprintf(GtkWidget *widget, const char *fmt, va_list args);
  LIB3270_EXPORT void				  v3270_trace_printf(GtkWidget *widget, const char *fmt, ... );
 
+ LIB3270_EXPORT GtkWidget			* v3270_trace_get_button_box(GtkWidget *widget);
+ LIB3270_EXPORT void				  v3270_trace_button_box_insert(GtkWidget *widget, GtkWidget *button);
+
  LIB3270_EXPORT void				  v3270_trace_save(GtkWidget *widget);
  LIB3270_EXPORT void				  v3270_trace_select_file(GtkWidget *widget);
 
diff --git a/src/testprogram/toolbar.c b/src/testprogram/toolbar.c
index f1f33fe..e74d93c 100644
--- a/src/testprogram/toolbar.c
+++ b/src/testprogram/toolbar.c
@@ -201,7 +201,7 @@
 	GtkWidget * toolbar = gtk_toolbar_new();
 	for(f = 0; f < G_N_ELEMENTS(buttons); f++)
 	{
-		GtkWidget * button = gtk_tool_button_new(gtk_image_new_from_icon_name(buttons[f].icon,GTK_ICON_SIZE_SMALL_TOOLBAR),"-");
+		GtkWidget * button = GTK_WIDGET(gtk_tool_button_new(gtk_image_new_from_icon_name(buttons[f].icon,GTK_ICON_SIZE_SMALL_TOOLBAR),"-"));
 
 		gtk_widget_set_tooltip_markup(button,buttons[f].tooltip);
 		g_signal_connect(G_OBJECT(button),"clicked",buttons[f].callback,terminal);
diff --git a/src/trace/trace.c b/src/trace/trace.c
index 63d0b19..563469b 100644
--- a/src/trace/trace.c
+++ b/src/trace/trace.c
@@ -316,10 +316,32 @@
  }
 
 
+ LIB3270_EXPORT GtkWidget * v3270_trace_get_button_box(GtkWidget *widget)
+ {
+	g_return_val_if_fail(GTK_IS_V3270_TRACE(widget),NULL);
+
+	return GTK_V3270_TRACE(widget)->buttons;
+
+ }
+
+ LIB3270_EXPORT void v3270_trace_button_box_insert(GtkWidget *widget, GtkWidget *button)
+ {
+	g_return_if_fail(GTK_IS_V3270_TRACE(widget));
+
+	gtk_widget_set_can_focus(button,FALSE);
+	gtk_widget_set_can_default(button,FALSE);
+
+#if GTK_CHECK_VERSION(3,20,0)
+	gtk_widget_set_focus_on_click(button,FALSE);
+#endif // GTK 3,20,0
+
+	gtk_box_pack_start(GTK_BOX(GTK_V3270_TRACE(widget)->buttons),button,FALSE,FALSE,0);
+
+ }
+
  LIB3270_EXPORT	GtkWidget * v3270_trace_new(GtkWidget *terminal)
  {
 	g_return_val_if_fail(GTK_IS_V3270(terminal),NULL);
-
 	V3270Trace * widget = GTK_V3270_TRACE(g_object_new(GTK_TYPE_V3270_TRACE, NULL));
 
 	// Set terminal widget
@@ -346,7 +368,7 @@
 			gtk_widget_set_focus_on_click(item,FALSE);
 #endif // GTK 3,20,0
 
-			gtk_box_pack_start(GTK_BOX(widget->buttons),item,FALSE,FALSE,4);
+			gtk_box_pack_start(GTK_BOX(widget->buttons),item,FALSE,FALSE,0);
 
 		}
 	}
--
libgit2 0.21.2