diff --git a/sdrgui/gui/glspectrumgui.ui b/sdrgui/gui/glspectrumgui.ui
index 85c249475..ed85ee9af 100644
--- a/sdrgui/gui/glspectrumgui.ui
+++ b/sdrgui/gui/glspectrumgui.ui
@@ -564,7 +564,7 @@
         </iconset>
        </property>
        <property name="checkable">
-        <bool>true</bool>
+        <bool>false</bool>
        </property>
       </widget>
      </item>
diff --git a/sdrgui/gui/spectrummarkersdialog.cpp b/sdrgui/gui/spectrummarkersdialog.cpp
index 8309d8cb6..7461cdcec 100644
--- a/sdrgui/gui/spectrummarkersdialog.cpp
+++ b/sdrgui/gui/spectrummarkersdialog.cpp
@@ -110,6 +110,8 @@ void SpectrumMarkersDialog::displayHistogramMarker()
         ui->markerColor->setStyleSheet(tr("QLabel { background-color : rgb(%1,%2,%3); }").arg(r).arg(g).arg(b));
         ui->showMarker->setChecked(m_histogramMarkers[m_histogramMarkerIndex].m_show);
     }
+    ui->fixedPower->setVisible(m_histogramMarkers[m_histogramMarkerIndex].m_markerType == SpectrumHistogramMarker::SpectrumMarkerTypeManual);
+    ui->fixedPowerUnits->setVisible(m_histogramMarkers[m_histogramMarkerIndex].m_markerType == SpectrumHistogramMarker::SpectrumMarkerTypeManual);
 
     ui->markerFrequency->blockSignals(false);
     ui->centerFrequency->blockSignals(false);
@@ -380,6 +382,9 @@ void SpectrumMarkersDialog::on_powerMode_currentIndexChanged(int index)
 
     SpectrumHistogramMarker::SpectrumMarkerType newType = (SpectrumHistogramMarker::SpectrumMarkerType) index;
 
+    ui->fixedPower->setVisible(newType == SpectrumHistogramMarker::SpectrumMarkerTypeManual);
+    ui->fixedPowerUnits->setVisible(newType == SpectrumHistogramMarker::SpectrumMarkerTypeManual);
+
     if ((m_histogramMarkers[m_histogramMarkerIndex].m_markerType != newType)
        && (newType == SpectrumHistogramMarker::SpectrumMarkerTypePowerMax))
     {
diff --git a/sdrgui/gui/spectrummarkersdialog.ui b/sdrgui/gui/spectrummarkersdialog.ui
index 366cf5cd9..507e165ec 100644
--- a/sdrgui/gui/spectrummarkersdialog.ui
+++ b/sdrgui/gui/spectrummarkersdialog.ui
@@ -35,6 +35,9 @@
       <attribute name="title">
        <string>Hist</string>
       </attribute>
+      <attribute name="toolTip">
+       <string>Histogram (spectrum line) markers</string>
+      </attribute>
       <widget class="QWidget" name="layoutWidget">
        <property name="geometry">
         <rect>
@@ -413,6 +416,11 @@
               <height>16777215</height>
              </size>
             </property>
+            <property name="toolTip">
+             <string>Man - Set marker power to fixed level
+Cur - Marker will move according to current power at the marker frequency
+Max - Marker will move according to the maximum power at the marker frequency</string>
+            </property>
             <item>
              <property name="text">
               <string>Man</string>
@@ -499,6 +507,9 @@
       <attribute name="title">
        <string>Wat</string>
       </attribute>
+      <attribute name="toolTip">
+       <string>Waterfall markers</string>
+      </attribute>
       <widget class="QWidget" name="layoutWidget">
        <property name="geometry">
         <rect>
@@ -1015,6 +1026,9 @@
       <attribute name="title">
        <string>Anno</string>
       </attribute>
+      <attribute name="toolTip">
+       <string>Annotation markers</string>
+      </attribute>
       <widget class="QWidget" name="layoutWidget_2">
        <property name="geometry">
         <rect>
@@ -1712,7 +1726,11 @@
      <item>
       <widget class="QComboBox" name="showSelect">
        <property name="toolTip">
-        <string>Select which set of markers to show</string>
+        <string>Select which set of markers to show
+
+None - Hide all markers
+Spec - Show histogram and waterfall markers
+Anno - Show annotation markers</string>
        </property>
        <item>
         <property name="text">