diff --git a/OpenRGB.pro b/OpenRGB.pro
index e48d44ec..7b967491 100644
--- a/OpenRGB.pro
+++ b/OpenRGB.pro
@@ -154,7 +154,6 @@ HEADERS +=
     DeviceDetector.h                                                                            \
     filesystem.h                                                                                \
     qt/DetectorTableModel.h                                                                     \
-    qt/DeviceTabHeader.h                                                                        \
     qt/OpenRGBClientInfoPage.h                                                                  \
     qt/OpenRGBDeviceInfoPage.h                                                                  \
     qt/OpenRGBDevicePage.h                                                                      \
@@ -179,6 +178,7 @@ HEADERS +=
     qt/OpenRGBQMKORGBSettingsPage/OpenRGBQMKORGBSettingsPage.h                                  \
     qt/OpenRGBSerialSettingsPage/OpenRGBSerialSettingsEntry.h                                   \
     qt/OpenRGBSerialSettingsPage/OpenRGBSerialSettingsPage.h                                    \
+    qt/TabLabel.h                                                                               \
     serial_port/find_usb_serial_port.h                                                          \
     serial_port/serial_port.h                                                                   \
     super_io/super_io.h                                                                         \
@@ -468,7 +468,6 @@ SOURCES +=
     ResourceManager.cpp                                                                         \
     SettingsManager.cpp                                                                         \
     qt/DetectorTableModel.cpp                                                                   \
-    qt/DeviceTabHeader.cpp                                                                      \
     qt/OpenRGBClientInfoPage.cpp                                                                \
     qt/OpenRGBDeviceInfoPage.cpp                                                                \
     qt/OpenRGBDevicePage.cpp                                                                    \
@@ -486,6 +485,7 @@ SOURCES +=
     qt/OpenRGBSupportedDevicesPage.cpp                                                          \
     qt/OpenRGBSystemInfoPage.cpp                                                                \
     qt/OpenRGBZoneResizeDialog.cpp                                                              \
+    qt/TabLabel.cpp                                                                             \
     qt/hsv.cpp                                                                                  \
     qt/OpenRGBE131SettingsPage/OpenRGBE131SettingsEntry.cpp                                     \
     qt/OpenRGBE131SettingsPage/OpenRGBE131SettingsPage.cpp                                      \
@@ -806,7 +806,6 @@ RESOURCES +=
     qt/resources.qrc
 
 FORMS +=                                                                                        \
-    qt/DeviceTabHeader.ui                                                                       \
     qt/OpenRGBClientInfoPage.ui                                                                 \
     qt/OpenRGBDeviceInfoPage.ui                                                                 \
     qt/OpenRGBDevicePage.ui                                                                     \
@@ -826,6 +825,7 @@ FORMS +=
     qt/OpenRGBQMKORGBSettingsPage/OpenRGBQMKORGBSettingsPage.ui                                 \
     qt/OpenRGBSerialSettingsPage/OpenRGBSerialSettingsEntry.ui                                  \
     qt/OpenRGBSerialSettingsPage/OpenRGBSerialSettingsPage.ui                                   \
+    qt/TabLabel.ui                                                                              \
 
 #-----------------------------------------------------------------------------------------------#
 # Windows-specific Configuration                                                                #
diff --git a/qt/DeviceTabHeader.cpp b/qt/DeviceTabHeader.cpp
deleted file mode 100644
index 5047fd91..00000000
--- a/qt/DeviceTabHeader.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-#include "DeviceTabHeader.h"
-
-Ui::DeviceTabHeader::DeviceTabHeader(QString icon, QString device_name) :
-    QWidget(nullptr),
-    ui(new Ui::DeviceTabHeaderUi)
-{
-    ui->setupUi(this);
-    ui->device_icon->setText("<img src=':/" + icon + "' height='16' width='16'  />");
-    ui->device_name->setText(device_name);
-}
-
-Ui::DeviceTabHeader::~DeviceTabHeader()
-{
-    delete ui;
-}
diff --git a/qt/DeviceTabHeader.h b/qt/DeviceTabHeader.h
deleted file mode 100644
index 9833d038..00000000
--- a/qt/DeviceTabHeader.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef DEVICETABHEADER_H
-#define DEVICETABHEADER_H
-
-#include <QWidget>
-#include "ui_DeviceTabHeader.h"
-
-namespace Ui {
-class DeviceTabHeader;
-}
-
-class Ui::DeviceTabHeader : public QWidget
-{
-    Q_OBJECT
-
-public:
-    DeviceTabHeader(QString, QString);
-    ~DeviceTabHeader();
-
-private:
-    Ui::DeviceTabHeaderUi *ui;
-};
-
-#endif // DEVICETABHEADER_H
diff --git a/qt/OpenRGBDialog2.cpp b/qt/OpenRGBDialog2.cpp
index 58d52f06..0730b56f 100644
--- a/qt/OpenRGBDialog2.cpp
+++ b/qt/OpenRGBDialog2.cpp
@@ -5,8 +5,8 @@
 #include "OpenRGBServerInfoPage.h"
 #include "OpenRGBPluginContainer.h"
 #include "OpenRGBProfileSaveDialog.h"
-#include "DeviceTabHeader.h"
 #include "ResourceManager.h"
+#include "TabLabel.h"
 #include <QLabel>
 #include <QTabBar>
 #include <QMessageBox>
@@ -918,7 +918,7 @@ void OpenRGBDialog2::UpdateDevicesList()
             | text in the tab label.  Choose icon based on device   |
             | type and append device name string.                   |
             \*-----------------------------------------------------*/
-            DeviceTabHeader* device_tab_header = new DeviceTabHeader(
+            TabLabel* device_tab_header = new TabLabel(
                         GetIconString(controllers[controller_idx]->type, IsDarkTheme()),
                         QString::fromStdString(controllers[controller_idx]->name)
              );
diff --git a/qt/TabLabel.cpp b/qt/TabLabel.cpp
new file mode 100644
index 00000000..f243725b
--- /dev/null
+++ b/qt/TabLabel.cpp
@@ -0,0 +1,15 @@
+#include "TabLabel.h"
+
+Ui::TabLabel::TabLabel(QString icon, QString name) :
+    QWidget(nullptr),
+    ui(new Ui::TabLabelUi)
+{
+    ui->setupUi(this);
+    ui->icon->setText("<img src=':/" + icon + "' height='16' width='16'  />");
+    ui->name->setText(name);
+}
+
+Ui::TabLabel::~TabLabel()
+{
+    delete ui;
+}
diff --git a/qt/TabLabel.h b/qt/TabLabel.h
new file mode 100644
index 00000000..45fad649
--- /dev/null
+++ b/qt/TabLabel.h
@@ -0,0 +1,23 @@
+#ifndef TABLABEL_H
+#define TABLABEL_H
+
+#include <QWidget>
+#include "ui_TabLabel.h"
+
+namespace Ui {
+class TabLabel;
+}
+
+class Ui::TabLabel : public QWidget
+{
+    Q_OBJECT
+
+public:
+    TabLabel(QString icon, QString name);
+    ~TabLabel();
+
+private:
+    Ui::TabLabelUi *ui;
+};
+
+#endif // TABLABEL_H
diff --git a/qt/DeviceTabHeader.ui b/qt/TabLabel.ui
similarity index 87%
rename from qt/DeviceTabHeader.ui
rename to qt/TabLabel.ui
index c865e908..2a825147 100644
--- a/qt/DeviceTabHeader.ui
+++ b/qt/TabLabel.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>DeviceTabHeaderUi</class>
- <widget class="QWidget" name="DeviceTabHeaderUi">
+ <class>TabLabelUi</class>
+ <widget class="QWidget" name="TabLabelUi">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -21,7 +21,7 @@
     <number>0</number>
    </property>
    <item row="0" column="0">
-    <widget class="QLabel" name="device_icon">
+    <widget class="QLabel" name="icon">
      <property name="minimumSize">
       <size>
        <width>16</width>
@@ -40,7 +40,7 @@
     </widget>
    </item>
    <item row="0" column="1">
-    <widget class="QLabel" name="device_name">
+    <widget class="QLabel" name="name">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
        <horstretch>0</horstretch>