diff --git a/core/tmtc_client_core.py b/core/tmtc_client_core.py
index 9847f47c8961252243dd217d6bf1f1d11df9171f..f8f216490ee6e8a3fdf932ba1ba0d784c119ba88 100755
--- a/core/tmtc_client_core.py
+++ b/core/tmtc_client_core.py
@@ -65,8 +65,7 @@ def run_tmtc_client(use_gui: bool):
         tmtc_handler.initialize()
         tmtc_handler.perform_operation()
     else:
-        app = QApplication([])
-
+        app = QApplication(["TMTC Commander"])
         tmtc_gui = TmTcFrontend()
         tmtc_gui.start_ui()
 
diff --git a/core/tmtc_frontend.py b/core/tmtc_frontend.py
index 403c3dc714da20dbc6b66faefa702e6bdabee387..fb9d88cc1b8e2fe36f57203d26855951aa8ba2a4 100644
--- a/core/tmtc_frontend.py
+++ b/core/tmtc_frontend.py
@@ -10,7 +10,7 @@
 from multiprocessing import Process
 
 from PyQt5.QtWidgets import *
-from PyQt5.QtGui import QPixmap
+from PyQt5.QtGui import QPixmap, QIcon
 import sys
 from core.tmtc_backend import TmTcHandler
 from tmtc_core.tc.obsw_pus_tc_base import PusTelecommand
@@ -25,6 +25,7 @@ LOGGER = get_logger()
 TODO: Make it look nicer. Add SOURCE or KSat logo.
 """
 
+
 class TmTcFrontend(QMainWindow):
 
     # TODO: this list should probably be inside an enum in the obsw_config.py
@@ -121,12 +122,13 @@ class TmTcFrontend(QMainWindow):
         self.setCentralWidget(win)
         grid = QGridLayout()
 
+        self.setWindowTitle("TMTC Commander")
         label = QLabel(self)
         pixmap = QPixmap("SOURCEbadge.png")  # QPixmap is the class, easy to put pic on screen
         label.setGeometry(720, 15, 110, 110)
         label.setPixmap(pixmap)
+        self.setWindowIcon(QIcon("SOURCEbadge.png"));
         label.setScaledContents(True)
-
         row = 0
         grid.addWidget(QLabel("Configuration:"), row, 0, 1, 2)
         row += 1