diff --git a/src/blackgui/components/textmessagecomponent.cpp b/src/blackgui/components/textmessagecomponent.cpp
index d5e547448..c1972f691 100644
--- a/src/blackgui/components/textmessagecomponent.cpp
+++ b/src/blackgui/components/textmessagecomponent.cpp
@@ -396,6 +396,7 @@ namespace BlackGui
             if (w) { return w; }
 
             const QString tabName = callsign.asString();
+            const bool supervisor = callsign.isSupervisorCallsign();
             QWidget *newTabWidget = new QWidget(this);
             newTabWidget->setObjectName("Tab widget " + tabName);
             QPushButton *closeButton = new QPushButton("Close", newTabWidget);
@@ -409,15 +410,17 @@ namespace BlackGui
             layout->addWidget(closeButton);
             newTabWidget->setLayout(layout);
             textEdit->setContextMenuPolicy(Qt::CustomContextMenu);
+            textEdit->setProperty("supervisormsg", supervisor);
+
             const int index = ui->tw_TextMessages->addTab(newTabWidget, tabName);
             QToolButton *closeButtonInTab = new QToolButton(newTabWidget);
             closeButtonInTab->setText("[X]");
+            closeButtonInTab->setProperty("supervisormsg", supervisor);
             QTabBar *bar = ui->tw_TextMessages->tabBar();
             bar->setTabButton(index, QTabBar::RightSide, closeButtonInTab); // changes parent
-            if (callsign.isSupervisorCallsign())
+            if (supervisor)
             {
                 //! \fixme hardcoded stylesheet color
-                closeButtonInTab->setStyleSheet("background-color: red;");
                 bar->setTabIcon(index, callsign.toPixmap());
                 bar->setTabTextColor(index, QColor(Qt::yellow));
             }
diff --git a/src/blackgui/share/qss/stdwidget.qss b/src/blackgui/share/qss/stdwidget.qss
index ddaf58b51..35eea47cb 100644
--- a/src/blackgui/share/qss/stdwidget.qss
+++ b/src/blackgui/share/qss/stdwidget.qss
@@ -282,11 +282,6 @@ QTabBar::tab {
   margin-right: 3px;
 }
 
-/** experimental T506 **/
-QTabBar::tab[supervisor=true] {
-  background-color: red;
-}
-
 QTabBar::tab::selected {
   background-color: rgba(0, 0, 255, 128);
 }
@@ -711,3 +706,8 @@ QStatusBar QLabel {
   border: none;
   padding-left: 5px;
 }
+
+/** T506 supervisor messages **/
+QTabBar::tab[supervisormsg=true] { background-color: red; }
+QTextEdit[supervisormsg=true] { border: 2px solid red; margin: 2px; }
+QTabBar QToolButton[supervisormsg=true] { background-color: red; }