diff --git a/src/Mod/Draft/DraftGui.py b/src/Mod/Draft/DraftGui.py
index 2d5e97544..cd5b00a53 100644
--- a/src/Mod/Draft/DraftGui.py
+++ b/src/Mod/Draft/DraftGui.py
@@ -276,14 +276,17 @@ class DraftToolBar:
 #---------------------------------------------------------------------------
 
     def _pushbutton (self,name, layout, hide=True, icon=None, width=66, checkable=False):
+        p = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/General")
+        bsize = p.GetInt("ToolbarIconSize",24)+2
+        isize = p.GetInt("ToolbarIconSize",24)/3*2
         button = QtGui.QPushButton(self.baseWidget)
         button.setObjectName(name)
-        button.setMaximumSize(QtCore.QSize(width,26))
+        button.setMaximumSize(QtCore.QSize(width,bsize))
         if hide:
             button.hide()
         if icon:
             button.setIcon(QtGui.QIcon(':/icons/'+icon+'.svg'))
-            button.setIconSize(QtCore.QSize(16, 16))
+            button.setIconSize(QtCore.QSize(isize, isize))
         if checkable:
             button.setCheckable(True)
             button.setChecked(False)
@@ -298,20 +301,24 @@ class DraftToolBar:
         return label
 
     def _lineedit (self,name, layout, hide=True, width=None):
+        p = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/General")
+        bsize = p.GetInt("ToolbarIconSize",24)-2
         lineedit = DraftLineEdit(self.baseWidget)
         lineedit.setObjectName(name)
         if hide: lineedit.hide()
         if not width: width = 800
-        lineedit.setMaximumSize(QtCore.QSize(width,22))
+        lineedit.setMaximumSize(QtCore.QSize(width,bsize))
         layout.addWidget(lineedit)
         return lineedit
 
     def _inputfield (self,name, layout, hide=True, width=None):
+        p = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/General")
+        bsize = p.GetInt("ToolbarIconSize",24)-2
         inputfield = self.uiloader.createWidget("Gui::InputField")
         inputfield.setObjectName(name)
         if hide: inputfield.hide()
         if not width: width = 800
-        inputfield.setMaximumSize(QtCore.QSize(width,22))
+        inputfield.setMaximumSize(QtCore.QSize(width,bsize))
         layout.addWidget(inputfield)
         return inputfield
 
diff --git a/src/Mod/Draft/DraftSnap.py b/src/Mod/Draft/DraftSnap.py
index 9e1a47739..7f9056279 100644
--- a/src/Mod/Draft/DraftSnap.py
+++ b/src/Mod/Draft/DraftSnap.py
@@ -1067,14 +1067,17 @@ class Snapper:
 
     def makeSnapToolBar(self):
         "builds the Snap toolbar"
+        p = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/General")
+        bsize = p.GetInt("ToolbarIconSize",24)+2
+        isize = p.GetInt("ToolbarIconSize",24)/3*2
         self.toolbar = QtGui.QToolBar(None)
         self.toolbar.setObjectName("Draft Snap")
         self.toolbar.setWindowTitle(QtCore.QCoreApplication.translate("Workbench", "Draft Snap"))
         self.toolbarButtons = []
         self.masterbutton = QtGui.QPushButton(None)
         self.masterbutton.setIcon(QtGui.QIcon(":/icons/Snap_Lock.svg"))
-        self.masterbutton.setIconSize(QtCore.QSize(16, 16))
-        self.masterbutton.setMaximumSize(QtCore.QSize(26,26))
+        self.masterbutton.setIconSize(QtCore.QSize(isize, isize))
+        self.masterbutton.setMaximumSize(QtCore.QSize(bsize,bsize))
         self.masterbutton.setToolTip("Snap On/Off")
         self.masterbutton.setObjectName("SnapButtonMain")
         self.masterbutton.setCheckable(True)
@@ -1085,8 +1088,8 @@ class Snapper:
             if i:
                 b = QtGui.QPushButton(None)
                 b.setIcon(QtGui.QIcon(i))
-                b.setIconSize(QtCore.QSize(16, 16))
-                b.setMaximumSize(QtCore.QSize(26,26))
+                b.setIconSize(QtCore.QSize(isize, isize))
+                b.setMaximumSize(QtCore.QSize(bsize,bsize))
                 b.setToolTip(c)
                 b.setObjectName("SnapButton"+c)
                 b.setCheckable(True)
@@ -1098,8 +1101,8 @@ class Snapper:
         for n in ["Dimensions","WorkingPlane"]:
             b = QtGui.QPushButton(None)
             b.setIcon(QtGui.QIcon(":/icons/Snap_"+n+".svg"))
-            b.setIconSize(QtCore.QSize(16, 16))
-            b.setMaximumSize(QtCore.QSize(26,26))
+            b.setIconSize(QtCore.QSize(isize, isize))
+            b.setMaximumSize(QtCore.QSize(bsize,bsize))
             b.setToolTip(n)
             b.setObjectName("SnapButton"+n)
             b.setCheckable(True)