diff --git a/src/components/WarningMessageWidget.cpp b/src/components/WarningMessageWidget.cpp
index 05fb5d1..0c0f162 100644
--- a/src/components/WarningMessageWidget.cpp
+++ b/src/components/WarningMessageWidget.cpp
@@ -26,6 +26,8 @@ WarningMessageWidget::WarningMessageWidget(QWidget *parent):QWidget(parent)
 , mWarningCount(0)
 , mErrorEmptyMessage(new QLabel(tr("System is working properly.")))
 , mWarningEmptyMessage(new QLabel(tr("No message.")))
+, mWarningTitle(new QLabel(this))
+, mErrorTitle(new QLabel(this))
 {
     setWindowFlags(windowFlags()|Qt::FramelessWindowHint|Qt::Popup);
     // setWindowFlags(windowFlags()|Qt::FramelessWindowHint);
@@ -39,10 +41,10 @@ WarningMessageWidget::WarningMessageWidget(QWidget *parent):QWidget(parent)
     errorPanel->setObjectName("ErrorPanelContent");
     layout->addWidget(errorPanel);
     auto errorLayout = new QVBoxLayout(errorPanel);
-    auto errorTitle = new QLabel;
-    errorTitle->setObjectName("WarningPanelTitle");
-    errorTitle->setText(tr("System Status"));
-    errorLayout->addWidget(errorTitle);
+    
+    mErrorTitle->setObjectName("WarningPanelTitle");
+    mErrorTitle->setText(tr("System Status"));
+    errorLayout->addWidget(mErrorTitle);
     errorLayout->setMargin(0);
     errorLayout->addWidget(mErrorEmptyMessage,0, Qt::AlignCenter | Qt::AlignHCenter);
 
@@ -67,10 +69,9 @@ WarningMessageWidget::WarningMessageWidget(QWidget *parent):QWidget(parent)
     
     layout->addWidget(warningPanel);
     auto warningLayout = new QVBoxLayout(warningPanel);
-    auto warningTitle = new QLabel;
-    warningTitle->setObjectName("WarningPanelTitle");
-    warningTitle->setText(tr("System Notifications"));
-    warningLayout->addWidget(warningTitle);
+    mWarningTitle->setObjectName("WarningPanelTitle");
+    mWarningTitle->setText(tr("System Notifications"));
+    warningLayout->addWidget(mWarningTitle);
     warningLayout->setMargin(0);
     warningLayout->addWidget(mWarningEmptyMessage, 0,Qt::AlignCenter | Qt::AlignHCenter);
 
@@ -100,6 +101,9 @@ WarningMessageWidget::WarningMessageWidget(QWidget *parent):QWidget(parent)
     connect(EventCenter::Default(),&EventCenter::WarningMessageRaise,this,&WarningMessageWidget::addWarningProxySlot,Qt::QueuedConnection);
     connect(EventCenter::Default(),&EventCenter::ErrorStateUnactive,this,&WarningMessageWidget::unactiveErrorProxySlot,Qt::QueuedConnection);
 
+	connect(EventCenter::Default(), &EventCenter::ReloadLanguage, this, &WarningMessageWidget::reloadLanguage);
+
+
 }
 
 void WarningMessageWidget::setPopupArgs(int aHeight, int aX, int aY)
@@ -159,6 +163,13 @@ void WarningMessageWidget::unactiveErrorProxySlot(QObject*, QObject* aData)
     unactiveError(601);
 }
 
+void WarningMessageWidget::reloadLanguage()
+{
+    mErrorTitle->setText(tr("System Status"));
+    mWarningTitle->setText(tr("System Notifications"));
+
+}
+
 void WarningMessageWidget::clearWarning()
 {
     QMutexLocker locker(&mWarningMutex);
diff --git a/src/components/WarningMessageWidget.h b/src/components/WarningMessageWidget.h
index 67794cd..d6d7ce8 100644
--- a/src/components/WarningMessageWidget.h
+++ b/src/components/WarningMessageWidget.h
@@ -23,6 +23,7 @@ protected slots:
     void addWarningProxySlot(QObject*, QObject* aData);
     void activeErrorProxySlot(QObject*, QObject* aData);
     void unactiveErrorProxySlot(QObject*, QObject* aData);
+    void reloadLanguage();
 
 private:
     QPropertyAnimation* showAnimation = nullptr;
@@ -32,6 +33,9 @@ private:
     QScrollArea* mScrollAreaW;
     QLabel* mErrorEmptyMessage;
     QLabel* mWarningEmptyMessage;
+    QLabel* mErrorTitle;
+    QLabel* mWarningTitle;
+
     QMutex mWarningMutex;
     QMutex mErrorMutex;