diff --git a/src/shared/Modules/OutgoingMessagesViewer/OutgoingMessagesViewerModule.cpp b/src/shared/Modules/OutgoingMessagesViewer/OutgoingMessagesViewerModule.cpp
index 82798be7f5a74eff94a7949a244c40116bffe0cb..29f438a999e7d6ebd5ee3f8ec99ad02111232509 100644
--- a/src/shared/Modules/OutgoingMessagesViewer/OutgoingMessagesViewerModule.cpp
+++ b/src/shared/Modules/OutgoingMessagesViewer/OutgoingMessagesViewerModule.cpp
@@ -228,7 +228,7 @@ void OutgoingMessagesViewerModule::handleAck(const Message& ack)
         {
             if (table->rowCount() > i)
             {
-                table->item(i, 1)->setBackground(QBrush(QColor(0, 255, 0)));
+                table->item(i, 2)->setBackground(QBrush(QColor(0, 255, 0)));
             }
         }
     }
@@ -246,7 +246,7 @@ void OutgoingMessagesViewerModule::handleNack(const Message& nack)
         {
             if (table->rowCount() > i)
             {
-                table->item(i, 1)->setBackground(QBrush(QColor(255, 0, 0)));
+                table->item(i, 2)->setBackground(QBrush(QColor(255, 0, 0)));
             }
         }
     }
@@ -264,7 +264,7 @@ void OutgoingMessagesViewerModule::handleWack(const Message& nack)
         {
             if (table->rowCount() > i)
             {
-                table->item(i, 1)->setBackground(QBrush(QColor(255, 255, 255)));
+                table->item(i, 1)->setBackground(QBrush(QColor(255, 255, 0)));
             }
         }
     }
diff --git a/src/shared/Modules/SkywardHubStrings.h b/src/shared/Modules/SkywardHubStrings.h
index 1742e9079cf505d1c4a8e73712d6f6e7b0cc8ff3..d1e35ffb19243c89bf9dc717c2f56145fc859cd4 100644
--- a/src/shared/Modules/SkywardHubStrings.h
+++ b/src/shared/Modules/SkywardHubStrings.h
@@ -70,12 +70,9 @@ static const QString mavlink_initial_coordinates_tc_latitude_name = "latitude";
 static const QString mavlink_initial_coordinates_tc_longitude_name =
     "longitude";
 
-static const QString mavlink_received_msg_ACK_topic =
-    mavlink_received_msg_topic + "/ACK_TM";
-static const QString mavlink_received_msg_NACK_topic =
-    mavlink_received_msg_topic + "/NACK_TM";
-static const QString mavlink_received_msg_WACK_topic =
-    mavlink_received_msg_topic + "/WACK_TM";
+static const QString mavlink_received_msg_ACK_topic  = "*/In/ACK_TM";
+static const QString mavlink_received_msg_NACK_topic = "*/In/NACK_TM";
+static const QString mavlink_received_msg_WACK_topic = "*/In/WACK_TM";
 
 static const QString mavlink_system_id_name    = "system_id";
 static const QString mavlink_component_id_name = "component_id";