diff --git a/GUI/View/Access/IntensityDataPropertyWidget.cpp b/GUI/View/Access/IntensityDataPropertyWidget.cpp
index 469d83349d65912617a1b46d9e05d8cb678f0397..a7df6f199134bfacc01446ee4ca18955e8fe7581 100644
--- a/GUI/View/Access/IntensityDataPropertyWidget.cpp
+++ b/GUI/View/Access/IntensityDataPropertyWidget.cpp
@@ -21,10 +21,10 @@
 #include "GUI/Support/Tool/LayoutUtil.h"
 #include "GUI/View/Numeric/ComboUtil.h"
 #include "GUI/View/Numeric/NumWidgetUtil.h"
+#include "GUI/View/Widget/GroupBoxes.h"
 #include <QCheckBox>
 #include <QDoubleSpinBox>
 #include <QFormLayout>
-#include <QGroupBox>
 #include <QLineEdit>
 
 IntensityDataPropertyWidget::IntensityDataPropertyWidget(QWidget* parent)
@@ -88,8 +88,8 @@ void IntensityDataPropertyWidget::createPanelElements()
         &m_updaters));
 
     // -- x-axis
-    auto* xGroup = new QGroupBox("X axis", this);
-    auto* xFormLayout = new QFormLayout(xGroup);
+    auto* xGroup = new StaticGroupBox("X axis", this);
+    auto* xFormLayout = new QFormLayout(xGroup->body());
     xFormLayout->setSpacing(5);
 
     xFormLayout->addRow("Min:", GUI::Util::createDoubleSpinbox(
@@ -113,8 +113,8 @@ void IntensityDataPropertyWidget::createPanelElements()
     m_mainLayout->addRow(xGroup);
 
     // -- y-axis
-    auto* yGroup = new QGroupBox("Y axis", this);
-    auto* yFormLayout = new QFormLayout(yGroup);
+    auto* yGroup = new StaticGroupBox("Y axis", this);
+    auto* yFormLayout = new QFormLayout(yGroup->body());
     yFormLayout->setSpacing(5);
 
     yFormLayout->addRow("Min:", GUI::Util::createDoubleSpinbox(
@@ -138,8 +138,8 @@ void IntensityDataPropertyWidget::createPanelElements()
     m_mainLayout->addRow(yGroup);
 
     // -- color-axis
-    auto* zGroup = new QGroupBox("Color legend", this);
-    auto* zFormLayout = new QFormLayout(zGroup);
+    auto* zGroup = new StaticGroupBox("Color legend", this);
+    auto* zFormLayout = new QFormLayout(zGroup->body());
     zFormLayout->setSpacing(5);
 
     auto* logRangeSpinbox = GUI::Util::createDoubleSpinbox(
diff --git a/GUI/View/PlotSpecular/SpecularDataPropertyWidget.cpp b/GUI/View/PlotSpecular/SpecularDataPropertyWidget.cpp
index 19e336cf89ef66eb9329f8c288abf25c6a29e021..67e9f82940ef6c5ab98ebe679194527bdf487412 100644
--- a/GUI/View/PlotSpecular/SpecularDataPropertyWidget.cpp
+++ b/GUI/View/PlotSpecular/SpecularDataPropertyWidget.cpp
@@ -21,6 +21,7 @@
 #include "GUI/Support/Tool/LayoutUtil.h"
 #include "GUI/View/Numeric/DoubleSpinBox.h"
 #include "GUI/View/Numeric/NumWidgetUtil.h"
+#include "GUI/View/Widget/GroupBoxes.h"
 #include <QAction>
 #include <QCheckBox>
 #include <QFormLayout>
@@ -57,8 +58,8 @@ void SpecularDataPropertyWidget::createPanelElements()
     */
 
     // -- x-axis
-    auto* xGroup = new QGroupBox("X axis", this);
-    auto* xFormLayout = new QFormLayout(xGroup);
+    auto* xGroup = new StaticGroupBox("X axis", this);
+    auto* xFormLayout = new QFormLayout(xGroup->body());
     xFormLayout->setSpacing(5);
 
     xFormLayout->addRow("Min:", GUI::Util::createDoubleSpinbox(
@@ -82,8 +83,8 @@ void SpecularDataPropertyWidget::createPanelElements()
     m_mainLayout->addRow(xGroup);
 
     // -- y-axis
-    auto* yGroup = new QGroupBox("Y axis", this);
-    auto* yFormLayout = new QFormLayout(yGroup);
+    auto* yGroup = new StaticGroupBox("Y axis", this);
+    auto* yFormLayout = new QFormLayout(yGroup->body());
     yFormLayout->setSpacing(5);
 
     auto* logRangeSpinbox = GUI::Util::createDoubleSpinbox(