diff --git a/gramps2/src/family48.png b/gramps2/src/family48.png
index 586d2ecf4..aa6bf618f 100644
Binary files a/gramps2/src/family48.png and b/gramps2/src/family48.png differ
diff --git a/gramps2/src/gramps.glade b/gramps2/src/gramps.glade
index d4028d6e6..66079149b 100644
--- a/gramps2/src/gramps.glade
+++ b/gramps2/src/gramps.glade
@@ -804,7 +804,7 @@
 		  <property name="tooltip" translatable="yes">Run a tool</property>
 		  <property name="label" translatable="yes">Tools</property>
 		  <property name="use_underline">True</property>
-		  <property name="stock_pixmap">gtk-execute</property>
+		  <property name="icon">tools.png</property>
 		  <signal name="clicked" handler="on_tools_clicked"/>
 		</widget>
 	      </child>
diff --git a/gramps2/src/gramps_main.py b/gramps2/src/gramps_main.py
index f5260ccc4..10567df4a 100755
--- a/gramps2/src/gramps_main.py
+++ b/gramps2/src/gramps_main.py
@@ -374,6 +374,8 @@ class Gramps:
         self.addbtn = self.gtop.get_widget('addbtn')
         self.removebtn = self.gtop.get_widget('removebtn')
         self.editbtn = self.gtop.get_widget('editbtn')
+        self.backbtn = self.gtop.get_widget('back_btn')
+        self.fwdbtn = self.gtop.get_widget('fwd_btn')
 
         self.gtop.signal_autoconnect({
             "on_back_clicked" : self.back_clicked,
@@ -464,9 +466,18 @@ class Gramps:
                 self.hindex -= 1
                 self.active_person = self.db.getPerson(self.history[self.hindex])
                 self.modify_statusbar()
-                self.goto_active_person()
+                self.update_display(0)
+                self.set_buttons(1)
+                if self.hindex == 0:
+                    self.backbtn.set_sensitive(0)
+                else:
+                    self.backbtn.set_sensitive(1)
+                self.fwdbtn.set_sensitive(1)
             except:
                 self.set_buttons(0)
+        else:
+            self.backbtn.set_sensitive(0)
+            self.fwdbtn.set_sensitive(1)
 
     def fwd_clicked(self,obj):
         if self.hindex+1 < len(self.history):
@@ -474,10 +485,19 @@ class Gramps:
                 self.hindex += 1
                 self.active_person = self.db.getPerson(self.history[self.hindex])
                 self.modify_statusbar()
-                self.goto_active_person()
+                self.update_display(0)
                 self.set_buttons(1)
+                if self.hindex == len(self.history)-1:
+                    self.fwdbtn.set_sensitive(0)
+                else:
+                    self.fwdbtn.set_sensitive(1)
+                self.backbtn.set_sensitive(1)
             except:
+                self.backbtn.set_sensitive(1)
                 self.set_buttons(0)
+        else:
+            self.fwdbtn.set_sensitive(0)
+            self.backbtn.set_sensitive(1)
 
     def change_alpha_page(self,obj,junk,page):
         """Change the page. Be careful not to take action while the pages
@@ -877,7 +897,6 @@ class Gramps:
     def update_display(self,changed):
         """Incremental display update, update only the displayed page"""
         page = self.views.get_current_page()
-        
         if page == 0:
             if changed:
                 self.apply_filter()
@@ -1467,8 +1486,12 @@ class Gramps:
             if person:
                 if self.hindex+1 < len(self.history):
                     self.history = self.history[0:self.hindex+1]
+                    self.fwdbtn.set_sensitive(1)
+                else:
+                    self.fwdbtn.set_sensitive(0)
                 self.history.append(person.getId())
                 self.hindex += 1
+                self.backbtn.set_sensitive(1)
                     
         if person:
             self.set_buttons(1)
diff --git a/gramps2/src/people48.png b/gramps2/src/people48.png
index 284f5a6c0..b9d60f69c 100644
Binary files a/gramps2/src/people48.png and b/gramps2/src/people48.png differ
diff --git a/gramps2/src/tools.png b/gramps2/src/tools.png
new file mode 100644
index 000000000..f3e8bfd4f
Binary files /dev/null and b/gramps2/src/tools.png differ