diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index 8e9e77b18..88bfe6e13 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,4 +1,6 @@
 2006-04-27  Don Allingham  <don@gramps-project.org>
+	* src/ViewManager.py: fix top on Config.set calls
+	* data/gramps.schemas.in: remove toolbar, now unused
 	* src/TipOfDay.py (TipOfDay.__init__): switch to ManagedWindow
 	* src/Editors/_EditFamily.py: provide add new parent option
 	* src/Editors/_EditEvent.py: used set_window
diff --git a/gramps2/data/gramps.schemas.in b/gramps2/data/gramps.schemas.in
index 3dd2281a8..1248411e6 100644
--- a/gramps2/data/gramps.schemas.in
+++ b/gramps2/data/gramps.schemas.in
@@ -483,20 +483,6 @@
         </locale>
       </schema>
 
-      <schema>
-        <key>/schemas/apps/gramps/interface/toolbar</key>
-        <applyto>/apps/gramps/interface/toolbar</applyto>
-        <owner>gramps</owner>
-        <type>int</type>
-        <default>-1</default>
-        <locale name="C">
-          <short>Default toolbar style</short>
-          <long>This key determines the style of the toolbar.
-          Use 0 for icons only, 1 for text only, 2 for text below images, 
-          3 for text beside images, and -1 for the current GNOME style.</long>
-        </locale>
-      </schema>
-
       <schema>
         <key>/schemas/apps/gramps/interface/toolbar-on</key>
         <applyto>/apps/gramps/interface/toolbar-on</applyto>
diff --git a/gramps2/src/ViewManager.py b/gramps2/src/ViewManager.py
index 43a7b7eea..8506d35a0 100644
--- a/gramps2/src/ViewManager.py
+++ b/gramps2/src/ViewManager.py
@@ -215,7 +215,7 @@ class ViewManager:
         hbox.show_all()
 
         self.show_sidebar = Config.get(Config.VIEW)
-        self.show_toolbar = Config.get(Config.TOOLBAR)
+        self.show_toolbar = Config.get(Config.TOOLBAR_ON)
 
         self.notebook = gtk.Notebook()
         self.notebook.set_show_tabs(False)
@@ -508,20 +508,20 @@ class ViewManager:
         if obj.get_active():
             self.ebox.show()
             self.notebook.set_show_tabs(False)
-            Config.set(Config.VIEW)
+            Config.set(Config.VIEW, True)
         else:
             self.ebox.hide()
             self.notebook.set_show_tabs(True)
-            Config.set(Config.VIEW)
+            Config.set(Config.VIEW, False)
         Config.sync()
 
     def toolbar_toggle(self, obj):
         if obj.get_active():
             self.toolbar.show()
-            Config.set(Config.TOOLBAR)
+            Config.set(Config.TOOLBAR_ON, True)
         else:
             self.toolbar.hide()
-            Config.set(Config.TOOLBAR)
+            Config.set(Config.TOOLBAR_ON, False)
         Config.sync()
 
     def register_view(self, view):