Index: src/tracker-search-tool/tracker-search-tool.c
===================================================================
--- src/tracker-search-tool/tracker-search-tool.c	(revision 485)
+++ src/tracker-search-tool/tracker-search-tool.c	(working copy)
@@ -1570,17 +1570,17 @@
 	GtkWidget * label;
 	GtkWidget * vbox;
 	GtkWidget * hbox;
-//	GtkWidget * widget;
+	GtkWidget * widget;
 	GtkWidget * image;
-//	GtkWidget * buttonbox;
+	GtkWidget * buttonbox;
 	GtkWidget * toolbar;
 	GtkIconSize toolbar_icon_size;
 //	GtkWidget *toggletoolbutton;
-  	GtkWidget *separatortoolitem;
+//  	GtkWidget *separatortoolitem;
   	GtkWidget *toolitem;
 //	GtkWidget *vseparator;
-	GtkWidget *toolbutton2;
-	GtkWidget *toolbutton;
+//	GtkWidget *toolbutton2;
+//	GtkWidget *toolbutton;
 
 	GtkWidget * window;
 	GtkTreeViewColumn * column;
@@ -1635,8 +1635,7 @@
 	gsearch->count_label = gtk_label_new ("");
 	gtk_widget_show (gsearch->count_label);
 	gtk_container_add (GTK_CONTAINER (toolitem), gsearch->count_label);
-
-
+/*
 	image = gtk_image_new_from_stock ("gtk-go-back", toolbar_icon_size);
 	gtk_widget_show (image);
 	toolbutton2 = (GtkWidget*) gtk_tool_button_new (image, "Previous");
@@ -1656,30 +1655,32 @@
 	g_signal_connect (G_OBJECT (gsearch->forward_button), "clicked",
 	                  G_CALLBACK (next_button_cb), (gpointer) gsearch);
 
-/*	
+	
 	label = gtk_label_new_with_mnemonic (_("Showing hits 1..10 of 127"));
 	g_object_set (G_OBJECT (label), "xalign", 0.5, NULL);
 	gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0);
-
+*/
 	buttonbox = gtk_hbutton_box_new ();
 	gtk_button_box_set_layout (GTK_BUTTON_BOX (buttonbox), GTK_BUTTONBOX_END);
 	gtk_box_set_spacing (GTK_BOX (buttonbox), 6);
 	gtk_box_pack_start (GTK_BOX (hbox), buttonbox, FALSE, FALSE, 0);
 
 	widget = gtk_button_new_with_mnemonic (_("_Previous"));
+	gtk_button_set_relief (GTK_BUTTON (widget), GTK_RELIEF_NONE);
 	image = gtk_image_new_from_stock (GTK_STOCK_GO_BACK, GTK_ICON_SIZE_BUTTON);
 	gtk_button_set_image (GTK_BUTTON (widget), image);
 	gsearch->back_button = widget;
 	g_signal_connect (G_OBJECT (gsearch->back_button), "clicked",
-	                  G_CALLBACK (click_find_cb), (gpointer) gsearch);
+	                  G_CALLBACK (prev_button_cb), (gpointer) gsearch);
 	gtk_container_add (GTK_CONTAINER (buttonbox), widget);
 
 	widget = gtk_button_new_with_mnemonic (_("_Next"));
+	gtk_button_set_relief (GTK_BUTTON (widget), GTK_RELIEF_NONE);
 	image = gtk_image_new_from_stock (GTK_STOCK_GO_FORWARD, GTK_ICON_SIZE_BUTTON);
 	gtk_button_set_image (GTK_BUTTON (widget), image);
 	gsearch->forward_button = widget;
 	g_signal_connect (G_OBJECT (gsearch->forward_button), "clicked",
-	                  G_CALLBACK (click_find_cb), (gpointer) gsearch);
+	                  G_CALLBACK (next_button_cb), (gpointer) gsearch);
 
 	gtk_container_add (GTK_CONTAINER (buttonbox), widget);
 
@@ -2195,14 +2196,16 @@
 	}
 	
 	if (count > 5) {
-		label_str = g_strdup_printf ("%s %d..%d of %d ", _("Showing results"), from, to, count);
+		label_str = g_strdup_printf ("%s %d..%d of %d          ", _("Showing results"), from, to, count);
 	} else {
 		if (count != 1) {
-			label_str = g_strdup_printf ("%s %d %s", _("Showing"), count, _("results"));
+			label_str = g_strdup_printf ("%s %d %s          ", _("Showing"), count, _("results"));
 		} else {
-			label_str = g_strdup_printf ("%s %d %s", _("Showing"), count, _("result"));
+			label_str = g_strdup_printf ("%s %d %s          ", _("Showing"), count, _("result"));
 		}
 	}
+
+
 	gtk_label_set_text (GTK_LABEL (gsearch->count_label), label_str);
 	g_free (label_str);