diff --git a/src/shared/Modules/RefuelingVisualizer/RefuelingVisualizer.cpp b/src/shared/Modules/RefuelingVisualizer/RefuelingVisualizer.cpp
index 7c5856474b3f2ab514199792b034347ebf037c8c..b7f2c519c5dd85e92c1c8f77d951bb6e97b5a8ba 100644
--- a/src/shared/Modules/RefuelingVisualizer/RefuelingVisualizer.cpp
+++ b/src/shared/Modules/RefuelingVisualizer/RefuelingVisualizer.cpp
@@ -91,12 +91,12 @@ void RefuelingVisualizer::setupUi()
     QString dataStyle = "border-width: 0px;";
 
     // TARS STATE
-    QLabel* labelTars = new QLabel;
-    labelTars->setText(RefuelingVisualizerCommandList::commandLabels[0]);
-    labelTars->setAlignment(Qt::AlignCenter);
-    labelTars->setContentsMargins(4, 4, 4, 4);
-    labelTars->setStyleSheet(valveLabelStyleON);
-    outerLayout->addWidget(labelTars, 5570, 0, 70, 5000);
+    labelTarsTab = new QLabel;
+    labelTarsTab->setText(RefuelingVisualizerCommandList::commandLabels[0]);
+    labelTarsTab->setAlignment(Qt::AlignCenter);
+    labelTarsTab->setContentsMargins(4, 4, 4, 4);
+    labelTarsTab->setStyleSheet(valveLabelStyleON);
+    outerLayout->addWidget(labelTarsTab, 5570, 0, 70, 5000);
 
     // MAIN VALVE
     QLabel* labelMain = new QLabel;
@@ -347,26 +347,52 @@ void RefuelingVisualizer::backgroundTabs(Message msg)
     auto labelFillingValve = outerLayout->itemAt(3)->widget();
     auto labelReleaseValve = outerLayout->itemAt(4)->widget();
     auto labelVentingValve = outerLayout->itemAt(5)->widget();
-    auto labelTarsTab      = outerLayout->itemAt(1)->widget();
     auto labelMainValve    = outerLayout->itemAt(2)->widget();
 
     // VALVE STATE LABELS STYLE
     QString valveLabelStyleON =
         "border-width: 1px; border-style: solid; border-radius: 1px; "
-        "border-color: white; background-color: rgb(82, 142, 56)";
+        "border-color: white; background-color: rgb(82, 142, 56);";
     QString valveLabelStyleOFF =
         "border-width: 1px; border-style: solid; border-radius: 1px; "
         "border-color: white; background-color: rgb(255, 0, 0)";
+    QString valveLabelStyleREADY =
+        "border-width: 1px; border-style: solid; border-radius: 1px; "
+        "border-color: white; background-color: rgb(204, 102, 0)";
 
-    if (tarsState > 0)
+    // TARS TAB
+    if (tarsState == 0)
     {
-        labelTarsTab->setStyleSheet(valveLabelStyleON);
+        labelTarsTab->setStyleSheet(valveLabelStyleOFF);
+        labelTarsTab->setText(RefuelingVisualizerCommandList::commandLabels[0] +
+                              ": UNINITIALIZED");
     }
-    else
+    else if (tarsState == 1)
     {
         labelTarsTab->setStyleSheet(valveLabelStyleOFF);
+        labelTarsTab->setText(RefuelingVisualizerCommandList::commandLabels[0] +
+                              ": IDLE");
+    }
+    else if (tarsState == 2)
+    {
+        labelTarsTab->setStyleSheet(valveLabelStyleREADY);
+        labelTarsTab->setText(RefuelingVisualizerCommandList::commandLabels[0] +
+                              ": READY");
+    }
+    else if (tarsState == 3)
+    {
+        labelTarsTab->setStyleSheet(valveLabelStyleON);
+        labelTarsTab->setText(RefuelingVisualizerCommandList::commandLabels[0] +
+                              ": WASHING");
+    }
+    else if (tarsState == 4)
+    {
+        labelTarsTab->setStyleSheet(valveLabelStyleON);
+        labelTarsTab->setText(RefuelingVisualizerCommandList::commandLabels[0] +
+                              ": REFUELING");
     }
 
+    // MAIN TAB
     if (mainValve == 1)
     {
         labelMainValve->setStyleSheet(valveLabelStyleON);
@@ -376,6 +402,7 @@ void RefuelingVisualizer::backgroundTabs(Message msg)
         labelMainValve->setStyleSheet(valveLabelStyleOFF);
     }
 
+    // VALVES TABS
     if (fillingValve == 0 && releaseValve == 0 && ventingValve == 0)
     {
         background->setStyleSheet(
@@ -475,11 +502,12 @@ void RefuelingVisualizer::onMsgReceived(const Message& msg)
     float vesselLoadcell = msg.getField("loadcell_vessel").getDouble();
     float vesselPressure = msg.getField("vessel_pressure").getDouble();
     // Tank
-    //float tankLoadcell    = msg.getField("loadcell_tank").getDouble();
-    //float tankTemperature = msg.getField("tank_temperature").getDouble();
-    //float tankTOPpres     = msg.getField("top_tank_pressure").getDouble();
-    //float tankBOTpres     = msg.getField("bottom_tank_pressure").getDouble();
-    //uint8_t tankFloatingLev = msg.getField("floating_level").getUnsignedInteger();
+    // float tankLoadcell    = msg.getField("loadcell_tank").getDouble();
+    // float tankTemperature = msg.getField("tank_temperature").getDouble();
+    // float tankTOPpres     = msg.getField("top_tank_pressure").getDouble();
+    // float tankBOTpres     = msg.getField("bottom_tank_pressure").getDouble();
+    // uint8_t tankFloatingLev =
+    // msg.getField("floating_level").getUnsignedInteger();
 
     // Change data inside labels
     loadcellVesselDataLabel->setText(QString::number(vesselLoadcell, 'f', 3) +
diff --git a/src/shared/Modules/RefuelingVisualizer/RefuelingVisualizer.h b/src/shared/Modules/RefuelingVisualizer/RefuelingVisualizer.h
index 649aa57fe83ea7753bed9f6ed7d5037f91cc51a3..bfe5ce514d364a295a482a3edeb2d08e0be8fd57 100644
--- a/src/shared/Modules/RefuelingVisualizer/RefuelingVisualizer.h
+++ b/src/shared/Modules/RefuelingVisualizer/RefuelingVisualizer.h
@@ -49,6 +49,7 @@ private:
     void backgroundTabs(Message msg);
 
     QGridLayout* outerLayout;
+    QLabel* labelTarsTab;
 
     // TANK VISUALIZER LABELS
     QLabel* tankHeaderLabel;