diff --git a/src/ui/qgsexpressionbuilder.ui b/src/ui/qgsexpressionbuilder.ui
index 16cd1527aa0..19409f03541 100644
--- a/src/ui/qgsexpressionbuilder.ui
+++ b/src/ui/qgsexpressionbuilder.ui
@@ -35,7 +35,7 @@
    <item row="0" column="0">
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
-      <number>0</number>
+      <number>1</number>
      </property>
      <property name="documentMode">
       <bool>true</bool>
@@ -582,13 +582,23 @@
          </property>
          <item>
           <widget class="QToolButton" name="btnRun">
+           <property name="toolTip">
+            <string>Run the current editor text in QGIS (also saves current script). 
+
+Use this when testing your functions.
+
+Saved scripts are auto loaded on QGIS startup.</string>
+           </property>
            <property name="text">
-            <string>...</string>
+            <string>Run Script</string>
            </property>
            <property name="icon">
             <iconset resource="../../images/images.qrc">
              <normaloff>:/images/themes/default/console/iconRunScriptConsole.png</normaloff>:/images/themes/default/console/iconRunScriptConsole.png</iconset>
            </property>
+           <property name="toolButtonStyle">
+            <enum>Qt::ToolButtonTextUnderIcon</enum>
+           </property>
            <property name="autoRaise">
             <bool>true</bool>
            </property>
@@ -612,13 +622,21 @@
          </item>
          <item>
           <widget class="QToolButton" name="btnNewFile">
+           <property name="toolTip">
+            <string>Create a new function file based on the template file.
+
+Change the name of the script and save to allow QGIS to auto load on startup.</string>
+           </property>
            <property name="text">
-            <string>New</string>
+            <string>New file</string>
            </property>
            <property name="icon">
             <iconset resource="../../images/images.qrc">
              <normaloff>:/images/themes/default/console/iconTabEditorConsole.png</normaloff>:/images/themes/default/console/iconTabEditorConsole.png</iconset>
            </property>
+           <property name="toolButtonStyle">
+            <enum>Qt::ToolButtonTextUnderIcon</enum>
+           </property>
            <property name="autoRaise">
             <bool>true</bool>
            </property>
@@ -632,6 +650,11 @@
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
+           <property name="toolTip">
+            <string>Name of the file to save. 
+
+Existing files are listed here and loaded when selected.</string>
+           </property>
            <property name="editable">
             <bool>true</bool>
            </property>
@@ -639,13 +662,19 @@
          </item>
          <item>
           <widget class="QToolButton" name="btnSaveFile">
+           <property name="toolTip">
+            <string>Save the current script into the users function file folder.</string>
+           </property>
            <property name="text">
-            <string>Save</string>
+            <string>Save file</string>
            </property>
            <property name="icon">
             <iconset resource="../../images/images.qrc">
              <normaloff>:/images/themes/default/console/iconSaveConsole.png</normaloff>:/images/themes/default/console/iconSaveConsole.png</iconset>
            </property>
+           <property name="toolButtonStyle">
+            <enum>Qt::ToolButtonTextUnderIcon</enum>
+           </property>
            <property name="autoRaise">
             <bool>true</bool>
            </property>