diff --git a/CMakeLists.txt b/CMakeLists.txt
index 855394a..914990a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,5 +39,5 @@ add_subdirectory(ProgramServerMPS)
 add_dependencies(InstructorsAndTrainees DataBaseInterface)
 add_dependencies(Server DataBaseInterface)
 add_dependencies(Server InstructorsAndTrainees)
-add_dependencies(ProgramAWSinstructorMPS InstructorsAndTrainees)
-add_dependencies(ProgramServerMPS Server)
+add_dependencies(AWSinstructorMPS InstructorsAndTrainees)
+add_dependencies(ServerMPS Server)
diff --git a/LibDataBaseInterface/databaselms.cpp b/LibDataBaseInterface/databaselms.cpp
index 76e54af..d4216e3 100644
--- a/LibDataBaseInterface/databaselms.cpp
+++ b/LibDataBaseInterface/databaselms.cpp
@@ -24,12 +24,6 @@ DataBaseLMS::~DataBaseLMS()
     deleteConnection();
 }
 
-void DataBaseLMS::slot_LanguageChanged(QString language)
-{
-    qtLanguageTranslator.load(QString(QStringLiteral("translations/DataBaseLMS_")) + language, QStringLiteral("."));
-    QCoreApplication::installTranslator(&qtLanguageTranslator);
-}
-
 bool DataBaseLMS::createConnection()
 {
     dbSettings = getDataBaseSettings();
diff --git a/LibDataBaseInterface/databaselms.h b/LibDataBaseInterface/databaselms.h
index b03bbd0..051e5f8 100644
--- a/LibDataBaseInterface/databaselms.h
+++ b/LibDataBaseInterface/databaselms.h
@@ -4,7 +4,6 @@
 #include <QSqlDatabase>
 #include <QMutex>
 #include <QWidget>
-#include <QTranslator>
 
 #include "instructor.h"
 #include "trainee.h"
@@ -13,7 +12,7 @@
 #include "timingoftrainee.h"
 
 static const QString backupEmptyName = ".\\restoreDB\\DBLMS_EMPTY.backup";
-static const QString restoreDBscriptName = "restoreDBscript.bat";
+static const QString restoreDBscriptName = ".\\restoreDB\\restoreDBscript.bat";
 
 class DATABASELMS_EXPORT DataBaseSettings
 {
@@ -35,9 +34,6 @@ public:
     DataBaseLMS(QWidget *ownerWidget, QObject *parent = nullptr);
     ~DataBaseLMS();
 
-public Q_SLOTS:
-    void slot_LanguageChanged(QString language);
-
 signals:
     void signal_ErrorPostgreSQL(QString text);
 
@@ -137,8 +133,6 @@ protected:
     QString UserNamePostgres;
     QString PasswordPostgres;
 
-    QTranslator qtLanguageTranslator;
-
 private:
     QWidget* ownerWidget;
 };
diff --git a/LibDataBaseInterface/translations/DataBaseLMS_ru_RU.ts b/LibDataBaseInterface/translations/DataBaseLMS_ru_RU.ts
deleted file mode 100644
index f62cf2e..0000000
--- a/LibDataBaseInterface/translations/DataBaseLMS_ru_RU.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1" language="ru_RU">
-</TS>
diff --git a/LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp b/LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp
index dc31da7..bca4c04 100644
--- a/LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp
+++ b/LibInstructorsAndTrainees/instructorsandtraineeswidget.cpp
@@ -194,7 +194,7 @@ QString InstructorsAndTraineesWidget::loadStyleSheet()
 
 void InstructorsAndTraineesWidget::slot_LanguageChanged(QString language)
 {
-    qtLanguageTranslator.load(QString(QStringLiteral("translations/InstructorsAndTraineesWidget_")) + language, QStringLiteral("."));
+    qtLanguageTranslator.load(QString(QStringLiteral("translations/LibInstructorsAndTrainees_")) + language, QStringLiteral("."));
     qApp->installTranslator(&qtLanguageTranslator);
 
     emit signal_LanguageChanged(language);
@@ -635,12 +635,12 @@ void InstructorsAndTraineesWidget::setLanguageInterfase()
 
     if(settings.Language == "ENG")
     {
-        qtLanguageTranslator.load(QString("translations/InstructorsAndTraineesWidget_") + languageENG, ".");
+        qtLanguageTranslator.load(QString("translations/LibInstructorsAndTrainees_") + languageENG, ".");
         language = languageENG;
     }
     else
     {
-        qtLanguageTranslator.load(QString("translations/InstructorsAndTraineesWidget_") + languageRUS, ".");
+        qtLanguageTranslator.load(QString("translations/LibInstructorsAndTrainees_") + languageRUS, ".");
         language = languageRUS;
     }
 
diff --git a/LibInstructorsAndTrainees/translations/InstructorsAndTraineesWidget_ru_RU.qm b/LibInstructorsAndTrainees/translations/LibInstructorsAndTrainees_ru_RU.qm
similarity index 100%
rename from LibInstructorsAndTrainees/translations/InstructorsAndTraineesWidget_ru_RU.qm
rename to LibInstructorsAndTrainees/translations/LibInstructorsAndTrainees_ru_RU.qm
diff --git a/LibInstructorsAndTrainees/translations/InstructorsAndTraineesWidget_ru_RU.ts b/LibInstructorsAndTrainees/translations/LibInstructorsAndTrainees_ru_RU.ts
similarity index 100%
rename from LibInstructorsAndTrainees/translations/InstructorsAndTraineesWidget_ru_RU.ts
rename to LibInstructorsAndTrainees/translations/LibInstructorsAndTrainees_ru_RU.ts
diff --git a/LibServer/serverlmswidget.cpp b/LibServer/serverlmswidget.cpp
index fb9ea90..a29c6c4 100644
--- a/LibServer/serverlmswidget.cpp
+++ b/LibServer/serverlmswidget.cpp
@@ -203,7 +203,7 @@ void ServerLMSWidget::slot_BlockAutorization(bool block)
 
 void ServerLMSWidget::slot_LanguageChanged(QString language)
 {
-    qtLanguageTranslator.load(QString("translations/ServerLMS_") + language, ".");
+    qtLanguageTranslator.load(QString("translations/LibServer_") + language, ".");
     qApp->installTranslator(&qtLanguageTranslator);
 
     emit signal_LanguageChanged(language);
@@ -307,12 +307,12 @@ void ServerLMSWidget::setLanguageInterfase()
 
     if(settings.Language == "ENG")
     {
-        qtLanguageTranslator.load(QString("translations/ServerLMS_") + languageENG, ".");
+        qtLanguageTranslator.load(QString("translations/LibServer_") + languageENG, ".");
         language = languageENG;
     }
     else
     {
-        qtLanguageTranslator.load(QString("translations/ServerLMS_") + languageRUS, ".");
+        qtLanguageTranslator.load(QString("translations/LibServer_") + languageRUS, ".");
         language = languageRUS;
     }
 
diff --git a/LibServer/translations/ServerLMS_ru_RU.qm b/LibServer/translations/LibServer_ru_RU.qm
similarity index 100%
rename from LibServer/translations/ServerLMS_ru_RU.qm
rename to LibServer/translations/LibServer_ru_RU.qm
diff --git a/LibServer/translations/ServerLMS_ru_RU.ts b/LibServer/translations/LibServer_ru_RU.ts
similarity index 100%
rename from LibServer/translations/ServerLMS_ru_RU.ts
rename to LibServer/translations/LibServer_ru_RU.ts
diff --git a/ProgramAWSinstructorMPS/CMakeLists.txt b/ProgramAWSinstructorMPS/CMakeLists.txt
index a52be70..348271a 100644
--- a/ProgramAWSinstructorMPS/CMakeLists.txt
+++ b/ProgramAWSinstructorMPS/CMakeLists.txt
@@ -8,7 +8,7 @@ if(WIN32)
     set(RC_FILE ${CMAKE_CURRENT_SOURCE_DIR}/app.rc)
 endif()
 
-add_executable(ProgramAWSinstructorMPS WIN32
+add_executable(AWSinstructorMPS WIN32
 main.cpp
 mainwindow.cpp
 mainwindow.h
@@ -18,38 +18,38 @@ ProgramAWSinstructorMPS.qrc
 
 # Подключаем RC-файл к цели
 if(RC_FILE)
-    target_sources(ProgramAWSinstructorMPS PRIVATE ${RC_FILE})
+    target_sources(AWSinstructorMPS PRIVATE ${RC_FILE})
 endif()
 
-target_link_libraries(ProgramAWSinstructorMPS PRIVATE Qt5::Widgets)
-target_link_libraries(ProgramAWSinstructorMPS PRIVATE Qt5::Sql)
-target_link_libraries(ProgramAWSinstructorMPS PRIVATE Qt5::Xml)
-target_link_libraries(ProgramAWSinstructorMPS PRIVATE Qt5::Network)
+target_link_libraries(AWSinstructorMPS PRIVATE Qt5::Widgets)
+target_link_libraries(AWSinstructorMPS PRIVATE Qt5::Sql)
+target_link_libraries(AWSinstructorMPS PRIVATE Qt5::Xml)
+target_link_libraries(AWSinstructorMPS PRIVATE Qt5::Network)
 
-target_include_directories(ProgramAWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees)
-target_include_directories(ProgramAWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/instructors)
-target_include_directories(ProgramAWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/trainees)
-target_include_directories(ProgramAWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/tasks)
-target_include_directories(ProgramAWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/docTasks)
-target_include_directories(ProgramAWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/connectorToServer)
-target_include_directories(ProgramAWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/connectorToServer/Core)
-target_include_directories(ProgramAWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/messanger)
-target_include_directories(ProgramAWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/widgets)
-target_include_directories(ProgramAWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/specialmessagebox)
-target_include_directories(ProgramAWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/settings)
-target_include_directories(ProgramAWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/authorization)
+target_include_directories(AWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees)
+target_include_directories(AWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/instructors)
+target_include_directories(AWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/trainees)
+target_include_directories(AWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/tasks)
+target_include_directories(AWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/docTasks)
+target_include_directories(AWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/connectorToServer)
+target_include_directories(AWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/connectorToServer/Core)
+target_include_directories(AWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/messanger)
+target_include_directories(AWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/widgets)
+target_include_directories(AWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/specialmessagebox)
+target_include_directories(AWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/settings)
+target_include_directories(AWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/authorization)
 if(PROJECT_TYPE_DEBUG)
-    target_link_directories(ProgramAWSinstructorMPS PUBLIC ${REPO_PATH}/BUILDS/Debug64/LibInstructorsAndTrainees)
+    target_link_directories(AWSinstructorMPS PUBLIC ${REPO_PATH}/BUILDS/Debug64/LibInstructorsAndTrainees)
 else()
-    target_link_directories(ProgramAWSinstructorMPS PUBLIC ${REPO_PATH}/BUILDS/Release64/LibInstructorsAndTrainees)
+    target_link_directories(AWSinstructorMPS PUBLIC ${REPO_PATH}/BUILDS/Release64/LibInstructorsAndTrainees)
 endif()
-target_link_libraries(ProgramAWSinstructorMPS PRIVATE libInstructorsAndTrainees.dll)
+target_link_libraries(AWSinstructorMPS PRIVATE libInstructorsAndTrainees.dll)
 
 
-target_include_directories(ProgramAWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibDataBaseInterface)
+target_include_directories(AWSinstructorMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibDataBaseInterface)
 if(PROJECT_TYPE_DEBUG)
-    target_link_directories(ProgramAWSinstructorMPS PUBLIC  ${REPO_PATH}/BUILDS/Debug64/LibDataBaseInterface)
+    target_link_directories(AWSinstructorMPS PUBLIC  ${REPO_PATH}/BUILDS/Debug64/LibDataBaseInterface)
 else()
-    target_link_directories(ProgramAWSinstructorMPS PUBLIC ${REPO_PATH}/BUILDS/Release64/LibDataBaseInterface)
+    target_link_directories(AWSinstructorMPS PUBLIC ${REPO_PATH}/BUILDS/Release64/LibDataBaseInterface)
 endif()
-target_link_libraries(ProgramAWSinstructorMPS PRIVATE libDataBaseInterface.dll)
+target_link_libraries(AWSinstructorMPS PRIVATE libDataBaseInterface.dll)
diff --git a/ProgramAWSinstructorMPS/mainwindow.cpp b/ProgramAWSinstructorMPS/mainwindow.cpp
index 1290c67..1bd46c4 100644
--- a/ProgramAWSinstructorMPS/mainwindow.cpp
+++ b/ProgramAWSinstructorMPS/mainwindow.cpp
@@ -21,7 +21,7 @@ MainWindow::MainWindow(QWidget *parent)
     //this->showNormal();
     this->showMaximized();
 
-    qtLanguageTranslator.load(QString("translations/GUIdataBaseLMS_") + instructorsAndTraineesWidget->getLanguage(), ".");
+    qtLanguageTranslator.load(QString("translations/ProgramAWSinstructorMPS_") + instructorsAndTraineesWidget->getLanguage(), ".");
     qApp->installTranslator(&qtLanguageTranslator);
 }
 
@@ -42,6 +42,6 @@ void MainWindow::changeEvent(QEvent *event)
 
 void MainWindow::slot_LanguageChanged(QString language)
 {
-    qtLanguageTranslator.load(QString(QStringLiteral("translations/GUIdataBaseLMS_")) + language, QStringLiteral("."));
+    qtLanguageTranslator.load(QString(QStringLiteral("translations/ProgramAWSinstructorMPS_")) + language, QStringLiteral("."));
     qApp->installTranslator(&qtLanguageTranslator);
 }
diff --git a/ProgramAWSinstructorMPS/resources/IcoGUIRRJ.ico b/ProgramAWSinstructorMPS/resources/IcoGUIRRJ.ico
index 662894c..3737d3b 100644
Binary files a/ProgramAWSinstructorMPS/resources/IcoGUIRRJ.ico and b/ProgramAWSinstructorMPS/resources/IcoGUIRRJ.ico differ
diff --git a/ProgramAWSinstructorMPS/resources/PngGUIRRJ.png b/ProgramAWSinstructorMPS/resources/PngGUIRRJ.png
index c3c244e..941413e 100644
Binary files a/ProgramAWSinstructorMPS/resources/PngGUIRRJ.png and b/ProgramAWSinstructorMPS/resources/PngGUIRRJ.png differ
diff --git a/ProgramAWSinstructorMPS/resources/old/IcoGUIRRJ.ico b/ProgramAWSinstructorMPS/resources/old/IcoGUIRRJ.ico
new file mode 100644
index 0000000..662894c
Binary files /dev/null and b/ProgramAWSinstructorMPS/resources/old/IcoGUIRRJ.ico differ
diff --git a/ProgramAWSinstructorMPS/resources/old/PngGUIRRJ.png b/ProgramAWSinstructorMPS/resources/old/PngGUIRRJ.png
new file mode 100644
index 0000000..c3c244e
Binary files /dev/null and b/ProgramAWSinstructorMPS/resources/old/PngGUIRRJ.png differ
diff --git a/ProgramAWSinstructorMPS/translations/GUIdataBaseLMS_ru_RU.qm b/ProgramAWSinstructorMPS/translations/ProgramAWSinstructorMPS_ru_RU.qm
similarity index 100%
rename from ProgramAWSinstructorMPS/translations/GUIdataBaseLMS_ru_RU.qm
rename to ProgramAWSinstructorMPS/translations/ProgramAWSinstructorMPS_ru_RU.qm
diff --git a/ProgramAWSinstructorMPS/translations/GUIdataBaseLMS_ru_RU.ts b/ProgramAWSinstructorMPS/translations/ProgramAWSinstructorMPS_ru_RU.ts
similarity index 100%
rename from ProgramAWSinstructorMPS/translations/GUIdataBaseLMS_ru_RU.ts
rename to ProgramAWSinstructorMPS/translations/ProgramAWSinstructorMPS_ru_RU.ts
diff --git a/ProgramServerMPS/CMakeLists.txt b/ProgramServerMPS/CMakeLists.txt
index befbd35..72d8726 100644
--- a/ProgramServerMPS/CMakeLists.txt
+++ b/ProgramServerMPS/CMakeLists.txt
@@ -8,7 +8,7 @@ if(WIN32)
     set(RC_FILE ${CMAKE_CURRENT_SOURCE_DIR}/app.rc)
 endif()
 
-add_executable(ProgramServerMPS WIN32
+add_executable(ServerMPS WIN32
 main.cpp
 mainwindow.cpp
 mainwindow.h
@@ -18,35 +18,35 @@ ProgramServerMPS.qrc
 
 # Подключаем RC-файл к цели
 if(RC_FILE)
-    target_sources(ProgramServerMPS PRIVATE ${RC_FILE})
+    target_sources(ServerMPS PRIVATE ${RC_FILE})
 endif()
 
-target_link_libraries(ProgramServerMPS PRIVATE Qt5::Widgets)
-target_link_libraries(ProgramServerMPS PRIVATE Qt5::Network)
-target_link_libraries(ProgramServerMPS PRIVATE Qt5::Sql)
-target_link_libraries(ProgramServerMPS PRIVATE Qt5::Xml)
+target_link_libraries(ServerMPS PRIVATE Qt5::Widgets)
+target_link_libraries(ServerMPS PRIVATE Qt5::Network)
+target_link_libraries(ServerMPS PRIVATE Qt5::Sql)
+target_link_libraries(ServerMPS PRIVATE Qt5::Xml)
 
-target_include_directories(ProgramServerMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibDataBaseInterface)
+target_include_directories(ServerMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibDataBaseInterface)
 if(PROJECT_TYPE_DEBUG)
-    target_link_directories(ProgramServerMPS PUBLIC ${REPO_PATH}/BUILDS/Debug64/LibDataBaseInterface)
+    target_link_directories(ServerMPS PUBLIC ${REPO_PATH}/BUILDS/Debug64/LibDataBaseInterface)
 else()
-    target_link_directories(ProgramServerMPS PUBLIC ${REPO_PATH}/BUILDS/Release64/LibDataBaseInterface)
+    target_link_directories(ServerMPS PUBLIC ${REPO_PATH}/BUILDS/Release64/LibDataBaseInterface)
 endif()
-target_link_libraries(ProgramServerMPS PRIVATE libDataBaseInterface.dll)
+target_link_libraries(ServerMPS PRIVATE libDataBaseInterface.dll)
 
-target_include_directories(ProgramServerMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibServer)
-target_include_directories(ProgramServerMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibServer/clienthandler)
-target_include_directories(ProgramServerMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibServer/multithreadserver)
-target_include_directories(ProgramServerMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibServer/providerdblms)
-target_include_directories(ProgramServerMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibServer/Systems)
+target_include_directories(ServerMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibServer)
+target_include_directories(ServerMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibServer/clienthandler)
+target_include_directories(ServerMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibServer/multithreadserver)
+target_include_directories(ServerMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibServer/providerdblms)
+target_include_directories(ServerMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibServer/Systems)
 if(PROJECT_TYPE_DEBUG)
-    target_link_directories(ProgramServerMPS PUBLIC ${REPO_PATH}/BUILDS/Debug64/LibServer)
+    target_link_directories(ServerMPS PUBLIC ${REPO_PATH}/BUILDS/Debug64/LibServer)
 else()
-    target_link_directories(ProgramServerMPS PUBLIC ${REPO_PATH}/BUILDS/Release64/LibServer)
+    target_link_directories(ServerMPS PUBLIC ${REPO_PATH}/BUILDS/Release64/LibServer)
 endif()
-target_link_libraries(ProgramServerMPS PRIVATE libServer.dll)
+target_link_libraries(ServerMPS PRIVATE libServer.dll)
 
-target_include_directories(ProgramServerMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees)
-target_include_directories(ProgramServerMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/tasks)
-target_include_directories(ProgramServerMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/widgets)
-target_include_directories(ProgramServerMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/specialmessagebox)
+target_include_directories(ServerMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees)
+target_include_directories(ServerMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/tasks)
+target_include_directories(ServerMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/widgets)
+target_include_directories(ServerMPS PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LibInstructorsAndTrainees/specialmessagebox)
diff --git a/ProgramServerMPS/mainwindow.cpp b/ProgramServerMPS/mainwindow.cpp
index cf2f97a..9d5afca 100644
--- a/ProgramServerMPS/mainwindow.cpp
+++ b/ProgramServerMPS/mainwindow.cpp
@@ -30,7 +30,7 @@ MainWindow::MainWindow(QWidget *parent) :
     connect(serverLMSWidget, &ServerLMSWidget::signal_Menu_ShowWindow, this, &MainWindow::slot_TrayMenu_ShowWindow);
     connect(serverLMSWidget, &ServerLMSWidget::signal_Menu_HideWindow, this, &MainWindow::slot_TrayMenu_HideWindow);
 
-    qtLanguageTranslator.load(QString("translations/TrayServerLMS_") + serverLMSWidget->getLanguage(), ".");
+    qtLanguageTranslator.load(QString("translations/ProgramServerMPS_") + serverLMSWidget->getLanguage(), ".");
     qApp->installTranslator(&qtLanguageTranslator);
 
     /* Инициализируем иконку трея, устанавливаем иконку,
@@ -193,7 +193,7 @@ void MainWindow::slot_hasError(int code)
 
 void MainWindow::slot_LanguageChanged(QString language)
 {
-    qtLanguageTranslator.load(QString(QStringLiteral("translations/TrayServerLMS_")) + language, QStringLiteral("."));
+    qtLanguageTranslator.load(QString(QStringLiteral("translations/ProgramServerMPS_")) + language, QStringLiteral("."));
     qApp->installTranslator(&qtLanguageTranslator);
 }
 
diff --git a/ProgramServerMPS/resources/IcoServerRRJ.ico b/ProgramServerMPS/resources/IcoServerRRJ.ico
index bd8461b..36b4a86 100644
Binary files a/ProgramServerMPS/resources/IcoServerRRJ.ico and b/ProgramServerMPS/resources/IcoServerRRJ.ico differ
diff --git a/ProgramServerMPS/resources/PngServerRRJ.png b/ProgramServerMPS/resources/PngServerRRJ.png
index e320aa7..10686a6 100644
Binary files a/ProgramServerMPS/resources/PngServerRRJ.png and b/ProgramServerMPS/resources/PngServerRRJ.png differ
diff --git a/ProgramServerMPS/resources/old/IcoServerRRJ.ico b/ProgramServerMPS/resources/old/IcoServerRRJ.ico
new file mode 100644
index 0000000..bd8461b
Binary files /dev/null and b/ProgramServerMPS/resources/old/IcoServerRRJ.ico differ
diff --git a/ProgramServerMPS/resources/old/PngServerRRJ.png b/ProgramServerMPS/resources/old/PngServerRRJ.png
new file mode 100644
index 0000000..e320aa7
Binary files /dev/null and b/ProgramServerMPS/resources/old/PngServerRRJ.png differ
diff --git a/ProgramServerMPS/translations/TrayServerLMS_ru_RU.qm b/ProgramServerMPS/translations/ProgramServerMPS_ru_RU.qm
similarity index 100%
rename from ProgramServerMPS/translations/TrayServerLMS_ru_RU.qm
rename to ProgramServerMPS/translations/ProgramServerMPS_ru_RU.qm
diff --git a/ProgramServerMPS/translations/TrayServerLMS_ru_RU.ts b/ProgramServerMPS/translations/ProgramServerMPS_ru_RU.ts
similarity index 100%
rename from ProgramServerMPS/translations/TrayServerLMS_ru_RU.ts
rename to ProgramServerMPS/translations/ProgramServerMPS_ru_RU.ts