diff --git a/gramps/gen/config.py b/gramps/gen/config.py
index 89ebc1993..d735d9927 100644
--- a/gramps/gen/config.py
+++ b/gramps/gen/config.py
@@ -217,6 +217,7 @@ register('interface.sidebar-text', True)
 register('interface.size-checked', False)
 register('interface.statusbar', 1)
 register('interface.toolbar-on', True)
+register('interface.toolbar-text', False)
 register('interface.view', True)
 register('interface.surname-box-height', 150)
 register('interface.treemodel-cache-size', 1000)
diff --git a/gramps/gui/uimanager.py b/gramps/gui/uimanager.py
index c272bccc6..ecf9d6f59 100644
--- a/gramps/gui/uimanager.py
+++ b/gramps/gui/uimanager.py
@@ -24,6 +24,7 @@ A replacement UIManager and ActionGroup.
 
 import copy
 import sys
+from ..gen.config import config
 import logging
 import xml.etree.ElementTree as ET
 
@@ -232,6 +233,8 @@ class UIManager():
         tb_show = toolbar.get_visible()
         toolbar_parent.remove(toolbar)
         toolbar = self.builder.get_object("ToolBar")  # new toolbar
+        if config.get('interface.toolbar-text'):
+            toolbar.set_style(Gtk.ToolbarStyle.BOTH)
         toolbar_parent.pack_start(toolbar, False, True, 0)
         if tb_show:
             toolbar.show_all()