Index: src/sas/qtgui/Perspectives/Fitting/ComplexConstraint.py
===================================================================
--- src/sas/qtgui/Perspectives/Fitting/ComplexConstraint.py	(revision 9c207f5e294c8c9187a57802da71a10545960f65)
+++ src/sas/qtgui/Perspectives/Fitting/ComplexConstraint.py	(revision 33c05617b6994eece5b1e65f5d0efaddeb6ae238)
@@ -30,4 +30,8 @@
         self.setupUi(self)
         self.setModal(True)
+
+        # disable the context help icon
+        windowFlags = self.windowFlags()
+        self.setWindowFlags(windowFlags & ~QtCore.Qt.WindowContextHelpButtonHint)
 
         # Useful globals
@@ -61,4 +65,6 @@
         self.cmdOK.clicked.connect(self.onApply)
         self.cmdHelp.clicked.connect(self.onHelp)
+        self.cmdAddAll.clicked.connect(self.onSetAll)
+
         self.txtConstraint.editingFinished.connect(self.validateFormula)
         self.cbModel1.currentIndexChanged.connect(self.onModelIndexChange)
@@ -78,26 +84,14 @@
         self.setupParamWidgets()
 
+
         self.setupMenu()
 
     def setupMenu(self):
-        # Add menu to the Apply button, if necessary
+        # Show Add All button, if necessary
         if self.cbModel1.currentText() ==self.cbModel2.currentText():
-            self.cmdOK.setArrowType(QtCore.Qt.NoArrow)
-            self.cmdOK.setPopupMode(QtWidgets.QToolButton.DelayedPopup)
-            self.cmdOK.setMenu(None)
-            return
-        self.all_menu   = QtWidgets.QMenu()
-        self.actionAddAll = QtWidgets.QAction(self)
-        self.actionAddAll.setObjectName("actionAddAll")
-        self.actionAddAll.setText(QtCore.QCoreApplication.translate("self", "Add all"))
-        ttip = "Add constraints between all identically named parameters in both fitpages"
-        self.actionAddAll.setToolTip(ttip)
-        self.actionAddAll.triggered.connect(self.onSetAll)
-        self.all_menu.addAction(self.actionAddAll)
-        # https://bugreports.qt.io/browse/QTBUG-13663
-        self.all_menu.setToolTipsVisible(True)
-        self.cmdOK.setPopupMode(QtWidgets.QToolButton.MenuButtonPopup)
-        self.cmdOK.setArrowType(QtCore.Qt.DownArrow)
-        self.cmdOK.setMenu(self.all_menu)
+            self.cmdAddAll.setVisible(False)
+        else:
+            self.cmdAddAll.setVisible(True)
+        return
 
     def setupParamWidgets(self):
@@ -127,4 +121,5 @@
         if len(items1)==0:
             self.cmdOK.setEnabled(False)
+            self.cmdAddAll.setEnabled(False)
             txt = "No parameters in model "+self.tab_names[0] +\
                 " are available for constraining."
@@ -132,4 +127,5 @@
         else:
             self.cmdOK.setEnabled(True)
+            self.cmdAddAll.setEnabled(True)
             txt = ""
             self.lblWarning.setText(txt)
@@ -193,7 +189,9 @@
         if not formula_is_valid:
             self.cmdOK.setEnabled(False)
+            self.cmdAddAll.setEnabled(False)
             self.txtConstraint.setStyleSheet("QLineEdit {background-color: red;}")
         else:
             self.cmdOK.setEnabled(True)
+            self.cmdAddAll.setEnabled(True)
             self.txtConstraint.setStyleSheet("QLineEdit {background-color: white;}")
 
Index: src/sas/qtgui/Perspectives/Fitting/ConstraintWidget.py
===================================================================
--- src/sas/qtgui/Perspectives/Fitting/ConstraintWidget.py	(revision bbcf9f0c46ad89e3ba5303bad994014db30bd4ab)
+++ src/sas/qtgui/Perspectives/Fitting/ConstraintWidget.py	(revision 33c05617b6994eece5b1e65f5d0efaddeb6ae238)
@@ -112,4 +112,5 @@
         self.parent = parent
         self.setupUi(self)
+
         self.currentType = "FitPage"
         # Page id for fitting
Index: src/sas/qtgui/Perspectives/Fitting/FittingOptions.py
===================================================================
--- src/sas/qtgui/Perspectives/Fitting/FittingOptions.py	(revision 8873ab7132159e0dd7fa868c07e4eee16ed4d9ff)
+++ src/sas/qtgui/Perspectives/Fitting/FittingOptions.py	(revision 33c05617b6994eece5b1e65f5d0efaddeb6ae238)
@@ -41,4 +41,6 @@
         super(FittingOptions, self).__init__(parent)
         self.setupUi(self)
+        # disable the context help icon
+        self.setWindowFlags(self.windowFlags() & ~QtCore.Qt.WindowContextHelpButtonHint)
 
         self.config = config
Index: src/sas/qtgui/Perspectives/Fitting/GPUOptions.py
===================================================================
--- src/sas/qtgui/Perspectives/Fitting/GPUOptions.py	(revision 133812c7ffae92cd47338d64c4d757261f78a6a6)
+++ src/sas/qtgui/Perspectives/Fitting/GPUOptions.py	(revision 33c05617b6994eece5b1e65f5d0efaddeb6ae238)
@@ -45,4 +45,6 @@
         self.parent = parent
         self.setupUi(self)
+        # disable the context help icon
+        self.setWindowFlags(self.windowFlags() & ~QtCore.Qt.WindowContextHelpButtonHint)
         self.addOpenCLOptions()
         self.createLinks()
Index: src/sas/qtgui/Perspectives/Fitting/MultiConstraint.py
===================================================================
--- src/sas/qtgui/Perspectives/Fitting/MultiConstraint.py	(revision 09e0c32bd64ebeb6310f7132410b87353c04c1d5)
+++ src/sas/qtgui/Perspectives/Fitting/MultiConstraint.py	(revision 33c05617b6994eece5b1e65f5d0efaddeb6ae238)
@@ -10,4 +10,5 @@
 
 from PyQt5 import QtWidgets
+from PyQt5 import QtCore
 
 import sas.qtgui.Utilities.GuiUtils as GuiUtils
@@ -29,4 +30,9 @@
         self.setupUi(self)
         self.setModal(True)
+
+        # disable the context help icon
+        windowFlags = self.windowFlags()
+        self.setWindowFlags(windowFlags & ~QtCore.Qt.WindowContextHelpButtonHint)
+
         self.params = params
         self.parent = parent
Index: src/sas/qtgui/Perspectives/Fitting/UI/ComplexConstraintUI.ui
===================================================================
--- src/sas/qtgui/Perspectives/Fitting/UI/ComplexConstraintUI.ui	(revision 2e5081b2a117b9a669d7a4e9140a869330133676)
+++ src/sas/qtgui/Perspectives/Fitting/UI/ComplexConstraintUI.ui	(revision 33c05617b6994eece5b1e65f5d0efaddeb6ae238)
@@ -139,5 +139,5 @@
        <property name="sizeHint" stdset="0">
         <size>
-         <width>88</width>
+         <width>58</width>
          <height>20</height>
         </size>
@@ -146,5 +146,11 @@
      </item>
      <item>
-      <widget class="QToolButton" name="cmdOK">
+      <widget class="QToolButton" name="cmdAddAll">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
        <property name="minimumSize">
         <size>
@@ -154,4 +160,38 @@
        </property>
        <property name="toolTip">
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Add constraints between all identically named parameters in both fitpages&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+       </property>
+       <property name="text">
+        <string>Add All</string>
+       </property>
+       <property name="popupMode">
+        <enum>QToolButton::InstantPopup</enum>
+       </property>
+       <property name="toolButtonStyle">
+        <enum>Qt::ToolButtonTextOnly</enum>
+       </property>
+       <property name="autoRaise">
+        <bool>false</bool>
+       </property>
+       <property name="arrowType">
+        <enum>Qt::DownArrow</enum>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QToolButton" name="cmdOK">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>93</width>
+         <height>28</height>
+        </size>
+       </property>
+       <property name="toolTip">
         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Add the constraint as defined by the above expression.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
        </property>
@@ -170,14 +210,4 @@
        <property name="arrowType">
         <enum>Qt::DownArrow</enum>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="cmdCancel">
-       <property name="toolTip">
-        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Close the window.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-       </property>
-       <property name="text">
-        <string>Close</string>
        </property>
       </widget>
@@ -195,21 +225,4 @@
  </widget>
  <resources/>
- <connections>
-  <connection>
-   <sender>cmdCancel</sender>
-   <signal>clicked()</signal>
-   <receiver>ComplexConstraintUI</receiver>
-   <slot>reject()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>230</x>
-     <y>144</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>179</x>
-     <y>82</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
+ <connections/>
 </ui>
