diff --git a/src/qt_gui/main_window.cpp b/src/qt_gui/main_window.cpp
index 724e008ae..bd3c27809 100644
--- a/src/qt_gui/main_window.cpp
+++ b/src/qt_gui/main_window.cpp
@@ -112,6 +112,7 @@ void MainWindow::CreateActions() {
     m_theme_act_group->addAction(ui->setThemeBlue);
     m_theme_act_group->addAction(ui->setThemeViolet);
     m_theme_act_group->addAction(ui->setThemeGruvbox);
+    m_theme_act_group->addAction(ui->setThemeTokyoNight);
 }
 
 void MainWindow::AddUiWidgets() {
@@ -559,6 +560,14 @@ void MainWindow::CreateConnects() {
             isIconBlack = false;
         }
     });
+    connect(ui->setThemeTokyoNight, &QAction::triggered, &m_window_themes, [this]() {
+        m_window_themes.SetWindowTheme(Theme::TokyoNight, ui->mw_searchbar);
+        Config::setMainWindowTheme(static_cast<int>(Theme::TokyoNight));
+        if (isIconBlack) {
+            SetUiIcons(false);
+            isIconBlack = false;
+        }
+    });
 }
 
 void MainWindow::StartGame() {
@@ -934,6 +943,11 @@ void MainWindow::SetLastUsedTheme() {
         isIconBlack = false;
         SetUiIcons(false);
         break;
+    case Theme::TokyoNight:
+        ui->setThemeTokyoNight->setChecked(true);
+        isIconBlack = false;
+        SetUiIcons(false);
+        break;
     }
 }
 
diff --git a/src/qt_gui/main_window_themes.cpp b/src/qt_gui/main_window_themes.cpp
index a52b4466e..5fffd4c9e 100644
--- a/src/qt_gui/main_window_themes.cpp
+++ b/src/qt_gui/main_window_themes.cpp
@@ -143,5 +143,27 @@ void WindowThemes::SetWindowTheme(Theme theme, QLineEdit* mw_searchbar) {
         themePalette.setColor(QPalette::HighlightedText, Qt::black);
         qApp->setPalette(themePalette);
         break;
+    case Theme::TokyoNight:
+        mw_searchbar->setStyleSheet(
+            "QLineEdit {"
+            "background-color: #1a1b26; color: #9d7cd8; border: 1px solid #9d7cd8; "
+            "border-radius: 4px; padding: 5px; }"
+            "QLineEdit:focus {"
+            "border: 1px solid #7aa2f7; }");
+        themePalette.setColor(QPalette::Window, QColor(31, 35, 53));
+        themePalette.setColor(QPalette::WindowText, QColor(192, 202, 245));
+        themePalette.setColor(QPalette::Base, QColor(25, 28, 39));
+        themePalette.setColor(QPalette::AlternateBase, QColor(36, 40, 59));
+        themePalette.setColor(QPalette::ToolTipBase, QColor(192, 202, 245));
+        themePalette.setColor(QPalette::ToolTipText, QColor(192, 202, 245));
+        themePalette.setColor(QPalette::Text, QColor(192, 202, 245));
+        themePalette.setColor(QPalette::Button, QColor(30, 30, 41));
+        themePalette.setColor(QPalette::ButtonText, QColor(192, 202, 245));
+        themePalette.setColor(QPalette::BrightText, QColor(197, 59, 83));
+        themePalette.setColor(QPalette::Link, QColor(79, 214, 190));
+        themePalette.setColor(QPalette::Highlight, QColor(79, 214, 190));
+        themePalette.setColor(QPalette::HighlightedText, Qt::black);
+        qApp->setPalette(themePalette);
+        break;
     }
 }
\ No newline at end of file
diff --git a/src/qt_gui/main_window_themes.h b/src/qt_gui/main_window_themes.h
index d162da87b..0ec2cce58 100644
--- a/src/qt_gui/main_window_themes.h
+++ b/src/qt_gui/main_window_themes.h
@@ -7,7 +7,7 @@
 #include <QLineEdit>
 #include <QWidget>
 
-enum class Theme : int { Dark, Light, Green, Blue, Violet, Gruvbox };
+enum class Theme : int { Dark, Light, Green, Blue, Violet, Gruvbox, TokyoNight };
 
 class WindowThemes : public QObject {
     Q_OBJECT
diff --git a/src/qt_gui/main_window_ui.h b/src/qt_gui/main_window_ui.h
index df64361fd..0d5038d7e 100644
--- a/src/qt_gui/main_window_ui.h
+++ b/src/qt_gui/main_window_ui.h
@@ -37,6 +37,7 @@ public:
     QAction* setThemeBlue;
     QAction* setThemeViolet;
     QAction* setThemeGruvbox;
+    QAction* setThemeTokyoNight;
     QWidget* centralWidget;
     QLineEdit* mw_searchbar;
     QPushButton* playButton;
@@ -162,6 +163,9 @@ public:
         setThemeGruvbox = new QAction(MainWindow);
         setThemeGruvbox->setObjectName("setThemeGruvbox");
         setThemeGruvbox->setCheckable(true);
+        setThemeTokyoNight = new QAction(MainWindow);
+        setThemeTokyoNight->setObjectName("setThemeTokyoNight");
+        setThemeTokyoNight->setCheckable(true);
         centralWidget = new QWidget(MainWindow);
         centralWidget->setObjectName("centralWidget");
         sizePolicy.setHeightForWidth(centralWidget->sizePolicy().hasHeightForWidth());
@@ -287,6 +291,7 @@ public:
         menuThemes->addAction(setThemeBlue);
         menuThemes->addAction(setThemeViolet);
         menuThemes->addAction(setThemeGruvbox);
+        menuThemes->addAction(setThemeTokyoNight);
         menuGame_List_Icons->addAction(setIconSizeTinyAct);
         menuGame_List_Icons->addAction(setIconSizeSmallAct);
         menuGame_List_Icons->addAction(setIconSizeMediumAct);
@@ -374,6 +379,7 @@ public:
         setThemeBlue->setText(QCoreApplication::translate("MainWindow", "Blue", nullptr));
         setThemeViolet->setText(QCoreApplication::translate("MainWindow", "Violet", nullptr));
         setThemeGruvbox->setText("Gruvbox");
+        setThemeTokyoNight->setText("Tokyo Night");
         toolBar->setWindowTitle(QCoreApplication::translate("MainWindow", "toolBar", nullptr));
     } // retranslateUi
 };