diff --git a/module-apps/CMakeLists.txt b/module-apps/CMakeLists.txt
index d4b4ed7ab..fd86ab34f 100644
--- a/module-apps/CMakeLists.txt
+++ b/module-apps/CMakeLists.txt
@@ -84,6 +84,7 @@ endif()
 
 target_link_libraries(${PROJECT_NAME}
     PRIVATE
+        app
         application-messages
         application-settings
         apps-common
diff --git a/module-apps/application-alarm-clock/ApplicationAlarmClock.cpp b/module-apps/application-alarm-clock/ApplicationAlarmClock.cpp
index 1bb287380..544803171 100644
--- a/module-apps/application-alarm-clock/ApplicationAlarmClock.cpp
+++ b/module-apps/application-alarm-clock/ApplicationAlarmClock.cpp
@@ -64,33 +64,35 @@ namespace app
 
     void ApplicationAlarmClock::createUserInterface()
     {
-        windowsFactory.attach(gui::name::window::main_window, [](Application *app, const std::string &name) {
+        windowsFactory.attach(gui::name::window::main_window, [](ApplicationCommon *app, const std::string &name) {
             auto alarmsRepository = std::make_unique<alarmClock::AlarmsDBRepository>(app);
             auto alarmsProvider   = std::make_shared<alarmClock::AlarmsModel>(app, std::move(alarmsRepository));
             auto presenter        = std::make_unique<alarmClock::AlarmClockMainWindowPresenter>(alarmsProvider);
             return std::make_unique<alarmClock::AlarmClockMainWindow>(app, std::move(presenter));
         });
         windowsFactory.attach(
-            style::alarmClock::window::name::newEditAlarm, [](Application *app, const std::string &name) {
+            style::alarmClock::window::name::newEditAlarm, [](ApplicationCommon *app, const std::string &name) {
                 auto alarmsRepository = std::make_unique<alarmClock::AlarmsDBRepository>(app);
                 auto alarmsProvider = std::make_shared<alarmClock::NewEditAlarmModel>(app, std::move(alarmsRepository));
                 auto presenter      = std::make_unique<alarmClock::AlarmClockEditWindowPresenter>(alarmsProvider);
                 return std::make_unique<alarmClock::NewEditAlarmWindow>(app, std::move(presenter));
             });
         windowsFactory.attach(
-            style::alarmClock::window::name::customRepeat, [](Application *app, const std::string &name) {
+            style::alarmClock::window::name::customRepeat, [](ApplicationCommon *app, const std::string &name) {
                 auto alarmsRepository = std::make_unique<alarmClock::AlarmsDBRepository>(app);
                 auto alarmsProvider = std::make_shared<alarmClock::CustomRepeatModel>(app, std::move(alarmsRepository));
                 auto presenter      = std::make_unique<alarmClock::CustomRepeatWindowPresenter>(alarmsProvider);
                 return std::make_unique<alarmClock::CustomRepeatWindow>(app, std::move(presenter));
             });
-        windowsFactory.attach(
-            utils::translate("app_alarm_clock_options_title"),
-            [](Application *app, const std::string &name) { return std::make_unique<gui::OptionWindow>(app, name); });
+        windowsFactory.attach(utils::translate("app_alarm_clock_options_title"),
+                              [](ApplicationCommon *app, const std::string &name) {
+                                  return std::make_unique<gui::OptionWindow>(app, name);
+                              });
 
-        windowsFactory.attach(
-            style::alarmClock::window::name::dialogYesNo,
-            [](Application *app, const std::string &name) { return std::make_unique<gui::DialogYesNo>(app, name); });
+        windowsFactory.attach(style::alarmClock::window::name::dialogYesNo,
+                              [](ApplicationCommon *app, const std::string &name) {
+                                  return std::make_unique<gui::DialogYesNo>(app, name);
+                              });
 
         attachPopups(
             {gui::popup::ID::Volume, gui::popup::ID::Tethering, gui::popup::ID::PhoneModes, gui::popup::ID::PhoneLock});
diff --git a/module-apps/application-alarm-clock/models/AlarmsModel.cpp b/module-apps/application-alarm-clock/models/AlarmsModel.cpp
index 3ebca4db9..13321a4c5 100644
--- a/module-apps/application-alarm-clock/models/AlarmsModel.cpp
+++ b/module-apps/application-alarm-clock/models/AlarmsModel.cpp
@@ -11,10 +11,10 @@
 
 namespace app::alarmClock
 {
-    AlarmsListItemProvider::AlarmsListItemProvider(Application *app) : DatabaseModel(app)
+    AlarmsListItemProvider::AlarmsListItemProvider(ApplicationCommon *app) : DatabaseModel(app)
     {}
 
-    AlarmsModel::AlarmsModel(app::Application *app, std::shared_ptr<AbstractAlarmsRepository> alarmsRepository)
+    AlarmsModel::AlarmsModel(app::ApplicationCommon *app, std::shared_ptr<AbstractAlarmsRepository> alarmsRepository)
         : AlarmsListItemProvider(app), alarmsRepository{std::move(alarmsRepository)}
     {}
 
diff --git a/module-apps/application-alarm-clock/models/AlarmsModel.hpp b/module-apps/application-alarm-clock/models/AlarmsModel.hpp
index 0bf0c8345..733ef569c 100644
--- a/module-apps/application-alarm-clock/models/AlarmsModel.hpp
+++ b/module-apps/application-alarm-clock/models/AlarmsModel.hpp
@@ -15,13 +15,13 @@ namespace app::alarmClock
     class AlarmsListItemProvider : public app::DatabaseModel<AlarmEventRecord>, public gui::ListItemProvider
     {
       public:
-        explicit AlarmsListItemProvider(app::Application *app);
+        explicit AlarmsListItemProvider(app::ApplicationCommon *app);
     };
 
     class AlarmsModel : public AlarmsListItemProvider
     {
       public:
-        AlarmsModel(app::Application *app, std::shared_ptr<AbstractAlarmsRepository> alarmsRepository);
+        AlarmsModel(app::ApplicationCommon *app, std::shared_ptr<AbstractAlarmsRepository> alarmsRepository);
 
         void requestRecords(uint32_t offset, uint32_t limit) override;
         bool updateRecords(std::vector<AlarmEventRecord> records) override;
diff --git a/module-apps/application-alarm-clock/models/AlarmsRepository.cpp b/module-apps/application-alarm-clock/models/AlarmsRepository.cpp
index 6d656fdcd..b3ff5484b 100644
--- a/module-apps/application-alarm-clock/models/AlarmsRepository.cpp
+++ b/module-apps/application-alarm-clock/models/AlarmsRepository.cpp
@@ -12,7 +12,7 @@ namespace app::alarmClock
 {
     auto async = app::AsyncRequest::createFromMessage;
 
-    AlarmsDBRepository::AlarmsDBRepository(Application *application)
+    AlarmsDBRepository::AlarmsDBRepository(ApplicationCommon *application)
         : AsyncCallbackReceiver{application}, application{application}
     {}
 
diff --git a/module-apps/application-alarm-clock/models/AlarmsRepository.hpp b/module-apps/application-alarm-clock/models/AlarmsRepository.hpp
index 8abd515c2..ad42afa06 100644
--- a/module-apps/application-alarm-clock/models/AlarmsRepository.hpp
+++ b/module-apps/application-alarm-clock/models/AlarmsRepository.hpp
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "Application.hpp"
+#include <apps-common/ApplicationCommon.hpp>
 #include <module-db/Interface/AlarmEventRecord.hpp>
 
 namespace app::alarmClock
@@ -26,7 +26,7 @@ namespace app::alarmClock
     class AlarmsDBRepository : public AbstractAlarmsRepository, public AsyncCallbackReceiver
     {
       public:
-        explicit AlarmsDBRepository(Application *app);
+        explicit AlarmsDBRepository(ApplicationCommon *app);
 
         void getLimited(std::uint32_t offset, std::uint32_t limit, const OnGetCallback &callback) override;
         // template <class QueryType, class ResultType>
@@ -40,6 +40,6 @@ namespace app::alarmClock
         void turnOffAll(const OnResultCallback &callback) override;
 
       private:
-        Application *application;
+        ApplicationCommon *application;
     };
 } // namespace app::alarmClock
diff --git a/module-apps/application-alarm-clock/models/CustomRepeatModel.cpp b/module-apps/application-alarm-clock/models/CustomRepeatModel.cpp
index 20a91d3fa..5d0d30867 100644
--- a/module-apps/application-alarm-clock/models/CustomRepeatModel.cpp
+++ b/module-apps/application-alarm-clock/models/CustomRepeatModel.cpp
@@ -9,7 +9,7 @@
 namespace app::alarmClock
 {
 
-    CustomRepeatModel::CustomRepeatModel(app::Application *app,
+    CustomRepeatModel::CustomRepeatModel(app::ApplicationCommon *app,
                                          std::shared_ptr<AbstractAlarmsRepository> alarmsRepository)
         : application(app), alarmsRepository{std::move(alarmsRepository)}
     {}
diff --git a/module-apps/application-alarm-clock/models/CustomRepeatModel.hpp b/module-apps/application-alarm-clock/models/CustomRepeatModel.hpp
index 7a531b432..92db7db3e 100644
--- a/module-apps/application-alarm-clock/models/CustomRepeatModel.hpp
+++ b/module-apps/application-alarm-clock/models/CustomRepeatModel.hpp
@@ -25,12 +25,12 @@ namespace app::alarmClock
 
     class CustomRepeatModel : public CustomRepeatListItemProvider
     {
-        app::Application *application = nullptr;
+        app::ApplicationCommon *application = nullptr;
         std::shared_ptr<AbstractAlarmsRepository> alarmsRepository;
         void createData(const WeekDaysRepeatData &data);
 
       public:
-        CustomRepeatModel(app::Application *app, std::shared_ptr<AbstractAlarmsRepository> alarmsRepository);
+        CustomRepeatModel(app::ApplicationCommon *app, std::shared_ptr<AbstractAlarmsRepository> alarmsRepository);
 
         [[nodiscard]] unsigned int getMinimalItemSpaceRequired() const override;
         [[nodiscard]] unsigned int requestRecordsCount() override;
diff --git a/module-apps/application-alarm-clock/models/NewEditAlarmModel.cpp b/module-apps/application-alarm-clock/models/NewEditAlarmModel.cpp
index 0dbfb5150..20efc84e7 100644
--- a/module-apps/application-alarm-clock/models/NewEditAlarmModel.cpp
+++ b/module-apps/application-alarm-clock/models/NewEditAlarmModel.cpp
@@ -9,7 +9,7 @@
 
 namespace app::alarmClock
 {
-    NewEditAlarmModel::NewEditAlarmModel(app::Application *app,
+    NewEditAlarmModel::NewEditAlarmModel(app::ApplicationCommon *app,
                                          std::shared_ptr<AbstractAlarmsRepository> alarmsRepository,
                                          bool mode24H)
         : application(app), alarmsRepository{std::move(alarmsRepository)}, mode24H(mode24H)
diff --git a/module-apps/application-alarm-clock/models/NewEditAlarmModel.hpp b/module-apps/application-alarm-clock/models/NewEditAlarmModel.hpp
index 81bf6ebc5..a796d2bbb 100644
--- a/module-apps/application-alarm-clock/models/NewEditAlarmModel.hpp
+++ b/module-apps/application-alarm-clock/models/NewEditAlarmModel.hpp
@@ -26,13 +26,13 @@ namespace app::alarmClock
 
     class NewEditAlarmModel : public AlarmsInternalListItemProvider
     {
-        app::Application *application = nullptr;
+        app::ApplicationCommon *application = nullptr;
         std::shared_ptr<AbstractAlarmsRepository> alarmsRepository;
         gui::AlarmInternalListItem *repeatOption = nullptr;
         bool mode24H = false;
 
       public:
-        NewEditAlarmModel(app::Application *app,
+        NewEditAlarmModel(app::ApplicationCommon *app,
                           std::shared_ptr<AbstractAlarmsRepository> alarmsRepository,
                           bool mode24H = false);
 
diff --git a/module-apps/application-alarm-clock/widgets/AlarmOptionsItem.cpp b/module-apps/application-alarm-clock/widgets/AlarmOptionsItem.cpp
index c2fc489e8..437f2ceea 100644
--- a/module-apps/application-alarm-clock/widgets/AlarmOptionsItem.cpp
+++ b/module-apps/application-alarm-clock/widgets/AlarmOptionsItem.cpp
@@ -12,7 +12,7 @@
 namespace gui
 {
 
-    AlarmOptionsItem::AlarmOptionsItem(app::Application *app,
+    AlarmOptionsItem::AlarmOptionsItem(app::ApplicationCommon *app,
                                        AlarmOptionItemName itemName,
                                        std::function<void(const UTF8 &)> bottomBarTemporaryMode,
                                        std::function<void()> bottomBarRestoreFromTemporaryMode)
diff --git a/module-apps/application-alarm-clock/widgets/AlarmOptionsItem.hpp b/module-apps/application-alarm-clock/widgets/AlarmOptionsItem.hpp
index a9ed54b59..2570d9810 100644
--- a/module-apps/application-alarm-clock/widgets/AlarmOptionsItem.hpp
+++ b/module-apps/application-alarm-clock/widgets/AlarmOptionsItem.hpp
@@ -2,7 +2,8 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #pragma once
-#include "Application.hpp"
+
+#include <apps-common/ApplicationCommon.hpp>
 #include "AlarmInternalListItem.hpp"
 #include "application-alarm-clock/data/AlarmsData.hpp"
 #include <apps-common/AudioOperations.hpp>
@@ -23,7 +24,7 @@ namespace gui
             Stop,
             Play
         };
-        app::Application *application = nullptr;
+        app::ApplicationCommon *application = nullptr;
         gui::VBox *vBox               = nullptr;
         gui::HBox *hBox               = nullptr;
         gui::Label *optionLabel       = nullptr;
@@ -50,7 +51,7 @@ namespace gui
         std::vector<tags::fetcher::Tags> getMusicFilesList();
 
       public:
-        AlarmOptionsItem(app::Application *app,
+        AlarmOptionsItem(app::ApplicationCommon *app,
                          AlarmOptionItemName itemName,
                          std::function<void(const UTF8 &text)> bottomBarTemporaryMode = nullptr,
                          std::function<void()> bottomBarRestoreFromTemporaryMode      = nullptr);
diff --git a/module-apps/application-alarm-clock/widgets/CustomCheckBoxWithLabel.cpp b/module-apps/application-alarm-clock/widgets/CustomCheckBoxWithLabel.cpp
index 11c59108c..ead8f29ae 100644
--- a/module-apps/application-alarm-clock/widgets/CustomCheckBoxWithLabel.cpp
+++ b/module-apps/application-alarm-clock/widgets/CustomCheckBoxWithLabel.cpp
@@ -16,7 +16,7 @@ namespace gui
         {WeekDayIso::Saturday, style::strings::common::Saturday},
         {WeekDayIso::Sunday, style::strings::common::Sunday}};
 
-    CustomCheckBoxWithLabel::CustomCheckBoxWithLabel(app::Application *app,
+    CustomCheckBoxWithLabel::CustomCheckBoxWithLabel(app::ApplicationCommon *app,
                                                      const std::string &description,
                                                      const WeekDaysRepeatData &data)
         : application(app), checkBoxData(data)
diff --git a/module-apps/application-alarm-clock/widgets/CustomCheckBoxWithLabel.hpp b/module-apps/application-alarm-clock/widgets/CustomCheckBoxWithLabel.hpp
index fc5a00157..24bc88864 100644
--- a/module-apps/application-alarm-clock/widgets/CustomCheckBoxWithLabel.hpp
+++ b/module-apps/application-alarm-clock/widgets/CustomCheckBoxWithLabel.hpp
@@ -5,7 +5,7 @@
 
 #include "AlarmInternalListItem.hpp"
 #include "application-alarm-clock/data/AlarmsData.hpp"
-#include "Application.hpp"
+#include "ApplicationCommon.hpp"
 #include "application-calendar/data/CalendarData.hpp"
 #include <BoxLayout.hpp>
 #include <CheckBox.hpp>
@@ -15,7 +15,7 @@ namespace gui
     class CustomCheckBoxWithLabel : public AlarmInternalListItem
     {
         gui::HBox *hBox               = nullptr;
-        app::Application *application = nullptr;
+        app::ApplicationCommon *application = nullptr;
         gui::Label *descriptionLabel  = nullptr;
         gui::CheckBox *checkBox       = nullptr;
         WeekDaysRepeatData checkBoxData;
@@ -24,7 +24,9 @@ namespace gui
         void applyCallbacks();
 
       public:
-        CustomCheckBoxWithLabel(app::Application *app, const std::string &description, const WeekDaysRepeatData &data);
+        CustomCheckBoxWithLabel(app::ApplicationCommon *app,
+                                const std::string &description,
+                                const WeekDaysRepeatData &data);
 
         static const std::map<WeekDayIso, std::string> weekDays;
     };
diff --git a/module-apps/application-alarm-clock/windows/AlarmClockMainWindow.cpp b/module-apps/application-alarm-clock/windows/AlarmClockMainWindow.cpp
index 3edeecf6d..5a616c48a 100644
--- a/module-apps/application-alarm-clock/windows/AlarmClockMainWindow.cpp
+++ b/module-apps/application-alarm-clock/windows/AlarmClockMainWindow.cpp
@@ -16,7 +16,7 @@ namespace app::alarmClock
 {
 
     AlarmClockMainWindow::AlarmClockMainWindow(
-        app::Application *app, std::unique_ptr<AlarmClockMainWindowContract::Presenter> &&windowPresenter)
+        app::ApplicationCommon *app, std::unique_ptr<AlarmClockMainWindowContract::Presenter> &&windowPresenter)
         : AppWindow(app, gui::name::window::main_window), presenter{std::move(windowPresenter)}
     {
         presenter->attach(this);
diff --git a/module-apps/application-alarm-clock/windows/AlarmClockMainWindow.hpp b/module-apps/application-alarm-clock/windows/AlarmClockMainWindow.hpp
index d486d5613..c998310f2 100644
--- a/module-apps/application-alarm-clock/windows/AlarmClockMainWindow.hpp
+++ b/module-apps/application-alarm-clock/windows/AlarmClockMainWindow.hpp
@@ -21,7 +21,7 @@ namespace app::alarmClock
         void onListFilled();
 
       public:
-        AlarmClockMainWindow(app::Application *app,
+        AlarmClockMainWindow(app::ApplicationCommon *app,
                              std::unique_ptr<AlarmClockMainWindowContract::Presenter> &&windowPresenter);
         ~AlarmClockMainWindow() noexcept override;
 
diff --git a/module-apps/application-alarm-clock/windows/AlarmClockOptions.cpp b/module-apps/application-alarm-clock/windows/AlarmClockOptions.cpp
index c4e9b9594..3dbe8d1d9 100644
--- a/module-apps/application-alarm-clock/windows/AlarmClockOptions.cpp
+++ b/module-apps/application-alarm-clock/windows/AlarmClockOptions.cpp
@@ -20,7 +20,7 @@ namespace app::alarmClock
         }
 
         void removeAlarm(const AlarmEventRecord &record,
-                         Application *application,
+                         ApplicationCommon *application,
                          AbstractAlarmsRepository &alarmsRepository)
         {
             auto metaData = std::make_unique<gui::DialogMetadataMessage>(
@@ -38,7 +38,7 @@ namespace app::alarmClock
         }
     } // namespace
 
-    std::list<gui::Option> alarmsListOptions(Application *application,
+    std::list<gui::Option> alarmsListOptions(ApplicationCommon *application,
                                              const AlarmEventRecord &record,
                                              AbstractAlarmsRepository &alarmsRepository)
     {
diff --git a/module-apps/application-alarm-clock/windows/AlarmClockOptions.hpp b/module-apps/application-alarm-clock/windows/AlarmClockOptions.hpp
index 7cb646ecd..2c6b5c2f0 100644
--- a/module-apps/application-alarm-clock/windows/AlarmClockOptions.hpp
+++ b/module-apps/application-alarm-clock/windows/AlarmClockOptions.hpp
@@ -15,7 +15,7 @@ namespace gui
 
 namespace app::alarmClock
 {
-    std::list<gui::Option> alarmsListOptions(Application *application,
+    std::list<gui::Option> alarmsListOptions(ApplicationCommon *application,
                                              const AlarmEventRecord &record,
                                              AbstractAlarmsRepository &alarmsRepository);
 }
diff --git a/module-apps/application-alarm-clock/windows/CustomRepeatWindow.cpp b/module-apps/application-alarm-clock/windows/CustomRepeatWindow.cpp
index 28cb7bdbf..a0f3f7975 100644
--- a/module-apps/application-alarm-clock/windows/CustomRepeatWindow.cpp
+++ b/module-apps/application-alarm-clock/windows/CustomRepeatWindow.cpp
@@ -6,7 +6,7 @@
 namespace app::alarmClock
 {
 
-    CustomRepeatWindow::CustomRepeatWindow(app::Application *app,
+    CustomRepeatWindow::CustomRepeatWindow(app::ApplicationCommon *app,
                                            std::unique_ptr<CustomRepeatWindowContract::Presenter> &&windowPresenter)
         : AppWindow(app, style::alarmClock::window::name::customRepeat), presenter{std::move(windowPresenter)}
     {
diff --git a/module-apps/application-alarm-clock/windows/CustomRepeatWindow.hpp b/module-apps/application-alarm-clock/windows/CustomRepeatWindow.hpp
index d84006347..50a66fdf6 100644
--- a/module-apps/application-alarm-clock/windows/CustomRepeatWindow.hpp
+++ b/module-apps/application-alarm-clock/windows/CustomRepeatWindow.hpp
@@ -19,7 +19,7 @@ namespace app::alarmClock
         WeekDaysRepeatData weekDaysOptData;
 
       public:
-        CustomRepeatWindow(app::Application *app,
+        CustomRepeatWindow(app::ApplicationCommon *app,
                            std::unique_ptr<CustomRepeatWindowContract::Presenter> &&windowPresenter);
 
         void onBeforeShow(gui::ShowMode mode, gui::SwitchData *data) override;
diff --git a/module-apps/application-alarm-clock/windows/NewEditAlarmWindow.cpp b/module-apps/application-alarm-clock/windows/NewEditAlarmWindow.cpp
index cb0667b61..50839b4af 100644
--- a/module-apps/application-alarm-clock/windows/NewEditAlarmWindow.cpp
+++ b/module-apps/application-alarm-clock/windows/NewEditAlarmWindow.cpp
@@ -9,7 +9,7 @@
 namespace app::alarmClock
 {
 
-    NewEditAlarmWindow::NewEditAlarmWindow(app::Application *app,
+    NewEditAlarmWindow::NewEditAlarmWindow(app::ApplicationCommon *app,
                                            std::unique_ptr<AlarmClockEditWindowContract::Presenter> &&windowPresenter)
         : AppWindow(app, style::alarmClock::window::name::newEditAlarm), presenter{std::move(windowPresenter)}
     {
diff --git a/module-apps/application-alarm-clock/windows/NewEditAlarmWindow.hpp b/module-apps/application-alarm-clock/windows/NewEditAlarmWindow.hpp
index 0364f1089..499b4505b 100644
--- a/module-apps/application-alarm-clock/windows/NewEditAlarmWindow.hpp
+++ b/module-apps/application-alarm-clock/windows/NewEditAlarmWindow.hpp
@@ -23,7 +23,7 @@ namespace app::alarmClock
         std::unique_ptr<AlarmClockEditWindowContract::Presenter> presenter;
 
       public:
-        NewEditAlarmWindow(app::Application *app,
+        NewEditAlarmWindow(app::ApplicationCommon *app,
                            std::unique_ptr<AlarmClockEditWindowContract::Presenter> &&windowPresenter);
 
         bool handleSwitchData(gui::SwitchData *data) override;
diff --git a/module-apps/application-antenna/ApplicationAntenna.cpp b/module-apps/application-antenna/ApplicationAntenna.cpp
index 32cfc29f4..000c314d9 100644
--- a/module-apps/application-antenna/ApplicationAntenna.cpp
+++ b/module-apps/application-antenna/ApplicationAntenna.cpp
@@ -151,13 +151,13 @@ namespace app
     void ApplicationAntenna::createUserInterface()
     {
         using namespace gui::name::window;
-        windowsFactory.attach(main_window, [](Application *app, const std::string &name) {
+        windowsFactory.attach(main_window, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::AntennaMainWindow>(app);
         });
-        windowsFactory.attach(scan_window, [](Application *app, const std::string &name) {
+        windowsFactory.attach(scan_window, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::ScanModesWindow>(app);
         });
-        windowsFactory.attach(algo_window, [](Application *app, const std::string &name) {
+        windowsFactory.attach(algo_window, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::AlgoParamsWindow>(app);
         });
 
diff --git a/module-apps/application-antenna/include/application-antenna/ApplicationAntenna.hpp b/module-apps/application-antenna/include/application-antenna/ApplicationAntenna.hpp
index a8c7b35f8..70a5ad45e 100644
--- a/module-apps/application-antenna/include/application-antenna/ApplicationAntenna.hpp
+++ b/module-apps/application-antenna/include/application-antenna/ApplicationAntenna.hpp
@@ -4,7 +4,7 @@
 #pragma once
 
 #include <windows/AppWindow.hpp>
-#include <apps-common/Application.hpp>
+#include <apps-common/ApplicationCommon.hpp>
 #include <module-sys/Timers/TimerHandle.hpp>
 #include <service-cellular/CellularServiceAPI.hpp>
 
diff --git a/module-apps/application-antenna/windows/AlgoParamsWindow.cpp b/module-apps/application-antenna/windows/AlgoParamsWindow.cpp
index 1f7ece9c0..d7822adea 100644
--- a/module-apps/application-antenna/windows/AlgoParamsWindow.cpp
+++ b/module-apps/application-antenna/windows/AlgoParamsWindow.cpp
@@ -17,7 +17,7 @@ using StringList = std::list<std::string>;
 namespace gui
 {
 
-    AlgoParamsWindow::AlgoParamsWindow(app::Application *app) : AppWindow(app, gui::name::window::algo_window)
+    AlgoParamsWindow::AlgoParamsWindow(app::ApplicationCommon *app) : AppWindow(app, gui::name::window::algo_window)
     {
         buildInterface();
     }
diff --git a/module-apps/application-antenna/windows/AlgoParamsWindow.hpp b/module-apps/application-antenna/windows/AlgoParamsWindow.hpp
index cac8a4ec9..e0af4caca 100644
--- a/module-apps/application-antenna/windows/AlgoParamsWindow.hpp
+++ b/module-apps/application-antenna/windows/AlgoParamsWindow.hpp
@@ -4,7 +4,7 @@
 #pragma once
 
 #include <application-antenna/ApplicationAntenna.hpp>
-#include <apps-common/Application.hpp>
+#include <apps-common/ApplicationCommon.hpp>
 #include <apps-common/windows/AppWindow.hpp>
 #include <module-gui/gui/widgets/Text.hpp>
 
@@ -39,7 +39,7 @@ namespace gui
         void updateAntennaLabel(bsp::cellular::antenna antenna);
 
       public:
-        AlgoParamsWindow(app::Application *app);
+        AlgoParamsWindow(app::ApplicationCommon *app);
 
         // virtual methods
         bool onInput(const InputEvent &inputEvent) override;
diff --git a/module-apps/application-antenna/windows/AntennaMainWindow.cpp b/module-apps/application-antenna/windows/AntennaMainWindow.cpp
index 8978256ec..1bc0f5568 100644
--- a/module-apps/application-antenna/windows/AntennaMainWindow.cpp
+++ b/module-apps/application-antenna/windows/AntennaMainWindow.cpp
@@ -25,7 +25,7 @@
 namespace gui
 {
 
-    AntennaMainWindow::AntennaMainWindow(app::Application *app) : AppWindow(app, gui::name::window::main_window)
+    AntennaMainWindow::AntennaMainWindow(app::ApplicationCommon *app) : AppWindow(app, gui::name::window::main_window)
     {
         buildInterface();
     }
diff --git a/module-apps/application-antenna/windows/AntennaMainWindow.hpp b/module-apps/application-antenna/windows/AntennaMainWindow.hpp
index 6575f4565..25f3289c1 100644
--- a/module-apps/application-antenna/windows/AntennaMainWindow.hpp
+++ b/module-apps/application-antenna/windows/AntennaMainWindow.hpp
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <apps-common/Application.hpp>
+#include <apps-common/ApplicationCommon.hpp>
 #include <apps-common/windows/AppWindow.hpp>
 #include <module-gui/gui/widgets/Text.hpp>
 #include <service-antenna/ServiceAntenna.hpp>
@@ -42,7 +42,7 @@ namespace gui
         };
 
       public:
-        AntennaMainWindow(app::Application *app);
+        AntennaMainWindow(app::ApplicationCommon *app);
 
         // virtual methods
         bool onInput(const InputEvent &inputEvent) override;
diff --git a/module-apps/application-antenna/windows/ScanModesWindow.cpp b/module-apps/application-antenna/windows/ScanModesWindow.cpp
index b49579b14..709eec782 100644
--- a/module-apps/application-antenna/windows/ScanModesWindow.cpp
+++ b/module-apps/application-antenna/windows/ScanModesWindow.cpp
@@ -15,7 +15,7 @@
 namespace gui
 {
 
-    ScanModesWindow::ScanModesWindow(app::Application *app) : AppWindow(app, gui::name::window::scan_window)
+    ScanModesWindow::ScanModesWindow(app::ApplicationCommon *app) : AppWindow(app, gui::name::window::scan_window)
     {
         buildInterface();
     }
diff --git a/module-apps/application-antenna/windows/ScanModesWindow.hpp b/module-apps/application-antenna/windows/ScanModesWindow.hpp
index ed10ba2d3..25e9d3540 100644
--- a/module-apps/application-antenna/windows/ScanModesWindow.hpp
+++ b/module-apps/application-antenna/windows/ScanModesWindow.hpp
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <apps-common/Application.hpp>
+#include <apps-common/ApplicationCommon.hpp>
 #include <apps-common/windows/AppWindow.hpp>
 #include <module-gui/gui/widgets/Text.hpp>
 
@@ -40,7 +40,7 @@ namespace gui
         gui::Label *addSpacer(void);
 
       public:
-        ScanModesWindow(app::Application *app);
+        ScanModesWindow(app::ApplicationCommon *app);
 
         // virtual methods
         bool onInput(const InputEvent &inputEvent) override;
diff --git a/module-apps/application-calculator/ApplicationCalculator.cpp b/module-apps/application-calculator/ApplicationCalculator.cpp
index e6b38c2d9..03caae146 100644
--- a/module-apps/application-calculator/ApplicationCalculator.cpp
+++ b/module-apps/application-calculator/ApplicationCalculator.cpp
@@ -34,7 +34,7 @@ namespace app
 
     void ApplicationCalculator::createUserInterface()
     {
-        windowsFactory.attach(gui::name::window::main_window, [](Application *app, const std::string &name) {
+        windowsFactory.attach(gui::name::window::main_window, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::CalculatorMainWindow>(app, name);
         });
 
diff --git a/module-apps/application-calculator/CMakeLists.txt b/module-apps/application-calculator/CMakeLists.txt
index 884da3d52..7ddba55b1 100644
--- a/module-apps/application-calculator/CMakeLists.txt
+++ b/module-apps/application-calculator/CMakeLists.txt
@@ -38,6 +38,7 @@ target_link_libraries(application-calculator
     PUBLIC
         apps-common
     PRIVATE
+        app
         i18n
         Microsoft.GSL::GSL
         module-gui
diff --git a/module-apps/application-calculator/include/application-calculator/ApplicationCalculator.hpp b/module-apps/application-calculator/include/application-calculator/ApplicationCalculator.hpp
index 94e334505..723788911 100644
--- a/module-apps/application-calculator/include/application-calculator/ApplicationCalculator.hpp
+++ b/module-apps/application-calculator/include/application-calculator/ApplicationCalculator.hpp
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <apps-common/Application.hpp>
+#include <Application.hpp>
 
 namespace app
 {
diff --git a/module-apps/application-calculator/widgets/MathOperationsBox.hpp b/module-apps/application-calculator/widgets/MathOperationsBox.hpp
index d2c21967f..30bbddf1c 100644
--- a/module-apps/application-calculator/widgets/MathOperationsBox.hpp
+++ b/module-apps/application-calculator/widgets/MathOperationsBox.hpp
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <apps-common/Application.hpp>
+#include <apps-common/ApplicationCommon.hpp>
 #include <module-gui/gui/widgets/GridLayout.hpp>
 #include <module-gui/gui/widgets/Item.hpp>
 
diff --git a/module-apps/application-calculator/windows/CalculatorMainWindow.cpp b/module-apps/application-calculator/windows/CalculatorMainWindow.cpp
index 01265d222..e8884ed12 100644
--- a/module-apps/application-calculator/windows/CalculatorMainWindow.cpp
+++ b/module-apps/application-calculator/windows/CalculatorMainWindow.cpp
@@ -8,7 +8,7 @@
 namespace gui
 {
 
-    CalculatorMainWindow::CalculatorMainWindow(app::Application *app, std::string name) : AppWindow(app, name)
+    CalculatorMainWindow::CalculatorMainWindow(app::ApplicationCommon *app, std::string name) : AppWindow(app, name)
     {
         buildInterface();
     }
diff --git a/module-apps/application-calculator/windows/CalculatorMainWindow.hpp b/module-apps/application-calculator/windows/CalculatorMainWindow.hpp
index ee022c038..26c1f4f75 100644
--- a/module-apps/application-calculator/windows/CalculatorMainWindow.hpp
+++ b/module-apps/application-calculator/windows/CalculatorMainWindow.hpp
@@ -5,7 +5,7 @@
 
 #include <data/CalculatorInputProcessor.hpp>
 #include <widgets/MathOperationsBox.hpp>
-#include <apps-common/Application.hpp>
+#include <apps-common/ApplicationCommon.hpp>
 #include <apps-common/windows/AppWindow.hpp>
 #include <module-gui/gui/widgets/Text.hpp>
 
@@ -20,7 +20,7 @@ namespace gui
         void setupInputProcessing();
 
       public:
-        CalculatorMainWindow(app::Application *app, std::string name);
+        CalculatorMainWindow(app::ApplicationCommon *app, std::string name);
 
         ~CalculatorMainWindow() override = default;
         void buildInterface() override;
diff --git a/module-apps/application-calendar/ApplicationCalendar.cpp b/module-apps/application-calendar/ApplicationCalendar.cpp
index 647a0d3d9..e3d871b8d 100644
--- a/module-apps/application-calendar/ApplicationCalendar.cpp
+++ b/module-apps/application-calendar/ApplicationCalendar.cpp
@@ -40,7 +40,7 @@ namespace app
 
     void ApplicationCalendar::createUserInterface()
     {
-        windowsFactory.attach(gui::name::window::main_window, [](Application *app, const std::string &name) {
+        windowsFactory.attach(gui::name::window::main_window, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::CalendarMainWindow>(app, name);
         });
 
diff --git a/module-apps/application-calendar/CMakeLists.txt b/module-apps/application-calendar/CMakeLists.txt
index a390f272e..9ade31dce 100644
--- a/module-apps/application-calendar/CMakeLists.txt
+++ b/module-apps/application-calendar/CMakeLists.txt
@@ -49,6 +49,7 @@ target_link_libraries(application-calendar
 		time-constants
 
 	PRIVATE
+		app
 		service-appmgr
 		service-db
 		service-time
diff --git a/module-apps/application-calendar/widgets/DayLabel.cpp b/module-apps/application-calendar/widgets/DayLabel.cpp
index 249586fb7..aeb6db803 100644
--- a/module-apps/application-calendar/widgets/DayLabel.cpp
+++ b/module-apps/application-calendar/widgets/DayLabel.cpp
@@ -12,7 +12,7 @@
 
 namespace gui
 {
-    DayLabel::DayLabel(app::Application *app,
+    DayLabel::DayLabel(app::ApplicationCommon *app,
                        gui::Item *parent,
                        const uint32_t &cellIndex,
                        const uint32_t &firstWeekOffset,
diff --git a/module-apps/application-calendar/widgets/DayLabel.hpp b/module-apps/application-calendar/widgets/DayLabel.hpp
index fb76a0112..ab096077b 100644
--- a/module-apps/application-calendar/widgets/DayLabel.hpp
+++ b/module-apps/application-calendar/widgets/DayLabel.hpp
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <apps-common/Application.hpp>
+#include <apps-common/ApplicationCommon.hpp>
 #include <gui/widgets/BoxLayout.hpp>
 
 namespace gui
@@ -17,7 +17,7 @@ namespace gui
         gui::Image *dotImage  = nullptr;
 
       public:
-        DayLabel(app::Application *app,
+        DayLabel(app::ApplicationCommon *app,
                  gui::Item *parent,
                  const uint32_t &cellIndex,
                  const uint32_t &firstWeekOffset,
diff --git a/module-apps/application-calendar/widgets/MonthBox.cpp b/module-apps/application-calendar/widgets/MonthBox.cpp
index 4741fb7e4..bf50dcb9c 100644
--- a/module-apps/application-calendar/widgets/MonthBox.cpp
+++ b/module-apps/application-calendar/widgets/MonthBox.cpp
@@ -8,7 +8,7 @@
 
 namespace gui
 {
-    MonthBox::MonthBox(app::Application *app,
+    MonthBox::MonthBox(app::ApplicationCommon *app,
                        gui::Item *parent,
                        const int &offsetTop,
                        const uint32_t &width,
diff --git a/module-apps/application-calendar/widgets/MonthBox.hpp b/module-apps/application-calendar/widgets/MonthBox.hpp
index dd7002317..30fd1cf25 100644
--- a/module-apps/application-calendar/widgets/MonthBox.hpp
+++ b/module-apps/application-calendar/widgets/MonthBox.hpp
@@ -5,7 +5,7 @@
 
 #include <models/MonthModel.hpp>
 
-#include <apps-common/Application.hpp>
+#include <apps-common/ApplicationCommon.hpp>
 #include <gui/widgets/GridLayout.hpp>
 
 namespace gui
@@ -13,7 +13,7 @@ namespace gui
     class MonthBox : public GridLayout
     {
       public:
-        MonthBox(app::Application *app,
+        MonthBox(app::ApplicationCommon *app,
                  gui::Item *parent,
                  const int &offsetTop,
                  const uint32_t &width,
diff --git a/module-apps/application-calendar/windows/CalendarMainWindow.cpp b/module-apps/application-calendar/windows/CalendarMainWindow.cpp
index b5c5a894f..ce2c31f94 100644
--- a/module-apps/application-calendar/windows/CalendarMainWindow.cpp
+++ b/module-apps/application-calendar/windows/CalendarMainWindow.cpp
@@ -12,7 +12,7 @@
 namespace gui
 {
 
-    CalendarMainWindow::CalendarMainWindow(app::Application *app, const std::string &name)
+    CalendarMainWindow::CalendarMainWindow(app::ApplicationCommon *app, const std::string &name)
         : AppWindow(app, name), app::AsyncCallbackReceiver{app}
     {
         std::chrono::system_clock::time_point tp = std::chrono::system_clock::now();
diff --git a/module-apps/application-calendar/windows/CalendarMainWindow.hpp b/module-apps/application-calendar/windows/CalendarMainWindow.hpp
index cdf3a591b..389775f40 100644
--- a/module-apps/application-calendar/windows/CalendarMainWindow.hpp
+++ b/module-apps/application-calendar/windows/CalendarMainWindow.hpp
@@ -8,7 +8,7 @@
 #include <widgets/DayLabel.hpp>
 #include <widgets/MonthBox.hpp>
 
-#include <apps-common/Application.hpp>
+#include <apps-common/ApplicationCommon.hpp>
 #include <apps-common/windows/AppWindow.hpp>
 #include <gui/widgets/GridLayout.hpp>
 
@@ -42,7 +42,7 @@ namespace gui
         std::unique_ptr<MonthModel> monthModel;
 
       public:
-        CalendarMainWindow(app::Application *app, const std::string &name);
+        CalendarMainWindow(app::ApplicationCommon *app, const std::string &name);
 
         void rebuild() override;
         void buildMonth(std::unique_ptr<MonthModel> &model);
diff --git a/module-apps/application-call/ApplicationCall.cpp b/module-apps/application-call/ApplicationCall.cpp
index 67300eefe..f943afe2e 100644
--- a/module-apps/application-call/ApplicationCall.cpp
+++ b/module-apps/application-call/ApplicationCall.cpp
@@ -150,16 +150,16 @@ namespace app
 
     void ApplicationCall::createUserInterface()
     {
-        windowsFactory.attach(app::window::name_enterNumber, [](Application *app, const std::string newname) {
+        windowsFactory.attach(app::window::name_enterNumber, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::EnterNumberWindow>(app, static_cast<ApplicationCall *>(app));
         });
-        windowsFactory.attach(app::window::name_call, [](Application *app, const std::string &name) {
+        windowsFactory.attach(app::window::name_call, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::CallWindow>(app, static_cast<ApplicationCall *>(app));
         });
-        windowsFactory.attach(app::window::name_emergencyCall, [](Application *app, const std::string &name) {
+        windowsFactory.attach(app::window::name_emergencyCall, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::EmergencyCallWindow>(app, static_cast<ApplicationCall *>(app));
         });
-        windowsFactory.attach(app::window::name_dialogConfirm, [](Application *app, const std::string &name) {
+        windowsFactory.attach(app::window::name_dialogConfirm, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::DialogConfirm>(app, name);
         });
         attachPopups({gui::popup::ID::Volume, gui::popup::ID::Tethering, gui::popup::ID::PhoneModes});
diff --git a/module-apps/application-call/CMakeLists.txt b/module-apps/application-call/CMakeLists.txt
index 9a0726b29..e09479e08 100644
--- a/module-apps/application-call/CMakeLists.txt
+++ b/module-apps/application-call/CMakeLists.txt
@@ -38,6 +38,7 @@ target_sources(application-call
 
 target_link_libraries(application-call
     PRIVATE
+		app
 		i18n
 		libphonenumber::libphonenumber
 		log
diff --git a/module-apps/application-call/windows/CallWindow.cpp b/module-apps/application-call/windows/CallWindow.cpp
index 6a19a1256..1146fa634 100644
--- a/module-apps/application-call/windows/CallWindow.cpp
+++ b/module-apps/application-call/windows/CallWindow.cpp
@@ -34,7 +34,7 @@ namespace gui
     using namespace app::call;
     using AudioEvent = app::CallWindowInterface::AudioEvent;
 
-    CallWindow::CallWindow(app::Application *app, app::CallWindowInterface *interface, std::string windowName)
+    CallWindow::CallWindow(app::ApplicationCommon *app, app::CallWindowInterface *interface, std::string windowName)
         : AppWindow(app, windowName), interface(interface)
     {
         assert(interface != nullptr);
diff --git a/module-apps/application-call/windows/CallWindow.hpp b/module-apps/application-call/windows/CallWindow.hpp
index e03c46029..1e90a5d64 100644
--- a/module-apps/application-call/windows/CallWindow.hpp
+++ b/module-apps/application-call/windows/CallWindow.hpp
@@ -59,7 +59,7 @@ namespace gui
         [[nodiscard]] auto getState() const noexcept -> app::call::State;
 
       public:
-        CallWindow(app::Application *app,
+        CallWindow(app::ApplicationCommon *app,
                    app::CallWindowInterface *interface,
                    std::string windowName = app::window::name_call);
 
diff --git a/module-apps/application-call/windows/EmergencyCallWindow.cpp b/module-apps/application-call/windows/EmergencyCallWindow.cpp
index b4a4e7cee..cdbac5760 100644
--- a/module-apps/application-call/windows/EmergencyCallWindow.cpp
+++ b/module-apps/application-call/windows/EmergencyCallWindow.cpp
@@ -9,7 +9,7 @@
 namespace gui
 {
 
-    EmergencyCallWindow::EmergencyCallWindow(app::Application *app, app::EnterNumberWindowInterface *interface)
+    EmergencyCallWindow::EmergencyCallWindow(app::ApplicationCommon *app, app::EnterNumberWindowInterface *interface)
         : NumberWindow(app, interface, app::window::name_emergencyCall)
     {
         buildInterface();
diff --git a/module-apps/application-call/windows/EmergencyCallWindow.hpp b/module-apps/application-call/windows/EmergencyCallWindow.hpp
index 40c2a1dc9..3ae58e63a 100644
--- a/module-apps/application-call/windows/EmergencyCallWindow.hpp
+++ b/module-apps/application-call/windows/EmergencyCallWindow.hpp
@@ -11,7 +11,7 @@ namespace gui
     class EmergencyCallWindow : public NumberWindow
     {
       public:
-        EmergencyCallWindow(app::Application *app, app::EnterNumberWindowInterface *interface);
+        EmergencyCallWindow(app::ApplicationCommon *app, app::EnterNumberWindowInterface *interface);
         ~EmergencyCallWindow() override = default;
 
         bool onInput(const InputEvent &inputEvent) override;
diff --git a/module-apps/application-call/windows/EnterNumberWindow.cpp b/module-apps/application-call/windows/EnterNumberWindow.cpp
index 9f0fd18ca..55d95a735 100644
--- a/module-apps/application-call/windows/EnterNumberWindow.cpp
+++ b/module-apps/application-call/windows/EnterNumberWindow.cpp
@@ -18,7 +18,7 @@
 
 namespace gui
 {
-    EnterNumberWindow::EnterNumberWindow(app::Application *app,
+    EnterNumberWindow::EnterNumberWindow(app::ApplicationCommon *app,
                                          app::EnterNumberWindowInterface *interface,
                                          std::string windowName)
         : NumberWindow(app, interface, std::move(windowName))
diff --git a/module-apps/application-call/windows/EnterNumberWindow.hpp b/module-apps/application-call/windows/EnterNumberWindow.hpp
index 4deeab962..37b70f31b 100644
--- a/module-apps/application-call/windows/EnterNumberWindow.hpp
+++ b/module-apps/application-call/windows/EnterNumberWindow.hpp
@@ -13,7 +13,7 @@ namespace gui
         gui::AddContactIcon *newContactIcon = nullptr;
 
       public:
-        EnterNumberWindow(app::Application *app,
+        EnterNumberWindow(app::ApplicationCommon *app,
                           app::EnterNumberWindowInterface *interface,
                           std::string windowName = app::window::name_enterNumber);
         ~EnterNumberWindow() override = default;
diff --git a/module-apps/application-call/windows/NumberWindow.cpp b/module-apps/application-call/windows/NumberWindow.cpp
index dc2f03ca2..4c26a8768 100644
--- a/module-apps/application-call/windows/NumberWindow.cpp
+++ b/module-apps/application-call/windows/NumberWindow.cpp
@@ -19,7 +19,7 @@
 
 namespace gui
 {
-    NumberWindow::NumberWindow(app::Application *app,
+    NumberWindow::NumberWindow(app::ApplicationCommon *app,
                                app::EnterNumberWindowInterface *interface,
                                std::string windowName)
         : AppWindow(app, std::move(windowName)), interface(interface), currentCountry(defaultCountry),
diff --git a/module-apps/application-call/windows/NumberWindow.hpp b/module-apps/application-call/windows/NumberWindow.hpp
index 3ceda3b9e..677aa2d1d 100644
--- a/module-apps/application-call/windows/NumberWindow.hpp
+++ b/module-apps/application-call/windows/NumberWindow.hpp
@@ -24,7 +24,7 @@ namespace gui
       public:
         using CountryCode = utils::country::Id;
 
-        NumberWindow(app::Application *app,
+        NumberWindow(app::ApplicationCommon *app,
                      app::EnterNumberWindowInterface *interface,
                      std::string windowName = app::window::name_number);
 
diff --git a/module-apps/application-calllog/ApplicationCallLog.cpp b/module-apps/application-calllog/ApplicationCallLog.cpp
index 9cedfc3c9..cbf20f825 100644
--- a/module-apps/application-calllog/ApplicationCallLog.cpp
+++ b/module-apps/application-calllog/ApplicationCallLog.cpp
@@ -82,16 +82,17 @@ namespace app
 
     void ApplicationCallLog::createUserInterface()
     {
-        windowsFactory.attach(calllog::settings::MainWindowStr, [](Application *app, const std::string &name) {
+        windowsFactory.attach(calllog::settings::MainWindowStr, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::CallLogMainWindow>(app);
         });
-        windowsFactory.attach(calllog::settings::DetailsWindowStr, [](Application *app, const std::string &name) {
+        windowsFactory.attach(calllog::settings::DetailsWindowStr, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::CallLogDetailsWindow>(app);
         });
-        windowsFactory.attach(
-            utils::translate("app_phonebook_options_title"),
-            [](Application *app, const std::string &name) { return std::make_unique<gui::OptionWindow>(app, name); });
-        windowsFactory.attach(calllog::settings::DialogYesNoStr, [](Application *app, const std::string &name) {
+        windowsFactory.attach(utils::translate("app_phonebook_options_title"),
+                              [](ApplicationCommon *app, const std::string &name) {
+                                  return std::make_unique<gui::OptionWindow>(app, name);
+                              });
+        windowsFactory.attach(calllog::settings::DialogYesNoStr, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::DialogYesNo>(app, name);
         });
 
diff --git a/module-apps/application-calllog/CMakeLists.txt b/module-apps/application-calllog/CMakeLists.txt
index 07009d1b0..6e852cf59 100644
--- a/module-apps/application-calllog/CMakeLists.txt
+++ b/module-apps/application-calllog/CMakeLists.txt
@@ -38,6 +38,7 @@ target_sources( application-calllog
 target_link_libraries( application-calllog
 
 	PRIVATE
+		app
 		i18n
 		log
 		Microsoft.GSL::GSL
diff --git a/module-apps/application-calllog/CalllogModel.cpp b/module-apps/application-calllog/CalllogModel.cpp
index c8a2e3c02..c96ce664b 100644
--- a/module-apps/application-calllog/CalllogModel.cpp
+++ b/module-apps/application-calllog/CalllogModel.cpp
@@ -15,7 +15,7 @@
 
 using namespace calllog;
 
-CalllogModel::CalllogModel(app::Application *app) : DatabaseModel(app), app::AsyncCallbackReceiver(app)
+CalllogModel::CalllogModel(app::ApplicationCommon *app) : DatabaseModel(app), app::AsyncCallbackReceiver(app)
 {}
 
 unsigned int CalllogModel::requestRecordsCount()
diff --git a/module-apps/application-calllog/CalllogModel.hpp b/module-apps/application-calllog/CalllogModel.hpp
index 6c01b7585..295fd4e0b 100644
--- a/module-apps/application-calllog/CalllogModel.hpp
+++ b/module-apps/application-calllog/CalllogModel.hpp
@@ -15,7 +15,7 @@ class CalllogModel : public app::DatabaseModel<CalllogRecord>,
                      public app::AsyncCallbackReceiver
 {
   public:
-    explicit CalllogModel(app::Application *app);
+    explicit CalllogModel(app::ApplicationCommon *app);
 
     [[nodiscard]] unsigned int requestRecordsCount() override;
     [[nodiscard]] bool updateRecords(std::vector<CalllogRecord> records) override;
diff --git a/module-apps/application-calllog/windows/CallLogDetailsWindow.cpp b/module-apps/application-calllog/windows/CallLogDetailsWindow.cpp
index 1c4ae1df0..00666fcba 100644
--- a/module-apps/application-calllog/windows/CallLogDetailsWindow.cpp
+++ b/module-apps/application-calllog/windows/CallLogDetailsWindow.cpp
@@ -23,7 +23,7 @@ namespace detailsWindow = callLogStyle::detailsWindow;
 namespace gui
 {
 
-    CallLogDetailsWindow::CallLogDetailsWindow(app::Application *app)
+    CallLogDetailsWindow::CallLogDetailsWindow(app::ApplicationCommon *app)
         : AppWindow(app, calllog::settings::DetailsWindowStr)
     {
         buildInterface();
diff --git a/module-apps/application-calllog/windows/CallLogDetailsWindow.hpp b/module-apps/application-calllog/windows/CallLogDetailsWindow.hpp
index 4b9d64a8d..3ddeee08e 100644
--- a/module-apps/application-calllog/windows/CallLogDetailsWindow.hpp
+++ b/module-apps/application-calllog/windows/CallLogDetailsWindow.hpp
@@ -35,7 +35,7 @@ namespace gui
         void initDateWidgets();
 
       public:
-        explicit CallLogDetailsWindow(app::Application *app);
+        explicit CallLogDetailsWindow(app::ApplicationCommon *app);
 
         // virtual methods
         bool onInput(const InputEvent &inputEvent) override;
diff --git a/module-apps/application-calllog/windows/CallLogMainWindow.cpp b/module-apps/application-calllog/windows/CallLogMainWindow.cpp
index a67a75168..dbaf3d5fc 100644
--- a/module-apps/application-calllog/windows/CallLogMainWindow.cpp
+++ b/module-apps/application-calllog/windows/CallLogMainWindow.cpp
@@ -24,7 +24,7 @@ using namespace callLogStyle;
 namespace gui
 {
 
-    CallLogMainWindow::CallLogMainWindow(app::Application *app)
+    CallLogMainWindow::CallLogMainWindow(app::ApplicationCommon *app)
         : AppWindow(app, calllog::settings::MainWindowStr), calllogModel{std::make_shared<CalllogModel>(app)}
     {
 
diff --git a/module-apps/application-calllog/windows/CallLogMainWindow.hpp b/module-apps/application-calllog/windows/CallLogMainWindow.hpp
index 26c12178c..d9af7328d 100644
--- a/module-apps/application-calllog/windows/CallLogMainWindow.hpp
+++ b/module-apps/application-calllog/windows/CallLogMainWindow.hpp
@@ -19,7 +19,7 @@ namespace gui
         gui::Icon *emptyListIcon                   = nullptr;
 
       public:
-        explicit CallLogMainWindow(app::Application *app);
+        explicit CallLogMainWindow(app::ApplicationCommon *app);
 
         // virtual methods
         void onBeforeShow(ShowMode mode, SwitchData *data) override;
diff --git a/module-apps/application-clock/ApplicationClock.cpp b/module-apps/application-clock/ApplicationClock.cpp
index c3984712a..42a48e7d1 100644
--- a/module-apps/application-clock/ApplicationClock.cpp
+++ b/module-apps/application-clock/ApplicationClock.cpp
@@ -83,7 +83,7 @@ namespace app
 
     void ApplicationClock::createUserInterface()
     {
-        windowsFactory.attach(gui::name::window::main_window, [](Application *app, const std::string &name) {
+        windowsFactory.attach(gui::name::window::main_window, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::ClockMainWindow>(app, name);
         });
 
diff --git a/module-apps/application-clock/windows/ClockMainWindow.cpp b/module-apps/application-clock/windows/ClockMainWindow.cpp
index b8932ac1e..cf5b0cc23 100644
--- a/module-apps/application-clock/windows/ClockMainWindow.cpp
+++ b/module-apps/application-clock/windows/ClockMainWindow.cpp
@@ -16,7 +16,7 @@
 namespace gui
 {
 
-    ClockMainWindow::ClockMainWindow(app::Application *app, const std::string &name) : gui::AppWindow(app, name)
+    ClockMainWindow::ClockMainWindow(app::ApplicationCommon *app, const std::string &name) : gui::AppWindow(app, name)
     {
         uint32_t xOffset = 0;
         uint32_t yOffset = 0;
diff --git a/module-apps/application-clock/windows/ClockMainWindow.hpp b/module-apps/application-clock/windows/ClockMainWindow.hpp
index e17b964c6..7d48682d9 100644
--- a/module-apps/application-clock/windows/ClockMainWindow.hpp
+++ b/module-apps/application-clock/windows/ClockMainWindow.hpp
@@ -24,7 +24,7 @@ namespace gui
         ProgressBar *progressBar = nullptr;
 
       public:
-        ClockMainWindow(app::Application *app, const std::string &name);
+        ClockMainWindow(app::ApplicationCommon *app, const std::string &name);
 
         bool handleSwitchData(SwitchData *data) override;
 
diff --git a/module-apps/application-desktop/ApplicationDesktop.cpp b/module-apps/application-desktop/ApplicationDesktop.cpp
index 87d3ac15d..7268a987f 100644
--- a/module-apps/application-desktop/ApplicationDesktop.cpp
+++ b/module-apps/application-desktop/ApplicationDesktop.cpp
@@ -157,40 +157,41 @@ namespace app
     void ApplicationDesktop::createUserInterface()
     {
         using namespace app::window::name;
-        windowsFactory.attach(desktop_main_window, [](Application *app, const std::string &name) {
+        windowsFactory.attach(desktop_main_window, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::DesktopMainWindow>(app);
         });
-        windowsFactory.attach(desktop_menu, [this](Application *app, const std::string newname) {
+        windowsFactory.attach(desktop_menu, [this](ApplicationCommon *app, const std::string newname) {
             return std::make_unique<gui::MenuWindow>(app, dbNotificationHandler);
         });
-        windowsFactory.attach(dead_battery, [](Application *app, const std::string newname) {
+        windowsFactory.attach(dead_battery, [](ApplicationCommon *app, const std::string newname) {
             return std::make_unique<gui::DeadBatteryWindow>(app);
         });
-        windowsFactory.attach(logo_window, [](Application *app, const std::string newname) {
+        windowsFactory.attach(logo_window, [](ApplicationCommon *app, const std::string newname) {
             return std::make_unique<gui::LogoWindow>(app);
         });
-        windowsFactory.attach(charging_battery, [](Application *app, const std::string newname) {
+        windowsFactory.attach(charging_battery, [](ApplicationCommon *app, const std::string newname) {
             return std::make_unique<gui::ChargingBatteryWindow>(app);
         });
-        windowsFactory.attach(desktop_reboot, [](Application *app, const std::string newname) {
+        windowsFactory.attach(desktop_reboot, [](ApplicationCommon *app, const std::string newname) {
             auto presenter = std::make_unique<gui::PowerOffPresenter>(app);
             return std::make_unique<gui::RebootWindow>(app, std::move(presenter));
         });
-        windowsFactory.attach(desktop_mmi_pull, [](Application *app, const std::string newname) {
+        windowsFactory.attach(desktop_mmi_pull, [](ApplicationCommon *app, const std::string newname) {
             return std::make_unique<gui::MmiPullWindow>(app, desktop_mmi_pull);
         });
-        windowsFactory.attach(desktop_mmi_push, [](Application *app, const std::string newname) {
+        windowsFactory.attach(desktop_mmi_push, [](ApplicationCommon *app, const std::string newname) {
             return std::make_unique<gui::MmiPushWindow>(app, desktop_mmi_push);
         });
-        windowsFactory.attach(desktop_mmi_internal, [](Application *app, const std::string newname) {
+        windowsFactory.attach(desktop_mmi_internal, [](ApplicationCommon *app, const std::string newname) {
             return std::make_unique<gui::MmiInternalMsgWindow>(app, desktop_mmi_internal);
         });
-        windowsFactory.attach(gui::window::name::dialog_confirm, [](Application *app, const std::string &name) {
+        windowsFactory.attach(gui::window::name::dialog_confirm, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::DialogConfirm>(app, name);
         });
-        windowsFactory.attach(gui::popup::window::tethering_off_window, [](Application *app, const std::string &name) {
-            return std::make_unique<gui::TetheringOffPopup>(app, gui::popup::window::tethering_off_window);
-        });
+        windowsFactory.attach(
+            gui::popup::window::tethering_off_window, [](ApplicationCommon *app, const std::string &name) {
+                return std::make_unique<gui::TetheringOffPopup>(app, gui::popup::window::tethering_off_window);
+            });
 
         attachPopups({gui::popup::ID::Volume,
                       gui::popup::ID::Tethering,
diff --git a/module-apps/application-desktop/CMakeLists.txt b/module-apps/application-desktop/CMakeLists.txt
index 9722dc4d8..0e66a09d9 100644
--- a/module-apps/application-desktop/CMakeLists.txt
+++ b/module-apps/application-desktop/CMakeLists.txt
@@ -54,6 +54,7 @@ target_sources(application-desktop
 
 target_link_libraries(application-desktop
     PRIVATE
+		app
 		application-messages
 		i18n
 		log
diff --git a/module-apps/application-desktop/include/application-desktop/DBNotificationsHandler.hpp b/module-apps/application-desktop/include/application-desktop/DBNotificationsHandler.hpp
index 78ac2548a..28be3cc2a 100644
--- a/module-apps/application-desktop/include/application-desktop/DBNotificationsHandler.hpp
+++ b/module-apps/application-desktop/include/application-desktop/DBNotificationsHandler.hpp
@@ -13,7 +13,7 @@ namespace db
 
 namespace app
 {
-    class Application;
+    class ApplicationCommon;
 
     class DBNotificationsBaseHandler
     {
@@ -30,13 +30,13 @@ namespace app
 
     class DBNotificationsHandler : public DBNotificationsBaseHandler
     {
-        Application *ownerApp = nullptr;
+        ApplicationCommon *ownerApp = nullptr;
         std::map<Type, int> notifications;
 
         void setNotification(Type type, int value);
 
       public:
-        explicit DBNotificationsHandler(Application *ownerApp);
+        explicit DBNotificationsHandler(ApplicationCommon *ownerApp);
 
         void initHandler();
         bool handle(db::NotificationMessage *msg);
diff --git a/module-apps/application-desktop/models/ActiveNotificationsModel.cpp b/module-apps/application-desktop/models/ActiveNotificationsModel.cpp
index 49920c2f3..97e72d6bf 100644
--- a/module-apps/application-desktop/models/ActiveNotificationsModel.cpp
+++ b/module-apps/application-desktop/models/ActiveNotificationsModel.cpp
@@ -31,7 +31,7 @@ namespace
         };
     }
 
-    auto createSMSActivatedCallback(app::Application *app)
+    auto createSMSActivatedCallback(app::ApplicationCommon *app)
     {
         return [app]([[maybe_unused]] gui::Item &_item) {
             return app::manager::Controller::sendAction(
@@ -39,7 +39,7 @@ namespace
         };
     }
 
-    auto createSMSActivatedCallback(app::Application *app, const ContactRecord &record)
+    auto createSMSActivatedCallback(app::ApplicationCommon *app, const ContactRecord &record)
     {
         Expects(not record.numbers.empty());
         return [app, number = record.numbers[0].number]([[maybe_unused]] gui::Item &_item) {
@@ -60,7 +60,7 @@ namespace
         };
     }
 
-    void setSMSActivatedCallback(NotificationListItem *item, Notification provider, app::Application *app)
+    void setSMSActivatedCallback(NotificationListItem *item, Notification provider, app::ApplicationCommon *app)
     {
         if (provider->hasRecord() && not provider->getRecord().numbers.empty()) {
             item->activatedCallback = createSMSActivatedCallback(app, provider->getRecord());
@@ -70,7 +70,7 @@ namespace
         }
     }
 
-    void setSMSOnInputCallback(NotificationListItem *item, app::Application *app)
+    void setSMSOnInputCallback(NotificationListItem *item, app::ApplicationCommon *app)
     {
         item->inputCallback = [app]([[maybe_unused]] Item &item, const InputEvent &inputEvent) {
             if (inputEvent.isShortRelease(KeyCode::KEY_RF)) {
@@ -96,14 +96,14 @@ namespace
         };
     }
 
-    void setCallActivatedCallback(NotificationListItem *item, app::Application *app)
+    void setCallActivatedCallback(NotificationListItem *item, app::ApplicationCommon *app)
     {
         item->activatedCallback = [app]([[maybe_unused]] gui::Item &_item) {
             return app::manager::Controller::sendAction(app, app::manager::actions::ShowCallLog);
         };
     }
 
-    auto createCallOnRightFunctionalCallback(app::Application *app) -> std::function<void()>
+    auto createCallOnRightFunctionalCallback(app::ApplicationCommon *app) -> std::function<void()>
     {
         return [app]() {
             DBServiceAPI::GetQuery(app,
@@ -111,7 +111,7 @@ namespace
                                    std::make_unique<db::query::notifications::Clear>(NotificationsRecord::Key::Calls));
         };
     }
-    auto createCallOnLeftFunctionalCallback(app::Application *app, Notification provider) -> std::function<void()>
+    auto createCallOnLeftFunctionalCallback(app::ApplicationCommon *app, Notification provider) -> std::function<void()>
     {
         if (!provider->hasRecord()) {
             return nullptr;
@@ -125,7 +125,7 @@ namespace
         return nullptr;
     }
 
-    void setCallOnInputCallback(NotificationListItem *item, Notification provider, app::Application *app)
+    void setCallOnInputCallback(NotificationListItem *item, Notification provider, app::ApplicationCommon *app)
     {
         auto onRightFunctionalKeyCallback = createCallOnRightFunctionalCallback(app);
         auto onLeftFunctionalKeyCallback  = createCallOnLeftFunctionalCallback(app, provider);
@@ -147,7 +147,7 @@ namespace
         };
     }
 
-    void setTetheringActivatedCallback(NotificationListItem *item, app::Application *app)
+    void setTetheringActivatedCallback(NotificationListItem *item, app::ApplicationCommon *app)
     {
         item->activatedCallback = [app]([[maybe_unused]] gui::Item &_item) {
             app->switchWindow(gui::popup::window::tethering_off_window);
diff --git a/module-apps/application-desktop/widgets/DBNotificationsHandler.cpp b/module-apps/application-desktop/widgets/DBNotificationsHandler.cpp
index e2e2b2090..83636d8c0 100644
--- a/module-apps/application-desktop/widgets/DBNotificationsHandler.cpp
+++ b/module-apps/application-desktop/widgets/DBNotificationsHandler.cpp
@@ -12,14 +12,14 @@ using namespace app;
 
 namespace
 {
-    bool requestUnreadThreadsCount(app::Application *app)
+    bool requestUnreadThreadsCount(app::ApplicationCommon *app)
     {
         const auto [succeed, _] = DBServiceAPI::GetQuery(
             app, db::Interface::Name::SMSThread, std::make_unique<db::query::ThreadGetCount>(EntryState::UNREAD));
         return succeed;
     }
 
-    bool requestUnreadCallsCount(app::Application *app)
+    bool requestUnreadCallsCount(app::ApplicationCommon *app)
     {
         const auto [succeed, _] = DBServiceAPI::GetQuery(
             app, db::Interface::Name::Calllog, std::make_unique<db::query::CalllogGetCount>(EntryState::UNREAD));
@@ -27,7 +27,7 @@ namespace
     }
 } // namespace
 
-DBNotificationsHandler::DBNotificationsHandler(Application *ownerApp)
+DBNotificationsHandler::DBNotificationsHandler(ApplicationCommon *ownerApp)
     : ownerApp(ownerApp), notifications{{Type::notReadSMS, 0}, {Type::notReadCall, 0}}
 {}
 
diff --git a/module-apps/application-desktop/widgets/DesktopInputWidget.cpp b/module-apps/application-desktop/widgets/DesktopInputWidget.cpp
index 382fbe98e..fbfef7f39 100644
--- a/module-apps/application-desktop/widgets/DesktopInputWidget.cpp
+++ b/module-apps/application-desktop/widgets/DesktopInputWidget.cpp
@@ -39,7 +39,7 @@ namespace gui
 {
 
     DesktopInputWidget::DesktopInputWidget(
-        app::Application *application, Item *parent, uint32_t x, uint32_t y, uint32_t w, uint32_t h)
+        app::ApplicationCommon *application, Item *parent, uint32_t x, uint32_t y, uint32_t w, uint32_t h)
         : HBox(parent, x, y, w, h), application(application)
     {
         setMinimumSize(style::window::default_body_width, style::desktop::inputWidget::min_h);
diff --git a/module-apps/application-desktop/widgets/DesktopInputWidget.hpp b/module-apps/application-desktop/widgets/DesktopInputWidget.hpp
index 7f354287b..eb7531618 100644
--- a/module-apps/application-desktop/widgets/DesktopInputWidget.hpp
+++ b/module-apps/application-desktop/widgets/DesktopInputWidget.hpp
@@ -17,14 +17,15 @@ namespace gui
     // class DesktopInputWidget : public ListItem
     class DesktopInputWidget : public HBox
     {
-        app::Application *application = nullptr;
+        app::ApplicationCommon *application = nullptr;
         HBox *body                    = nullptr;
         gui::Image *replyImage        = nullptr;
 
       public:
         gui::Text *inputText = nullptr;
 
-        DesktopInputWidget(app::Application *application, Item *parent, uint32_t x, uint32_t y, uint32_t w, uint32_t h);
+        DesktopInputWidget(
+            app::ApplicationCommon *application, Item *parent, uint32_t x, uint32_t y, uint32_t w, uint32_t h);
         ~DesktopInputWidget() override = default;
 
         auto handleRequestResize(const Item *, Length request_w, Length request_h) -> Size override;
diff --git a/module-apps/application-desktop/windows/ChargingBatteryWindow.cpp b/module-apps/application-desktop/windows/ChargingBatteryWindow.cpp
index c5de7ed1a..80f5cc2b9 100644
--- a/module-apps/application-desktop/windows/ChargingBatteryWindow.cpp
+++ b/module-apps/application-desktop/windows/ChargingBatteryWindow.cpp
@@ -17,7 +17,7 @@ namespace gui
         constexpr inline auto imgPositionY = 250;
     } // namespace
 
-    ChargingBatteryWindow::ChargingBatteryWindow(app::Application *app)
+    ChargingBatteryWindow::ChargingBatteryWindow(app::ApplicationCommon *app)
         : AppWindow(app, app::window::name::dead_battery)
     {
         buildInterface();
diff --git a/module-apps/application-desktop/windows/ChargingBatteryWindow.hpp b/module-apps/application-desktop/windows/ChargingBatteryWindow.hpp
index 0fe02aa2a..599beb834 100644
--- a/module-apps/application-desktop/windows/ChargingBatteryWindow.hpp
+++ b/module-apps/application-desktop/windows/ChargingBatteryWindow.hpp
@@ -12,7 +12,7 @@ namespace gui
     class ChargingBatteryWindow : public AppWindow
     {
       public:
-        explicit ChargingBatteryWindow(app::Application *app);
+        explicit ChargingBatteryWindow(app::ApplicationCommon *app);
         void rebuild() override;
         void buildInterface() override;
         void destroyInterface() override;
diff --git a/module-apps/application-desktop/windows/DeadBatteryWindow.cpp b/module-apps/application-desktop/windows/DeadBatteryWindow.cpp
index 4552ca34d..18ee1b96b 100644
--- a/module-apps/application-desktop/windows/DeadBatteryWindow.cpp
+++ b/module-apps/application-desktop/windows/DeadBatteryWindow.cpp
@@ -18,7 +18,7 @@ namespace gui
         constexpr inline auto imgPositionY = 250;
     } // namespace
 
-    DeadBatteryWindow::DeadBatteryWindow(app::Application *app) : AppWindow(app, app::window::name::dead_battery)
+    DeadBatteryWindow::DeadBatteryWindow(app::ApplicationCommon *app) : AppWindow(app, app::window::name::dead_battery)
     {
         buildInterface();
         preventsAutoLock = true;
diff --git a/module-apps/application-desktop/windows/DeadBatteryWindow.hpp b/module-apps/application-desktop/windows/DeadBatteryWindow.hpp
index 529f36e29..a809ac0d5 100644
--- a/module-apps/application-desktop/windows/DeadBatteryWindow.hpp
+++ b/module-apps/application-desktop/windows/DeadBatteryWindow.hpp
@@ -13,7 +13,7 @@ namespace gui
     class DeadBatteryWindow : public AppWindow
     {
       public:
-        explicit DeadBatteryWindow(app::Application *app);
+        explicit DeadBatteryWindow(app::ApplicationCommon *app);
         void rebuild() override;
         void buildInterface() override;
         void destroyInterface() override;
diff --git a/module-apps/application-desktop/windows/DesktopMainWindow.cpp b/module-apps/application-desktop/windows/DesktopMainWindow.cpp
index e73b74b24..d7b0fc37a 100644
--- a/module-apps/application-desktop/windows/DesktopMainWindow.cpp
+++ b/module-apps/application-desktop/windows/DesktopMainWindow.cpp
@@ -96,7 +96,7 @@ namespace gui
         return appConfiguration;
     }
 
-    DesktopMainWindow::DesktopMainWindow(app::Application *app)
+    DesktopMainWindow::DesktopMainWindow(app::ApplicationCommon *app)
         : AppWindow(app, app::window::name::desktop_main_window),
           notificationsModel(std::make_shared<ActiveNotificationsModel>(this))
     {
diff --git a/module-apps/application-desktop/windows/DesktopMainWindow.hpp b/module-apps/application-desktop/windows/DesktopMainWindow.hpp
index f7a62cf7a..6a52f1b3c 100644
--- a/module-apps/application-desktop/windows/DesktopMainWindow.hpp
+++ b/module-apps/application-desktop/windows/DesktopMainWindow.hpp
@@ -36,7 +36,7 @@ namespace gui
         app::ApplicationDesktop *getAppDesktop() const;
 
       public:
-        explicit DesktopMainWindow(app::Application *app);
+        explicit DesktopMainWindow(app::ApplicationCommon *app);
 
         // virtual methods gui::Window
         bool onInput(const InputEvent &inputEvent) override;
diff --git a/module-apps/application-desktop/windows/LogoWindow.cpp b/module-apps/application-desktop/windows/LogoWindow.cpp
index cd6d0aa8a..18c1b33ca 100644
--- a/module-apps/application-desktop/windows/LogoWindow.cpp
+++ b/module-apps/application-desktop/windows/LogoWindow.cpp
@@ -9,7 +9,7 @@
 
 namespace gui
 {
-    LogoWindow::LogoWindow(app::Application *app) : AppWindow(app, app::window::name::logo_window)
+    LogoWindow::LogoWindow(app::ApplicationCommon *app) : AppWindow(app, app::window::name::logo_window)
     {
         buildInterface();
     }
diff --git a/module-apps/application-desktop/windows/LogoWindow.hpp b/module-apps/application-desktop/windows/LogoWindow.hpp
index 7e0572f58..0b51fe353 100644
--- a/module-apps/application-desktop/windows/LogoWindow.hpp
+++ b/module-apps/application-desktop/windows/LogoWindow.hpp
@@ -10,7 +10,7 @@ namespace gui
     class LogoWindow : public AppWindow
     {
       public:
-        explicit LogoWindow(app::Application *app);
+        explicit LogoWindow(app::ApplicationCommon *app);
         void rebuild() override;
         void buildInterface() override;
         void destroyInterface() override;
diff --git a/module-apps/application-desktop/windows/MenuWindow.cpp b/module-apps/application-desktop/windows/MenuWindow.cpp
index 246c16965..51a7ad054 100644
--- a/module-apps/application-desktop/windows/MenuWindow.cpp
+++ b/module-apps/application-desktop/windows/MenuWindow.cpp
@@ -138,7 +138,7 @@ namespace gui
         return visibleStateChanged;
     }
 
-    MenuWindow::MenuWindow(app::Application *app, const app::DBNotificationsBaseHandler &accessor)
+    MenuWindow::MenuWindow(app::ApplicationCommon *app, const app::DBNotificationsBaseHandler &accessor)
         : AppWindow(app, app::window::name::desktop_menu), dbNotifications(accessor)
     {
         buildInterface();
diff --git a/module-apps/application-desktop/windows/MenuWindow.hpp b/module-apps/application-desktop/windows/MenuWindow.hpp
index a84ab231f..18c8f5d30 100644
--- a/module-apps/application-desktop/windows/MenuWindow.hpp
+++ b/module-apps/application-desktop/windows/MenuWindow.hpp
@@ -66,7 +66,7 @@ namespace gui
         MenuPage *toolsMenu = nullptr;
 
       public:
-        MenuWindow(app::Application *app, const app::DBNotificationsBaseHandler &accessor);
+        MenuWindow(app::ApplicationCommon *app, const app::DBNotificationsBaseHandler &accessor);
 
         bool onInput(const InputEvent &inputEvent) override;
 
diff --git a/module-apps/application-desktop/windows/MmiInternalMsgWindow.cpp b/module-apps/application-desktop/windows/MmiInternalMsgWindow.cpp
index 567da6184..2a68dbb90 100644
--- a/module-apps/application-desktop/windows/MmiInternalMsgWindow.cpp
+++ b/module-apps/application-desktop/windows/MmiInternalMsgWindow.cpp
@@ -10,7 +10,8 @@
 
 using namespace gui;
 
-MmiInternalMsgWindow::MmiInternalMsgWindow(app::Application *app, const std::string &name) : MmiPushWindow(app, name)
+MmiInternalMsgWindow::MmiInternalMsgWindow(app::ApplicationCommon *app, const std::string &name)
+    : MmiPushWindow(app, name)
 {}
 
 void MmiInternalMsgWindow::onBeforeShow(ShowMode mode, SwitchData *data)
diff --git a/module-apps/application-desktop/windows/MmiInternalMsgWindow.hpp b/module-apps/application-desktop/windows/MmiInternalMsgWindow.hpp
index 4ae0c85db..5fdc4b7e5 100644
--- a/module-apps/application-desktop/windows/MmiInternalMsgWindow.hpp
+++ b/module-apps/application-desktop/windows/MmiInternalMsgWindow.hpp
@@ -18,7 +18,7 @@ namespace gui
     class MmiInternalMsgWindow : public MmiPushWindow
     {
       public:
-        MmiInternalMsgWindow(app::Application *app, const std::string &name);
+        MmiInternalMsgWindow(app::ApplicationCommon *app, const std::string &name);
         void onBeforeShow(ShowMode mode, SwitchData *data) override;
         void handleInternalMessages(mmiactions::MMIResultParams *metadata);
     };
diff --git a/module-apps/application-desktop/windows/MmiPullWindow.cpp b/module-apps/application-desktop/windows/MmiPullWindow.cpp
index 0f798fa68..3ad8f3cdd 100644
--- a/module-apps/application-desktop/windows/MmiPullWindow.cpp
+++ b/module-apps/application-desktop/windows/MmiPullWindow.cpp
@@ -33,7 +33,7 @@ namespace style::desktop
 
 } // namespace style::desktop
 
-MmiPullWindow::MmiPullWindow(app::Application *app, const std::string &name) : gui::AppWindow(app, name)
+MmiPullWindow::MmiPullWindow(app::ApplicationCommon *app, const std::string &name) : gui::AppWindow(app, name)
 {
     AppWindow::buildInterface();
 
diff --git a/module-apps/application-desktop/windows/MmiPullWindow.hpp b/module-apps/application-desktop/windows/MmiPullWindow.hpp
index e2c59f24e..f072011ab 100644
--- a/module-apps/application-desktop/windows/MmiPullWindow.hpp
+++ b/module-apps/application-desktop/windows/MmiPullWindow.hpp
@@ -22,7 +22,7 @@ namespace gui
         DesktopInputWidget *InputBox = nullptr;
 
       public:
-        MmiPullWindow(app::Application *app, const std::string &name);
+        MmiPullWindow(app::ApplicationCommon *app, const std::string &name);
         ~MmiPullWindow() override;
         void onBeforeShow(ShowMode mode, SwitchData *data) override;
         bool onInput(const InputEvent &inputEvent) override;
diff --git a/module-apps/application-desktop/windows/MmiPushWindow.cpp b/module-apps/application-desktop/windows/MmiPushWindow.cpp
index ce85b8573..612a4e453 100644
--- a/module-apps/application-desktop/windows/MmiPushWindow.cpp
+++ b/module-apps/application-desktop/windows/MmiPushWindow.cpp
@@ -6,7 +6,7 @@
 
 #include <i18n/i18n.hpp>
 #include <Image.hpp>
-#include <apps-common/Application.hpp>
+#include <apps-common/ApplicationCommon.hpp>
 #include <service-appmgr/data/MmiActionsParams.hpp>
 
 using namespace gui;
@@ -29,7 +29,7 @@ namespace style::desktop
 
 } // namespace style::desktop
 
-MmiPushWindow::MmiPushWindow(app::Application *app, const std::string &name) : gui::AppWindow(app, name)
+MmiPushWindow::MmiPushWindow(app::ApplicationCommon *app, const std::string &name) : gui::AppWindow(app, name)
 {
     AppWindow::buildInterface();
     bottomBar->setText(BottomBar::Side::CENTER, utils::translate(style::strings::common::ok));
diff --git a/module-apps/application-desktop/windows/MmiPushWindow.hpp b/module-apps/application-desktop/windows/MmiPushWindow.hpp
index e1c734e99..fad4828ee 100644
--- a/module-apps/application-desktop/windows/MmiPushWindow.hpp
+++ b/module-apps/application-desktop/windows/MmiPushWindow.hpp
@@ -19,7 +19,7 @@ namespace gui
         Image *icon = nullptr;
 
       public:
-        MmiPushWindow(app::Application *app, const std::string &name);
+        MmiPushWindow(app::ApplicationCommon *app, const std::string &name);
         ~MmiPushWindow() override;
         void onBeforeShow(ShowMode mode, SwitchData *data) override;
         bool onInput(const InputEvent &inputEvent) override;
diff --git a/module-apps/application-desktop/windows/Reboot.cpp b/module-apps/application-desktop/windows/Reboot.cpp
index 88f866d55..eb11bd2b1 100644
--- a/module-apps/application-desktop/windows/Reboot.cpp
+++ b/module-apps/application-desktop/windows/Reboot.cpp
@@ -10,7 +10,7 @@
 namespace gui
 {
 
-    RebootWindow::RebootWindow(app::Application *app, std::unique_ptr<PowerOffPresenter> &&presenter)
+    RebootWindow::RebootWindow(app::ApplicationCommon *app, std::unique_ptr<PowerOffPresenter> &&presenter)
         : AppWindow(app, app::window::name::desktop_reboot), presenter(std::move(presenter))
     {
         buildInterface();
diff --git a/module-apps/application-desktop/windows/Reboot.hpp b/module-apps/application-desktop/windows/Reboot.hpp
index 348578bc2..918e98370 100644
--- a/module-apps/application-desktop/windows/Reboot.hpp
+++ b/module-apps/application-desktop/windows/Reboot.hpp
@@ -14,7 +14,7 @@ namespace gui
     class RebootWindow : public AppWindow
     {
       public:
-        RebootWindow(app::Application *app, std::unique_ptr<PowerOffPresenter> &&presenter);
+        RebootWindow(app::ApplicationCommon *app, std::unique_ptr<PowerOffPresenter> &&presenter);
         ~RebootWindow() override = default;
         void onBeforeShow(ShowMode mode, SwitchData *data) override;
         bool onInput(const InputEvent &inputEvent) override;
diff --git a/module-apps/application-meditation/ApplicationMeditation.cpp b/module-apps/application-meditation/ApplicationMeditation.cpp
index 90d6538de..03d75cd53 100644
--- a/module-apps/application-meditation/ApplicationMeditation.cpp
+++ b/module-apps/application-meditation/ApplicationMeditation.cpp
@@ -42,18 +42,21 @@ namespace app
 
     void ApplicationMeditation::createUserInterface()
     {
-        windowsFactory.attach(app::window::name::meditation_main_window, [](Application *app, const std::string &name) {
-            return std::make_unique<gui::MeditationWindow>(app);
-        });
-        windowsFactory.attach(app::window::name::meditation_timer, [](Application *app, const std::string &name) {
+        windowsFactory.attach(app::window::name::meditation_main_window,
+                              [](ApplicationCommon *app, const std::string &name) {
+                                  return std::make_unique<gui::MeditationWindow>(app);
+                              });
+        windowsFactory.attach(app::window::name::meditation_timer, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::MeditationTimerWindow>(app);
         });
-        windowsFactory.attach(app::window::name::meditation_options, [](Application *app, const std::string &name) {
-            return std::make_unique<gui::MeditationOptionsWindow>(app);
-        });
-        windowsFactory.attach(app::window::name::meditation_preparation, [](Application *app, const std::string &name) {
-            return std::make_unique<gui::PreparationTimeWindow>(app);
-        });
+        windowsFactory.attach(app::window::name::meditation_options,
+                              [](ApplicationCommon *app, const std::string &name) {
+                                  return std::make_unique<gui::MeditationOptionsWindow>(app);
+                              });
+        windowsFactory.attach(app::window::name::meditation_preparation,
+                              [](ApplicationCommon *app, const std::string &name) {
+                                  return std::make_unique<gui::PreparationTimeWindow>(app);
+                              });
 
         attachPopups(
             {gui::popup::ID::Volume, gui::popup::ID::Tethering, gui::popup::ID::PhoneModes, gui::popup::ID::PhoneLock});
diff --git a/module-apps/application-meditation/CMakeLists.txt b/module-apps/application-meditation/CMakeLists.txt
index f3c22c4f6..b776f65e1 100644
--- a/module-apps/application-meditation/CMakeLists.txt
+++ b/module-apps/application-meditation/CMakeLists.txt
@@ -40,6 +40,7 @@ target_sources(application-meditation
 
 target_link_libraries(application-meditation
     PRIVATE
+        app
         i18n
         module-sys
         module-utils
diff --git a/module-apps/application-meditation/windows/MeditationOptionsWindows.cpp b/module-apps/application-meditation/windows/MeditationOptionsWindows.cpp
index e8de1ea19..582250d45 100644
--- a/module-apps/application-meditation/windows/MeditationOptionsWindows.cpp
+++ b/module-apps/application-meditation/windows/MeditationOptionsWindows.cpp
@@ -24,7 +24,7 @@ namespace
     }
 } // namespace
 
-MeditationOptionsWindow::MeditationOptionsWindow(app::Application *app)
+MeditationOptionsWindow::MeditationOptionsWindow(app::ApplicationCommon *app)
     : OptionWindow(app, app::window::name::meditation_options)
 {
     setTitle(utils::translate("common_options"));
@@ -68,7 +68,7 @@ void MeditationOptionsWindow::addPreparationTimeOption(std::list<Option> &option
         option::SettingRightItem::ArrowBlack));
 }
 
-PreparationTimeWindow::PreparationTimeWindow(app::Application *app)
+PreparationTimeWindow::PreparationTimeWindow(app::ApplicationCommon *app)
     : OptionWindow(app, app::window::name::meditation_preparation)
 {
     setTitle(utils::translate("app_meditation_preparation_time"));
diff --git a/module-apps/application-meditation/windows/MeditationOptionsWindows.hpp b/module-apps/application-meditation/windows/MeditationOptionsWindows.hpp
index 60170ea89..c30ba6fd9 100644
--- a/module-apps/application-meditation/windows/MeditationOptionsWindows.hpp
+++ b/module-apps/application-meditation/windows/MeditationOptionsWindows.hpp
@@ -10,7 +10,7 @@ namespace gui
     class MeditationOptionsWindow : public OptionWindow
     {
       public:
-        explicit MeditationOptionsWindow(app::Application *);
+        explicit MeditationOptionsWindow(app::ApplicationCommon *);
 
       private:
         std::list<Option> buildOptionsList();
@@ -21,7 +21,7 @@ namespace gui
     class PreparationTimeWindow : public OptionWindow
     {
       public:
-        explicit PreparationTimeWindow(app::Application *app);
+        explicit PreparationTimeWindow(app::ApplicationCommon *app);
 
         void onBeforeShow(ShowMode mode, SwitchData *data) override;
 
diff --git a/module-apps/application-meditation/windows/MeditationTimerWindow.cpp b/module-apps/application-meditation/windows/MeditationTimerWindow.cpp
index c605a4df3..6ebda61e8 100644
--- a/module-apps/application-meditation/windows/MeditationTimerWindow.cpp
+++ b/module-apps/application-meditation/windows/MeditationTimerWindow.cpp
@@ -21,7 +21,7 @@ namespace
     constexpr std::chrono::seconds endScreenTimeoutTime{5};
 } // namespace
 
-MeditationTimerWindow::MeditationTimerWindow(app::Application *app)
+MeditationTimerWindow::MeditationTimerWindow(app::ApplicationCommon *app)
     : AppWindow{app, name::window::main_window},
       endScreenTimeout{sys::TimerFactory::createSingleShotTimer(
           app, "MeditationEndScreenTimeout", endScreenTimeoutTime, [this](sys::Timer &) {
diff --git a/module-apps/application-meditation/windows/MeditationTimerWindow.hpp b/module-apps/application-meditation/windows/MeditationTimerWindow.hpp
index 06f617983..70e46820c 100644
--- a/module-apps/application-meditation/windows/MeditationTimerWindow.hpp
+++ b/module-apps/application-meditation/windows/MeditationTimerWindow.hpp
@@ -31,7 +31,7 @@ namespace gui
         void invalidate() noexcept;
 
       public:
-        explicit MeditationTimerWindow(app::Application *app);
+        explicit MeditationTimerWindow(app::ApplicationCommon *app);
 
         auto onInput(const InputEvent &inputEvent) -> bool override;
 
diff --git a/module-apps/application-meditation/windows/MeditationWindow.cpp b/module-apps/application-meditation/windows/MeditationWindow.cpp
index d22178a52..538cbbc2d 100644
--- a/module-apps/application-meditation/windows/MeditationWindow.cpp
+++ b/module-apps/application-meditation/windows/MeditationWindow.cpp
@@ -16,7 +16,7 @@
 
 namespace gui
 {
-    MeditationWindow::MeditationWindow(app::Application *app) : AppWindow{app, name::window::main_window}
+    MeditationWindow::MeditationWindow(app::ApplicationCommon *app) : AppWindow{app, name::window::main_window}
     {
         MeditationWindow::buildInterface();
     }
diff --git a/module-apps/application-meditation/windows/MeditationWindow.hpp b/module-apps/application-meditation/windows/MeditationWindow.hpp
index 92c771100..232f2bc88 100644
--- a/module-apps/application-meditation/windows/MeditationWindow.hpp
+++ b/module-apps/application-meditation/windows/MeditationWindow.hpp
@@ -13,7 +13,7 @@ namespace gui
     class MeditationWindow : public AppWindow
     {
       public:
-        explicit MeditationWindow(app::Application *app);
+        explicit MeditationWindow(app::ApplicationCommon *app);
 
         auto onInput(const InputEvent &inputEvent) -> bool override;
 
diff --git a/module-apps/application-messages/ApplicationMessages.cpp b/module-apps/application-messages/ApplicationMessages.cpp
index be0937b30..fc5c02804 100644
--- a/module-apps/application-messages/ApplicationMessages.cpp
+++ b/module-apps/application-messages/ApplicationMessages.cpp
@@ -117,34 +117,35 @@ namespace app
 
     void ApplicationMessages::createUserInterface()
     {
-        windowsFactory.attach(gui::name::window::main_window, [](Application *app, const std::string &name) {
+        windowsFactory.attach(gui::name::window::main_window, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::MessagesMainWindow>(app);
         });
-        windowsFactory.attach(gui::name::window::thread_view, [](Application *app, const std::string &name) {
+        windowsFactory.attach(gui::name::window::thread_view, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::SMSThreadViewWindow>(app);
         });
-        windowsFactory.attach(gui::name::window::new_sms, [](Application *app, const std::string &name) {
+        windowsFactory.attach(gui::name::window::new_sms, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::NewMessageWindow>(app);
         });
-        windowsFactory.attach(
-            utils::translate("app_phonebook_options_title"),
-            [](Application *app, const std::string &name) { return std::make_unique<gui::OptionWindow>(app, name); });
-        windowsFactory.attach(gui::name::window::dialog, [](Application *app, const std::string &name) {
+        windowsFactory.attach(utils::translate("app_phonebook_options_title"),
+                              [](ApplicationCommon *app, const std::string &name) {
+                                  return std::make_unique<gui::OptionWindow>(app, name);
+                              });
+        windowsFactory.attach(gui::name::window::dialog, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::Dialog>(app, name);
         });
-        windowsFactory.attach(gui::name::window::dialog_confirm, [](Application *app, const std::string &name) {
+        windowsFactory.attach(gui::name::window::dialog_confirm, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::DialogConfirm>(app, name);
         });
-        windowsFactory.attach(gui::name::window::dialog_yes_no, [](Application *app, const std::string &name) {
+        windowsFactory.attach(gui::name::window::dialog_yes_no, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::DialogYesNo>(app, name);
         });
-        windowsFactory.attach(gui::name::window::thread_sms_search, [](Application *app, const std::string &name) {
-            return std::make_unique<gui::SMSSearch>(app);
-        });
-        windowsFactory.attach(gui::name::window::sms_templates, [](Application *app, const std::string &name) {
+        windowsFactory.attach(
+            gui::name::window::thread_sms_search,
+            [](ApplicationCommon *app, const std::string &name) { return std::make_unique<gui::SMSSearch>(app); });
+        windowsFactory.attach(gui::name::window::sms_templates, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::SMSTemplatesWindow>(app);
         });
-        windowsFactory.attach(gui::name::window::search_results, [](Application *app, const std::string &name) {
+        windowsFactory.attach(gui::name::window::search_results, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::SearchResults>(app);
         });
 
diff --git a/module-apps/application-messages/CMakeLists.txt b/module-apps/application-messages/CMakeLists.txt
index 776eac036..36f114bd7 100644
--- a/module-apps/application-messages/CMakeLists.txt
+++ b/module-apps/application-messages/CMakeLists.txt
@@ -68,6 +68,7 @@ target_sources(application-messages
 
 target_link_libraries(application-messages
     PRIVATE
+        app
         clipboard
         i18n
         log
diff --git a/module-apps/application-messages/models/BaseThreadsRecordModel.cpp b/module-apps/application-messages/models/BaseThreadsRecordModel.cpp
index 70f13d1be..0a300fc7e 100644
--- a/module-apps/application-messages/models/BaseThreadsRecordModel.cpp
+++ b/module-apps/application-messages/models/BaseThreadsRecordModel.cpp
@@ -5,7 +5,7 @@
 #include "ListView.hpp"
 #include <service-db/DBServiceAPI.hpp>
 
-BaseThreadsRecordModel::BaseThreadsRecordModel(app::Application *app) : DatabaseModel(app)
+BaseThreadsRecordModel::BaseThreadsRecordModel(app::ApplicationCommon *app) : DatabaseModel(app)
 {
     requestRecordsCount();
 }
diff --git a/module-apps/application-messages/models/BaseThreadsRecordModel.hpp b/module-apps/application-messages/models/BaseThreadsRecordModel.hpp
index c6a232b45..8abc95a65 100644
--- a/module-apps/application-messages/models/BaseThreadsRecordModel.hpp
+++ b/module-apps/application-messages/models/BaseThreadsRecordModel.hpp
@@ -29,12 +29,12 @@ class BaseThreadsRecordModel : public app::DatabaseModel<ThreadListStruct>, publ
 {
   public:
     BaseThreadsRecordModel() = delete;
-    BaseThreadsRecordModel(app::Application *app);
+    BaseThreadsRecordModel(app::ApplicationCommon *app);
 
     unsigned int requestRecordsCount() override;
     bool updateRecords(std::vector<ThreadListStruct> records) override;
 
-    app::Application *getApplication(void)
+    app::ApplicationCommon *getApplication(void)
     {
         return application;
     };
diff --git a/module-apps/application-messages/models/SMSTemplateModel.cpp b/module-apps/application-messages/models/SMSTemplateModel.cpp
index 9d75885d4..cc7fd9b4e 100644
--- a/module-apps/application-messages/models/SMSTemplateModel.cpp
+++ b/module-apps/application-messages/models/SMSTemplateModel.cpp
@@ -9,7 +9,7 @@
 #include <module-db/queries/messages/templates/QuerySMSTemplateGetForList.hpp>
 #include <service-db/DBServiceAPI.hpp>
 
-SMSTemplateModel::SMSTemplateModel(app::Application *app) : DatabaseModel(app), app::AsyncCallbackReceiver{app}
+SMSTemplateModel::SMSTemplateModel(app::ApplicationCommon *app) : DatabaseModel(app), app::AsyncCallbackReceiver{app}
 {}
 
 unsigned int SMSTemplateModel::requestRecordsCount()
diff --git a/module-apps/application-messages/models/SMSTemplateModel.hpp b/module-apps/application-messages/models/SMSTemplateModel.hpp
index 4e9e38221..e29f7b680 100644
--- a/module-apps/application-messages/models/SMSTemplateModel.hpp
+++ b/module-apps/application-messages/models/SMSTemplateModel.hpp
@@ -15,7 +15,7 @@ class SMSTemplateModel : public app::DatabaseModel<SMSTemplateRecord>,
 {
   public:
     SMSTemplateModel() = delete;
-    SMSTemplateModel(app::Application *app);
+    SMSTemplateModel(app::ApplicationCommon *app);
 
     unsigned int requestRecordsCount() override;
     bool updateRecords(std::vector<SMSTemplateRecord> records) override;
diff --git a/module-apps/application-messages/models/SMSThreadModel.cpp b/module-apps/application-messages/models/SMSThreadModel.cpp
index ec9529d80..5e4ca8107 100644
--- a/module-apps/application-messages/models/SMSThreadModel.cpp
+++ b/module-apps/application-messages/models/SMSThreadModel.cpp
@@ -12,7 +12,7 @@
 #include <service-db/DBServiceAPI.hpp>
 #include <service-db/QueryMessage.hpp>
 
-SMSThreadModel::SMSThreadModel(app::Application *app) : DatabaseModel(app), app::AsyncCallbackReceiver{app}
+SMSThreadModel::SMSThreadModel(app::ApplicationCommon *app) : DatabaseModel(app), app::AsyncCallbackReceiver{app}
 {
     smsInput = new gui::SMSInputWidget(application);
 }
diff --git a/module-apps/application-messages/models/SMSThreadModel.hpp b/module-apps/application-messages/models/SMSThreadModel.hpp
index 4d36f5a14..10fc9faa1 100644
--- a/module-apps/application-messages/models/SMSThreadModel.hpp
+++ b/module-apps/application-messages/models/SMSThreadModel.hpp
@@ -20,7 +20,7 @@ class SMSThreadModel : public app::DatabaseModel<SMSRecord>,
     std::unique_ptr<utils::PhoneNumber::View> number;
     unsigned int numberID = DB_ID_NONE;
 
-    SMSThreadModel(app::Application *app);
+    SMSThreadModel(app::ApplicationCommon *app);
     ~SMSThreadModel() override;
 
     void addReturnNumber();
diff --git a/module-apps/application-messages/models/ThreadsModel.cpp b/module-apps/application-messages/models/ThreadsModel.cpp
index 1ed38a502..aaff59fbb 100644
--- a/module-apps/application-messages/models/ThreadsModel.cpp
+++ b/module-apps/application-messages/models/ThreadsModel.cpp
@@ -16,7 +16,7 @@
 #include <OptionWindow.hpp>
 #include <service-db/DBServiceAPI.hpp>
 
-ThreadsModel::ThreadsModel(app::Application *app) : BaseThreadsRecordModel(app), app::AsyncCallbackReceiver{app}
+ThreadsModel::ThreadsModel(app::ApplicationCommon *app) : BaseThreadsRecordModel(app), app::AsyncCallbackReceiver{app}
 {}
 
 auto ThreadsModel::getMinimalItemSpaceRequired() const -> unsigned int
diff --git a/module-apps/application-messages/models/ThreadsModel.hpp b/module-apps/application-messages/models/ThreadsModel.hpp
index fca34c98f..aa6ce93e0 100644
--- a/module-apps/application-messages/models/ThreadsModel.hpp
+++ b/module-apps/application-messages/models/ThreadsModel.hpp
@@ -9,7 +9,7 @@
 class ThreadsModel : public BaseThreadsRecordModel, public app::AsyncCallbackReceiver
 {
   public:
-    explicit ThreadsModel(app::Application *app);
+    explicit ThreadsModel(app::ApplicationCommon *app);
 
     void requestRecords(uint32_t offset, uint32_t limit) override;
     [[nodiscard]] auto getMinimalItemSpaceRequired() const -> unsigned int override;
diff --git a/module-apps/application-messages/models/ThreadsSearchResultsModel.cpp b/module-apps/application-messages/models/ThreadsSearchResultsModel.cpp
index 6134693ae..354b7d21f 100644
--- a/module-apps/application-messages/models/ThreadsSearchResultsModel.cpp
+++ b/module-apps/application-messages/models/ThreadsSearchResultsModel.cpp
@@ -14,7 +14,7 @@
 namespace gui::model
 {
 
-    ThreadsSearchResultsModel::ThreadsSearchResultsModel(app::Application *app)
+    ThreadsSearchResultsModel::ThreadsSearchResultsModel(app::ApplicationCommon *app)
         : BaseThreadsRecordModel(app), app::AsyncCallbackReceiver{app}
     {}
 
diff --git a/module-apps/application-messages/models/ThreadsSearchResultsModel.hpp b/module-apps/application-messages/models/ThreadsSearchResultsModel.hpp
index 2213dd85d..771bf2082 100644
--- a/module-apps/application-messages/models/ThreadsSearchResultsModel.hpp
+++ b/module-apps/application-messages/models/ThreadsSearchResultsModel.hpp
@@ -14,7 +14,7 @@ namespace gui::model
         UTF8 textToSearch;
 
       public:
-        ThreadsSearchResultsModel(app::Application *app);
+        ThreadsSearchResultsModel(app::ApplicationCommon *app);
 
         auto getMinimalItemSpaceRequired() const -> unsigned int override;
         auto getItem(Order order) -> ListItem * override;
diff --git a/module-apps/application-messages/widgets/SMSInputWidget.cpp b/module-apps/application-messages/widgets/SMSInputWidget.cpp
index 32426b7bf..96903b025 100644
--- a/module-apps/application-messages/widgets/SMSInputWidget.cpp
+++ b/module-apps/application-messages/widgets/SMSInputWidget.cpp
@@ -18,7 +18,7 @@
 namespace gui
 {
 
-    SMSInputWidget::SMSInputWidget(app::Application *application) : application(application)
+    SMSInputWidget::SMSInputWidget(app::ApplicationCommon *application) : application(application)
     {
         setMinimumSize(style::window::default_body_width, style::messages::smsInput::min_h);
         setMargins(Margins(
diff --git a/module-apps/application-messages/widgets/SMSInputWidget.hpp b/module-apps/application-messages/widgets/SMSInputWidget.hpp
index 0a80e5389..3f64ca1bf 100644
--- a/module-apps/application-messages/widgets/SMSInputWidget.hpp
+++ b/module-apps/application-messages/widgets/SMSInputWidget.hpp
@@ -16,7 +16,7 @@ namespace gui
 
     class SMSInputWidget : public ListItem
     {
-        app::Application *application = nullptr;
+        app::ApplicationCommon *application = nullptr;
         HBox *body                    = nullptr;
         gui::Image *replyImage        = nullptr;
 
@@ -25,7 +25,7 @@ namespace gui
         std::optional<SMSRecord> draft; // draft message of the thread we are showing, if exists.
         std::unique_ptr<utils::PhoneNumber::View> number = nullptr;
 
-        SMSInputWidget(app::Application *application);
+        SMSInputWidget(app::ApplicationCommon *application);
         ~SMSInputWidget() override = default;
 
         void handleDraftMessage();
diff --git a/module-apps/application-messages/widgets/SMSOutputWidget.cpp b/module-apps/application-messages/widgets/SMSOutputWidget.cpp
index 77ece91ef..93703b27c 100644
--- a/module-apps/application-messages/widgets/SMSOutputWidget.cpp
+++ b/module-apps/application-messages/widgets/SMSOutputWidget.cpp
@@ -14,7 +14,7 @@
 namespace gui
 {
 
-    SMSOutputWidget::SMSOutputWidget(app::Application *application, const std::shared_ptr<SMSRecord> &record)
+    SMSOutputWidget::SMSOutputWidget(app::ApplicationCommon *application, const std::shared_ptr<SMSRecord> &record)
     {
         setMinimumSize(style::window::default_body_width, style::messages::smsOutput::default_h);
         setMargins(Margins(0, style::messages::smsOutput::sms_vertical_spacer, 0, 0));
diff --git a/module-apps/application-messages/widgets/SMSOutputWidget.hpp b/module-apps/application-messages/widgets/SMSOutputWidget.hpp
index 318f0506e..c6030cae5 100644
--- a/module-apps/application-messages/widgets/SMSOutputWidget.hpp
+++ b/module-apps/application-messages/widgets/SMSOutputWidget.hpp
@@ -28,7 +28,7 @@ namespace gui
       public:
         gui::Text *inputText = nullptr;
 
-        SMSOutputWidget(app::Application *application, const std::shared_ptr<SMSRecord> &record);
+        SMSOutputWidget(app::ApplicationCommon *application, const std::shared_ptr<SMSRecord> &record);
         virtual ~SMSOutputWidget() = default;
 
         auto handleRequestResize(const Item *, Length request_w, Length request_h) -> Size override;
diff --git a/module-apps/application-messages/windows/MessagesMainWindow.cpp b/module-apps/application-messages/windows/MessagesMainWindow.cpp
index 89199d8e2..587dc1cac 100644
--- a/module-apps/application-messages/windows/MessagesMainWindow.cpp
+++ b/module-apps/application-messages/windows/MessagesMainWindow.cpp
@@ -24,7 +24,7 @@
 
 namespace gui
 {
-    MessagesMainWindow::MessagesMainWindow(app::Application *app)
+    MessagesMainWindow::MessagesMainWindow(app::ApplicationCommon *app)
         : AppWindow(app, gui::name::window::main_window), app::AsyncCallbackReceiver{app}
     {
         buildInterface();
diff --git a/module-apps/application-messages/windows/MessagesMainWindow.hpp b/module-apps/application-messages/windows/MessagesMainWindow.hpp
index 36bb324db..2b3af75fb 100644
--- a/module-apps/application-messages/windows/MessagesMainWindow.hpp
+++ b/module-apps/application-messages/windows/MessagesMainWindow.hpp
@@ -25,7 +25,7 @@ namespace gui
         gui::ListView *list                        = nullptr;
 
       public:
-        explicit MessagesMainWindow(app::Application *app);
+        explicit MessagesMainWindow(app::ApplicationCommon *app);
 
         // virtual methods
         bool onInput(const InputEvent &inputEvent) override;
diff --git a/module-apps/application-messages/windows/NewMessage.cpp b/module-apps/application-messages/windows/NewMessage.cpp
index ab78a21a3..73e324089 100644
--- a/module-apps/application-messages/windows/NewMessage.cpp
+++ b/module-apps/application-messages/windows/NewMessage.cpp
@@ -52,7 +52,7 @@ namespace gui
     std::unique_ptr<NewMessageWindow::MessageMemento> NewMessageWindow::memento =
         std::make_unique<NewMessageWindow::MessageMemento>();
 
-    NewMessageWindow::NewMessageWindow(app::Application *app)
+    NewMessageWindow::NewMessageWindow(app::ApplicationCommon *app)
         : AppWindow(app, name::window::new_sms), app::AsyncCallbackReceiver{app}
     {
         buildInterface();
diff --git a/module-apps/application-messages/windows/NewMessage.hpp b/module-apps/application-messages/windows/NewMessage.hpp
index 53255d1fb..5f9139d98 100644
--- a/module-apps/application-messages/windows/NewMessage.hpp
+++ b/module-apps/application-messages/windows/NewMessage.hpp
@@ -18,7 +18,7 @@ namespace gui
     class NewMessageWindow : public AppWindow, public app::AsyncCallbackReceiver
     {
       public:
-        explicit NewMessageWindow(app::Application *app);
+        explicit NewMessageWindow(app::ApplicationCommon *app);
 
         bool onInput(const InputEvent &inputEvent) override;
         void onBeforeShow(ShowMode mode, SwitchData *data) override;
diff --git a/module-apps/application-messages/windows/SMSTemplatesWindow.cpp b/module-apps/application-messages/windows/SMSTemplatesWindow.cpp
index bfd5c7f17..4cdc4e7ee 100644
--- a/module-apps/application-messages/windows/SMSTemplatesWindow.cpp
+++ b/module-apps/application-messages/windows/SMSTemplatesWindow.cpp
@@ -16,7 +16,7 @@
 
 namespace gui
 {
-    SMSTemplatesWindow::SMSTemplatesWindow(app::Application *app)
+    SMSTemplatesWindow::SMSTemplatesWindow(app::ApplicationCommon *app)
         : AppWindow(app, name::window::sms_templates), smsTemplateModel{std::make_shared<SMSTemplateModel>(app)}
     {
         buildInterface();
diff --git a/module-apps/application-messages/windows/SMSTemplatesWindow.hpp b/module-apps/application-messages/windows/SMSTemplatesWindow.hpp
index 40fef66e7..cd2a48bac 100644
--- a/module-apps/application-messages/windows/SMSTemplatesWindow.hpp
+++ b/module-apps/application-messages/windows/SMSTemplatesWindow.hpp
@@ -25,7 +25,7 @@ namespace gui
 
       public:
         SMSTemplatesWindow() = delete;
-        SMSTemplatesWindow(app::Application *app);
+        SMSTemplatesWindow(app::ApplicationCommon *app);
         virtual ~SMSTemplatesWindow();
 
         void onBeforeShow(ShowMode mode, SwitchData *data) override;
diff --git a/module-apps/application-messages/windows/SMSThreadViewWindow.cpp b/module-apps/application-messages/windows/SMSThreadViewWindow.cpp
index aac45f0d6..676713652 100644
--- a/module-apps/application-messages/windows/SMSThreadViewWindow.cpp
+++ b/module-apps/application-messages/windows/SMSThreadViewWindow.cpp
@@ -20,7 +20,7 @@
 namespace gui
 {
 
-    SMSThreadViewWindow::SMSThreadViewWindow(app::Application *app)
+    SMSThreadViewWindow::SMSThreadViewWindow(app::ApplicationCommon *app)
         : AppWindow(app, name::window::thread_view), app::AsyncCallbackReceiver{app},
           smsModel{std::make_shared<SMSThreadModel>(app)}
     {
diff --git a/module-apps/application-messages/windows/SMSThreadViewWindow.hpp b/module-apps/application-messages/windows/SMSThreadViewWindow.hpp
index ce6c81d2c..09b05b6c5 100644
--- a/module-apps/application-messages/windows/SMSThreadViewWindow.hpp
+++ b/module-apps/application-messages/windows/SMSThreadViewWindow.hpp
@@ -24,7 +24,7 @@ namespace gui
         auto handleContactNameQueryResponse(db::QueryResult *) -> bool;
 
       public:
-        explicit SMSThreadViewWindow(app::Application *app);
+        explicit SMSThreadViewWindow(app::ApplicationCommon *app);
         ~SMSThreadViewWindow() override;
 
         bool onInput(const InputEvent &inputEvent) override;
diff --git a/module-apps/application-messages/windows/SearchResults.cpp b/module-apps/application-messages/windows/SearchResults.cpp
index 63e67fd88..75f81b86a 100644
--- a/module-apps/application-messages/windows/SearchResults.cpp
+++ b/module-apps/application-messages/windows/SearchResults.cpp
@@ -13,7 +13,7 @@
 
 namespace gui
 {
-    SearchResults::SearchResults(app::Application *app) : AppWindow(app, name::window::search_results)
+    SearchResults::SearchResults(app::ApplicationCommon *app) : AppWindow(app, name::window::search_results)
     {
         namespace msgThreadStyle = style::messages::threads;
 
diff --git a/module-apps/application-messages/windows/SearchResults.hpp b/module-apps/application-messages/windows/SearchResults.hpp
index 7bf818fc4..d1b9ec6f6 100644
--- a/module-apps/application-messages/windows/SearchResults.hpp
+++ b/module-apps/application-messages/windows/SearchResults.hpp
@@ -23,7 +23,7 @@ namespace gui
         auto listViewRequest(const std::string &text) -> bool;
 
       public:
-        SearchResults(app::Application *app);
+        SearchResults(app::ApplicationCommon *app);
         /// needed to init populate db
         void onBeforeShow(ShowMode mode, SwitchData *data) override;
         auto showEmptyResults() -> bool;
diff --git a/module-apps/application-messages/windows/SearchStart.cpp b/module-apps/application-messages/windows/SearchStart.cpp
index 568d93f1d..f8e39860f 100644
--- a/module-apps/application-messages/windows/SearchStart.cpp
+++ b/module-apps/application-messages/windows/SearchStart.cpp
@@ -12,7 +12,7 @@
 namespace gui
 {
 
-    SMSSearch::SMSSearch(app::Application *app) : AppWindow(app, name::window::thread_sms_search)
+    SMSSearch::SMSSearch(app::ApplicationCommon *app) : AppWindow(app, name::window::thread_sms_search)
     {
         buildInterface();
         setTitle(utils::translate("app_messages_title_main"));
diff --git a/module-apps/application-messages/windows/SearchStart.hpp b/module-apps/application-messages/windows/SearchStart.hpp
index 505d26a1d..81cc5b707 100644
--- a/module-apps/application-messages/windows/SearchStart.hpp
+++ b/module-apps/application-messages/windows/SearchStart.hpp
@@ -12,7 +12,7 @@ namespace gui
         gui::Item *body = nullptr;
 
       public:
-        SMSSearch(app::Application *app);
+        SMSSearch(app::ApplicationCommon *app);
         bool onInput(const InputEvent &inputEvent) override;
     };
 
diff --git a/module-apps/application-music-player/ApplicationMusicPlayer.cpp b/module-apps/application-music-player/ApplicationMusicPlayer.cpp
index af07aaf82..6a4a904fd 100644
--- a/module-apps/application-music-player/ApplicationMusicPlayer.cpp
+++ b/module-apps/application-music-player/ApplicationMusicPlayer.cpp
@@ -133,7 +133,7 @@ namespace app
 
     void ApplicationMusicPlayer::createUserInterface()
     {
-        windowsFactory.attach(gui::name::window::main_window, [&](Application *app, const std::string &name) {
+        windowsFactory.attach(gui::name::window::main_window, [&](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::MusicPlayerAllSongsWindow>(app, priv->songsPresenter);
         });
 
diff --git a/module-apps/application-music-player/CMakeLists.txt b/module-apps/application-music-player/CMakeLists.txt
index 17004c26e..fb0b80c13 100644
--- a/module-apps/application-music-player/CMakeLists.txt
+++ b/module-apps/application-music-player/CMakeLists.txt
@@ -38,6 +38,7 @@ target_sources(application-music-player
 
 target_link_libraries(application-music-player
     PRIVATE
+        app
         i18n
         log
         module-gui
diff --git a/module-apps/application-music-player/models/SongsModelInterface.hpp b/module-apps/application-music-player/models/SongsModelInterface.hpp
index 5c2a57e34..04a403e06 100644
--- a/module-apps/application-music-player/models/SongsModelInterface.hpp
+++ b/module-apps/application-music-player/models/SongsModelInterface.hpp
@@ -8,7 +8,7 @@
 #include <widgets/SongItem.hpp>
 #include <InternalModel.hpp>
 #include <ListItemProvider.hpp>
-#include <apps-common/Application.hpp>
+#include <apps-common/ApplicationCommon.hpp>
 
 namespace app::music_player
 {
diff --git a/module-apps/application-music-player/models/SongsRepository.cpp b/module-apps/application-music-player/models/SongsRepository.cpp
index 5dc7bd423..6233e4b43 100644
--- a/module-apps/application-music-player/models/SongsRepository.cpp
+++ b/module-apps/application-music-player/models/SongsRepository.cpp
@@ -15,7 +15,7 @@
 
 namespace app::music_player
 {
-    ServiceAudioTagsFetcher::ServiceAudioTagsFetcher(Application *application) : application(application)
+    ServiceAudioTagsFetcher::ServiceAudioTagsFetcher(ApplicationCommon *application) : application(application)
     {}
 
     std::optional<tags::fetcher::Tags> ServiceAudioTagsFetcher::getFileTags(const std::string &filePath) const
diff --git a/module-apps/application-music-player/models/SongsRepository.hpp b/module-apps/application-music-player/models/SongsRepository.hpp
index 57818e80b..f8c74de3b 100644
--- a/module-apps/application-music-player/models/SongsRepository.hpp
+++ b/module-apps/application-music-player/models/SongsRepository.hpp
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <apps-common/Application.hpp>
+#include <apps-common/ApplicationCommon.hpp>
 #include <tags_fetcher/TagsFetcher.hpp>
 #include <purefs/filesystem_paths.hpp>
 
@@ -27,12 +27,12 @@ namespace app::music_player
     class ServiceAudioTagsFetcher : public AbstractTagsFetcher
     {
       public:
-        explicit ServiceAudioTagsFetcher(Application *application);
+        explicit ServiceAudioTagsFetcher(ApplicationCommon *application);
 
         std::optional<tags::fetcher::Tags> getFileTags(const std::string &filePath) const final;
 
       private:
-        Application *application = nullptr;
+        ApplicationCommon *application = nullptr;
     };
 
     class AbstractSongsRepository
diff --git a/module-apps/application-music-player/windows/MusicPlayerAllSongsWindow.cpp b/module-apps/application-music-player/windows/MusicPlayerAllSongsWindow.cpp
index d6b47ab16..658785a4c 100644
--- a/module-apps/application-music-player/windows/MusicPlayerAllSongsWindow.cpp
+++ b/module-apps/application-music-player/windows/MusicPlayerAllSongsWindow.cpp
@@ -16,7 +16,7 @@ namespace gui
 {
 
     MusicPlayerAllSongsWindow::MusicPlayerAllSongsWindow(
-        app::Application *app, std::shared_ptr<app::music_player::SongsContract::Presenter> windowPresenter)
+        app::ApplicationCommon *app, std::shared_ptr<app::music_player::SongsContract::Presenter> windowPresenter)
         : AppWindow(app, gui::name::window::all_songs_window), presenter{windowPresenter}
     {
         presenter->attach(this);
diff --git a/module-apps/application-music-player/windows/MusicPlayerAllSongsWindow.hpp b/module-apps/application-music-player/windows/MusicPlayerAllSongsWindow.hpp
index 3fd6f8867..f34c1a3e8 100644
--- a/module-apps/application-music-player/windows/MusicPlayerAllSongsWindow.hpp
+++ b/module-apps/application-music-player/windows/MusicPlayerAllSongsWindow.hpp
@@ -18,7 +18,7 @@ namespace gui
         Icon *emptyListIcon = nullptr;
 
       public:
-        explicit MusicPlayerAllSongsWindow(app::Application *app,
+        explicit MusicPlayerAllSongsWindow(app::ApplicationCommon *app,
                                            std::shared_ptr<app::music_player::SongsContract::Presenter> presenter);
 
         void onBeforeShow([[maybe_unused]] ShowMode mode, [[maybe_unused]] SwitchData *data) override;
diff --git a/module-apps/application-notes/ApplicationNotes.cpp b/module-apps/application-notes/ApplicationNotes.cpp
index 3edec4c9e..ac84e5bd6 100644
--- a/module-apps/application-notes/ApplicationNotes.cpp
+++ b/module-apps/application-notes/ApplicationNotes.cpp
@@ -85,46 +85,48 @@ namespace app
 
     void ApplicationNotes::createUserInterface()
     {
-        windowsFactory.attach(gui::name::window::main_window, [](Application *app, const std::string &name) {
+        windowsFactory.attach(gui::name::window::main_window, [](ApplicationCommon *app, const std::string &name) {
             auto notesRepository = std::make_unique<notes::NotesDBRepository>(app);
             auto notesProvider   = std::make_shared<notes::NotesListModel>(app, std::move(notesRepository));
             auto presenter       = std::make_unique<notes::NotesMainWindowPresenter>(notesProvider);
             return std::make_unique<notes::NoteMainWindow>(app, std::move(presenter));
         });
-        windowsFactory.attach(gui::name::window::note_preview, [](Application *app, const std::string &name) {
+        windowsFactory.attach(gui::name::window::note_preview, [](ApplicationCommon *app, const std::string &name) {
             auto notesRepository = std::make_unique<notes::NotesDBRepository>(app);
             auto presenter       = std::make_unique<notes::NotePreviewWindowPresenter>(std::move(notesRepository));
             return std::make_unique<notes::NotePreviewWindow>(app, std::move(presenter));
         });
-        windowsFactory.attach(gui::name::window::note_edit, [](Application *app, const std::string &name) {
+        windowsFactory.attach(gui::name::window::note_edit, [](ApplicationCommon *app, const std::string &name) {
             auto notesRepository = std::make_unique<notes::NotesDBRepository>(app);
             auto presenter       = std::make_unique<notes::NoteEditWindowPresenter>(std::move(notesRepository));
             return std::make_unique<notes::NoteEditWindow>(app, std::move(presenter));
         });
-        windowsFactory.attach(gui::name::window::note_create, [](Application *app, const std::string &name) {
+        windowsFactory.attach(gui::name::window::note_create, [](ApplicationCommon *app, const std::string &name) {
             auto notesRepository = std::make_unique<notes::NotesDBRepository>(app);
             auto presenter       = std::make_unique<notes::NoteCreateWindowPresenter>(std::move(notesRepository));
             return std::make_unique<notes::NoteCreateWindow>(app, std::move(presenter));
         });
-        windowsFactory.attach(gui::name::window::notes_search, [](Application *app, const std::string &name) {
+        windowsFactory.attach(gui::name::window::notes_search, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<notes::SearchEngineWindow>(app,
                                                                std::make_unique<notes::SearchEngineWindowPresenter>());
         });
-        windowsFactory.attach(gui::name::window::notes_search_result, [](Application *app, const std::string &) {
+        windowsFactory.attach(gui::name::window::notes_search_result, [](ApplicationCommon *app, const std::string &) {
             auto notesRepository = std::make_unique<notes::NotesDBRepository>(app);
             auto notesProvider   = std::make_shared<notes::NotesSearchListModel>(app, std::move(notesRepository));
             auto presenter       = std::make_unique<notes::NotesSearchWindowPresenter>(notesProvider);
             return std::make_unique<notes::SearchResultsWindow>(app, std::move(presenter));
         });
-        windowsFactory.attach(gui::name::window::note_dialog, [](Application *app, const std::string &name) {
+        windowsFactory.attach(gui::name::window::note_dialog, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::Dialog>(app, name);
         });
-        windowsFactory.attach(gui::name::window::note_confirm_dialog, [](Application *app, const std::string &name) {
-            return std::make_unique<gui::DialogYesNo>(app, name);
-        });
-        windowsFactory.attach(
-            utils::translate("app_phonebook_options_title"),
-            [](Application *app, const std::string &name) { return std::make_unique<gui::OptionWindow>(app, name); });
+        windowsFactory.attach(gui::name::window::note_confirm_dialog,
+                              [](ApplicationCommon *app, const std::string &name) {
+                                  return std::make_unique<gui::DialogYesNo>(app, name);
+                              });
+        windowsFactory.attach(utils::translate("app_phonebook_options_title"),
+                              [](ApplicationCommon *app, const std::string &name) {
+                                  return std::make_unique<gui::OptionWindow>(app, name);
+                              });
 
         attachPopups(
             {gui::popup::ID::Volume, gui::popup::ID::Tethering, gui::popup::ID::PhoneModes, gui::popup::ID::PhoneLock});
diff --git a/module-apps/application-notes/CMakeLists.txt b/module-apps/application-notes/CMakeLists.txt
index 3eb3a8097..549ce94b9 100644
--- a/module-apps/application-notes/CMakeLists.txt
+++ b/module-apps/application-notes/CMakeLists.txt
@@ -56,6 +56,7 @@ target_sources(application-notes
 
 target_link_libraries(application-notes
 	PRIVATE
+		app
 		apps-common
 		clipboard
 		module-gui
diff --git a/module-apps/application-notes/model/NotesListModel.cpp b/module-apps/application-notes/model/NotesListModel.cpp
index e8c163b17..3c8f2eea4 100644
--- a/module-apps/application-notes/model/NotesListModel.cpp
+++ b/module-apps/application-notes/model/NotesListModel.cpp
@@ -14,10 +14,11 @@
 
 namespace app::notes
 {
-    NotesListItemProvider::NotesListItemProvider(Application *app) : DatabaseModel(app)
+    NotesListItemProvider::NotesListItemProvider(ApplicationCommon *app) : DatabaseModel(app)
     {}
 
-    NotesListModel::NotesListModel(app::Application *app, std::shared_ptr<AbstractNotesRepository> notesRepository)
+    NotesListModel::NotesListModel(app::ApplicationCommon *app,
+                                   std::shared_ptr<AbstractNotesRepository> notesRepository)
         : NotesListItemProvider(app), notesRepository{std::move(notesRepository)}
     {}
 
diff --git a/module-apps/application-notes/model/NotesListModel.hpp b/module-apps/application-notes/model/NotesListModel.hpp
index 867e32d69..0cf054044 100644
--- a/module-apps/application-notes/model/NotesListModel.hpp
+++ b/module-apps/application-notes/model/NotesListModel.hpp
@@ -17,7 +17,7 @@ namespace app::notes
     class NotesListModel : public NotesListItemProvider
     {
       public:
-        NotesListModel(app::Application *app, std::shared_ptr<AbstractNotesRepository> notesRepository);
+        NotesListModel(app::ApplicationCommon *app, std::shared_ptr<AbstractNotesRepository> notesRepository);
 
         [[nodiscard]] unsigned int requestRecordsCount() override;
         [[nodiscard]] bool updateRecords(std::vector<NotesRecord> records) override;
diff --git a/module-apps/application-notes/model/NotesListProvider.hpp b/module-apps/application-notes/model/NotesListProvider.hpp
index 6cc1513e8..611d56c48 100644
--- a/module-apps/application-notes/model/NotesListProvider.hpp
+++ b/module-apps/application-notes/model/NotesListProvider.hpp
@@ -5,13 +5,13 @@
 
 #include <apps-common/DatabaseModel.hpp>
 #include <module-db/Interface/NotesRecord.hpp>
-#include <apps-common/Application.hpp>
+#include <apps-common/ApplicationCommon.hpp>
 
 namespace app::notes
 {
     class NotesListItemProvider : public app::DatabaseModel<NotesRecord>, public gui::ListItemProvider
     {
       public:
-        explicit NotesListItemProvider(app::Application *app);
+        explicit NotesListItemProvider(app::ApplicationCommon *app);
     };
 } // namespace app::notes
diff --git a/module-apps/application-notes/model/NotesRepository.cpp b/module-apps/application-notes/model/NotesRepository.cpp
index 9f10df41d..c29f0dece 100644
--- a/module-apps/application-notes/model/NotesRepository.cpp
+++ b/module-apps/application-notes/model/NotesRepository.cpp
@@ -12,7 +12,7 @@
 
 namespace app::notes
 {
-    NotesDBRepository::NotesDBRepository(Application *application)
+    NotesDBRepository::NotesDBRepository(ApplicationCommon *application)
         : app::AsyncCallbackReceiver{application}, application{application}
     {}
 
diff --git a/module-apps/application-notes/model/NotesRepository.hpp b/module-apps/application-notes/model/NotesRepository.hpp
index cf25bc15e..e61c93159 100644
--- a/module-apps/application-notes/model/NotesRepository.hpp
+++ b/module-apps/application-notes/model/NotesRepository.hpp
@@ -5,7 +5,7 @@
 
 #include <functional>
 
-#include <apps-common/Application.hpp>
+#include <apps-common/ApplicationCommon.hpp>
 
 #include <module-db/Interface/NotesRecord.hpp>
 
@@ -32,7 +32,7 @@ namespace app::notes
     class NotesDBRepository : public AbstractNotesRepository, public app::AsyncCallbackReceiver
     {
       public:
-        explicit NotesDBRepository(Application *application);
+        explicit NotesDBRepository(ApplicationCommon *application);
 
         void get(std::uint32_t offset, std::uint32_t limit, const OnGetCallback &callback) override;
         void getByText(const std::string &text,
@@ -43,6 +43,6 @@ namespace app::notes
         void remove(const NotesRecord &note, const OnRemoveCallback &callback) override;
 
       private:
-        Application *application;
+        ApplicationCommon *application;
     };
 } // namespace app::notes
diff --git a/module-apps/application-notes/model/NotesSearchListModel.hpp b/module-apps/application-notes/model/NotesSearchListModel.hpp
index 1bade7c7d..7185f2810 100644
--- a/module-apps/application-notes/model/NotesSearchListModel.hpp
+++ b/module-apps/application-notes/model/NotesSearchListModel.hpp
@@ -13,7 +13,7 @@ namespace app::notes
     class NotesSearchListModel : public NotesListModel
     {
       public:
-        NotesSearchListModel(app::Application *app, std::shared_ptr<AbstractNotesRepository> notesRepository)
+        NotesSearchListModel(app::ApplicationCommon *app, std::shared_ptr<AbstractNotesRepository> notesRepository)
             : NotesListModel(app, std::move(notesRepository))
         {}
         void setSearchText(const std::string &text)
diff --git a/module-apps/application-notes/windows/NoteCreateWindow.cpp b/module-apps/application-notes/windows/NoteCreateWindow.cpp
index 6030acdba..9eb5f9eae 100644
--- a/module-apps/application-notes/windows/NoteCreateWindow.cpp
+++ b/module-apps/application-notes/windows/NoteCreateWindow.cpp
@@ -7,7 +7,7 @@
 
 namespace app::notes
 {
-    NoteCreateWindow::NoteCreateWindow(app::Application *app,
+    NoteCreateWindow::NoteCreateWindow(app::ApplicationCommon *app,
                                        std::unique_ptr<NoteEditWindowContract::Presenter> &&windowPresenter)
         : NoteEditWindow(app, std::move(windowPresenter), gui::name::window::note_create)
     {}
diff --git a/module-apps/application-notes/windows/NoteCreateWindow.hpp b/module-apps/application-notes/windows/NoteCreateWindow.hpp
index 82877b5c3..89493ffb9 100644
--- a/module-apps/application-notes/windows/NoteCreateWindow.hpp
+++ b/module-apps/application-notes/windows/NoteCreateWindow.hpp
@@ -10,7 +10,8 @@ namespace app::notes
     class NoteCreateWindow : public NoteEditWindow
     {
       public:
-        NoteCreateWindow(app::Application *app, std::unique_ptr<NoteEditWindowContract::Presenter> &&windowPresenter);
+        NoteCreateWindow(app::ApplicationCommon *app,
+                         std::unique_ptr<NoteEditWindowContract::Presenter> &&windowPresenter);
 
       private:
         bool onInput(const gui::InputEvent &inputEvent) override;
diff --git a/module-apps/application-notes/windows/NoteEditWindow.cpp b/module-apps/application-notes/windows/NoteEditWindow.cpp
index 4fc4e4ea4..1622ceeb9 100644
--- a/module-apps/application-notes/windows/NoteEditWindow.cpp
+++ b/module-apps/application-notes/windows/NoteEditWindow.cpp
@@ -24,12 +24,12 @@ namespace app::notes
         constexpr auto MaxCharactersCount = 4000U;
     } // namespace
 
-    NoteEditWindow::NoteEditWindow(app::Application *app,
+    NoteEditWindow::NoteEditWindow(app::ApplicationCommon *app,
                                    std::unique_ptr<NoteEditWindowContract::Presenter> &&windowPresenter)
         : NoteEditWindow(app, std::move(windowPresenter), gui::name::window::note_edit)
     {}
 
-    NoteEditWindow::NoteEditWindow(app::Application *app,
+    NoteEditWindow::NoteEditWindow(app::ApplicationCommon *app,
                                    std::unique_ptr<NoteEditWindowContract::Presenter> &&windowPresenter,
                                    const std::string &windowName)
         : gui::AppWindow{app, windowName}, presenter{std::move(windowPresenter)}
diff --git a/module-apps/application-notes/windows/NoteEditWindow.hpp b/module-apps/application-notes/windows/NoteEditWindow.hpp
index 6d99d3ede..6e328fd58 100644
--- a/module-apps/application-notes/windows/NoteEditWindow.hpp
+++ b/module-apps/application-notes/windows/NoteEditWindow.hpp
@@ -20,7 +20,8 @@ namespace app::notes
     class NoteEditWindow : public gui::AppWindow, public NoteEditWindowContract::View
     {
       public:
-        NoteEditWindow(app::Application *app, std::unique_ptr<NoteEditWindowContract::Presenter> &&windowPresenter);
+        NoteEditWindow(app::ApplicationCommon *app,
+                       std::unique_ptr<NoteEditWindowContract::Presenter> &&windowPresenter);
         ~NoteEditWindow() noexcept override;
 
         void onBeforeShow(gui::ShowMode mode, gui::SwitchData *data) override;
@@ -32,7 +33,7 @@ namespace app::notes
         void destroyInterface() override;
 
       protected:
-        NoteEditWindow(app::Application *app,
+        NoteEditWindow(app::ApplicationCommon *app,
                        std::unique_ptr<NoteEditWindowContract::Presenter> &&windowPresenter,
                        const std::string &windowName);
         virtual void onCharactersCountChanged(std::uint32_t count);
diff --git a/module-apps/application-notes/windows/NoteMainWindow.cpp b/module-apps/application-notes/windows/NoteMainWindow.cpp
index 8a6e88f59..808d5d517 100644
--- a/module-apps/application-notes/windows/NoteMainWindow.cpp
+++ b/module-apps/application-notes/windows/NoteMainWindow.cpp
@@ -19,7 +19,7 @@
 
 namespace app::notes
 {
-    NoteMainWindow::NoteMainWindow(app::Application *app,
+    NoteMainWindow::NoteMainWindow(app::ApplicationCommon *app,
                                    std::unique_ptr<NotesMainWindowContract::Presenter> &&windowPresenter)
         : AppWindow(app, gui::name::window::main_window), presenter{std::move(windowPresenter)}
     {
diff --git a/module-apps/application-notes/windows/NoteMainWindow.hpp b/module-apps/application-notes/windows/NoteMainWindow.hpp
index 22c199df2..3ed215006 100644
--- a/module-apps/application-notes/windows/NoteMainWindow.hpp
+++ b/module-apps/application-notes/windows/NoteMainWindow.hpp
@@ -17,7 +17,8 @@ namespace app::notes
     class NoteMainWindow : public gui::AppWindow, public NotesMainWindowContract::View
     {
       public:
-        NoteMainWindow(app::Application *app, std::unique_ptr<NotesMainWindowContract::Presenter> &&windowPresenter);
+        NoteMainWindow(app::ApplicationCommon *app,
+                       std::unique_ptr<NotesMainWindowContract::Presenter> &&windowPresenter);
         ~NoteMainWindow() noexcept override;
 
         // virtual methods
diff --git a/module-apps/application-notes/windows/NotePreviewWindow.cpp b/module-apps/application-notes/windows/NotePreviewWindow.cpp
index a439016d0..027f31327 100644
--- a/module-apps/application-notes/windows/NotePreviewWindow.cpp
+++ b/module-apps/application-notes/windows/NotePreviewWindow.cpp
@@ -16,7 +16,7 @@
 
 namespace app::notes
 {
-    NotePreviewWindow::NotePreviewWindow(app::Application *app,
+    NotePreviewWindow::NotePreviewWindow(app::ApplicationCommon *app,
                                          std::unique_ptr<NotePreviewWindowContract::Presenter> &&windowPresenter)
         : AppWindow(app, gui::name::window::note_preview), presenter(std::move(windowPresenter))
     {
diff --git a/module-apps/application-notes/windows/NotePreviewWindow.hpp b/module-apps/application-notes/windows/NotePreviewWindow.hpp
index a1aa352ba..b67f4f451 100644
--- a/module-apps/application-notes/windows/NotePreviewWindow.hpp
+++ b/module-apps/application-notes/windows/NotePreviewWindow.hpp
@@ -17,7 +17,7 @@ namespace app::notes
     class NotePreviewWindow : public gui::AppWindow, public NotePreviewWindowContract::View
     {
       public:
-        NotePreviewWindow(app::Application *app,
+        NotePreviewWindow(app::ApplicationCommon *app,
                           std::unique_ptr<NotePreviewWindowContract::Presenter> &&windowPresenter);
         ~NotePreviewWindow() noexcept override;
 
diff --git a/module-apps/application-notes/windows/NotesOptions.cpp b/module-apps/application-notes/windows/NotesOptions.cpp
index 9c6ad7423..a9391e06d 100644
--- a/module-apps/application-notes/windows/NotesOptions.cpp
+++ b/module-apps/application-notes/windows/NotesOptions.cpp
@@ -24,7 +24,9 @@ namespace app::notes
             options.emplace_back(utils::translate(translationId), onClickCallback);
         }
 
-        void removeNote(const NotesRecord &record, Application *application, AbstractNotesRepository &notesRepository)
+        void removeNote(const NotesRecord &record,
+                        ApplicationCommon *application,
+                        AbstractNotesRepository &notesRepository)
         {
             auto metaData = std::make_unique<gui::DialogMetadataMessage>(
                 gui::DialogMetadata{record.snippet,
@@ -42,7 +44,7 @@ namespace app::notes
         }
     } // namespace
 
-    std::list<gui::Option> noteListOptions(Application *application,
+    std::list<gui::Option> noteListOptions(ApplicationCommon *application,
                                            const NotesRecord &record,
                                            AbstractNotesRepository &notesRepository)
     {
@@ -57,7 +59,7 @@ namespace app::notes
         return options;
     }
 
-    std::list<gui::Option> notePreviewOptions(Application *application,
+    std::list<gui::Option> notePreviewOptions(ApplicationCommon *application,
                                               const NotesRecord &record,
                                               AbstractNotesRepository &notesRepository,
                                               gui::Text *textWidget)
@@ -83,7 +85,9 @@ namespace app::notes
         return options;
     }
 
-    std::list<gui::Option> noteEditOptions(Application *application, const NotesRecord &record, gui::Text *textWidget)
+    std::list<gui::Option> noteEditOptions(ApplicationCommon *application,
+                                           const NotesRecord &record,
+                                           gui::Text *textWidget)
     {
         std::list<gui::Option> options;
         addOption(
diff --git a/module-apps/application-notes/windows/NotesOptions.hpp b/module-apps/application-notes/windows/NotesOptions.hpp
index 5d81b1b3d..f6d3f94a7 100644
--- a/module-apps/application-notes/windows/NotesOptions.hpp
+++ b/module-apps/application-notes/windows/NotesOptions.hpp
@@ -15,12 +15,14 @@ namespace gui
 
 namespace app::notes
 {
-    std::list<gui::Option> noteListOptions(Application *application,
+    std::list<gui::Option> noteListOptions(ApplicationCommon *application,
                                            const NotesRecord &record,
                                            AbstractNotesRepository &notesRepository);
-    std::list<gui::Option> notePreviewOptions(Application *application,
+    std::list<gui::Option> notePreviewOptions(ApplicationCommon *application,
                                               const NotesRecord &record,
                                               AbstractNotesRepository &notesRepository,
                                               gui::Text *textWidget);
-    std::list<gui::Option> noteEditOptions(Application *application, const NotesRecord &record, gui::Text *textWidget);
+    std::list<gui::Option> noteEditOptions(ApplicationCommon *application,
+                                           const NotesRecord &record,
+                                           gui::Text *textWidget);
 } // namespace app::notes
diff --git a/module-apps/application-notes/windows/SearchEngineWindow.cpp b/module-apps/application-notes/windows/SearchEngineWindow.cpp
index 399714c68..3114a1e5f 100644
--- a/module-apps/application-notes/windows/SearchEngineWindow.cpp
+++ b/module-apps/application-notes/windows/SearchEngineWindow.cpp
@@ -11,7 +11,7 @@
 
 namespace app::notes
 {
-    SearchEngineWindow::SearchEngineWindow(Application *application,
+    SearchEngineWindow::SearchEngineWindow(ApplicationCommon *application,
                                            std::unique_ptr<SearchEngineWindowContract::Presenter> &&windowPresenter)
         : gui::AppWindow{application, gui::name::window::notes_search}, presenter{std::move(windowPresenter)}
     {
diff --git a/module-apps/application-notes/windows/SearchEngineWindow.hpp b/module-apps/application-notes/windows/SearchEngineWindow.hpp
index 9dcdd3691..024bb0eae 100644
--- a/module-apps/application-notes/windows/SearchEngineWindow.hpp
+++ b/module-apps/application-notes/windows/SearchEngineWindow.hpp
@@ -5,7 +5,7 @@
 
 #include "AppWindow.hpp"
 
-#include <apps-common/Application.hpp>
+#include <apps-common/ApplicationCommon.hpp>
 #include <module-apps/application-notes/presenter/SearchEngineWindowPresenter.hpp>
 
 #include <module-gui/gui/input/InputEvent.hpp>
@@ -16,7 +16,7 @@ namespace app::notes
     class SearchEngineWindow : public gui::AppWindow, public SearchEngineWindowContract::View
     {
       public:
-        SearchEngineWindow(Application *application,
+        SearchEngineWindow(ApplicationCommon *application,
                            std::unique_ptr<SearchEngineWindowContract::Presenter> &&windowPresenter);
         ~SearchEngineWindow() noexcept override;
 
diff --git a/module-apps/application-notes/windows/SearchResultsWindow.cpp b/module-apps/application-notes/windows/SearchResultsWindow.cpp
index fd01965a3..e9673dee0 100644
--- a/module-apps/application-notes/windows/SearchResultsWindow.cpp
+++ b/module-apps/application-notes/windows/SearchResultsWindow.cpp
@@ -11,7 +11,7 @@
 
 namespace app::notes
 {
-    SearchResultsWindow::SearchResultsWindow(Application *application,
+    SearchResultsWindow::SearchResultsWindow(ApplicationCommon *application,
                                              std::unique_ptr<NotesSearchWindowContract::Presenter> &&windowPresenter)
         : AppWindow(application, gui::name::window::notes_search_result), presenter(std::move(windowPresenter))
     {
diff --git a/module-apps/application-notes/windows/SearchResultsWindow.hpp b/module-apps/application-notes/windows/SearchResultsWindow.hpp
index 68c062025..2c7733310 100644
--- a/module-apps/application-notes/windows/SearchResultsWindow.hpp
+++ b/module-apps/application-notes/windows/SearchResultsWindow.hpp
@@ -7,7 +7,7 @@
 
 #include "AppWindow.hpp"
 
-#include <apps-common/Application.hpp>
+#include <apps-common/ApplicationCommon.hpp>
 #include <module-apps/application-notes/presenter/NotesSearchResultPresenter.hpp>
 
 #include <module-gui/gui/widgets/ListView.hpp>
@@ -17,7 +17,7 @@ namespace app::notes
     class SearchResultsWindow : public gui::AppWindow, public NotesSearchWindowContract::View
     {
       public:
-        explicit SearchResultsWindow(app::Application *app,
+        explicit SearchResultsWindow(app::ApplicationCommon *app,
                                      std::unique_ptr<NotesSearchWindowContract::Presenter> &&windowPresenter);
         ~SearchResultsWindow() noexcept override;
 
diff --git a/module-apps/application-onboarding/ApplicationOnBoarding.cpp b/module-apps/application-onboarding/ApplicationOnBoarding.cpp
index d1b37d214..952ccd185 100644
--- a/module-apps/application-onboarding/ApplicationOnBoarding.cpp
+++ b/module-apps/application-onboarding/ApplicationOnBoarding.cpp
@@ -116,55 +116,57 @@ namespace app
 
     void ApplicationOnBoarding::createUserInterface()
     {
-        windowsFactory.attach(gui::name::window::main_window, [](Application *app, const std::string &name) {
+        windowsFactory.attach(gui::name::window::main_window, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<app::onBoarding::OnBoardingLanguagesWindow>(app, gui::name::window::main_window);
         });
         windowsFactory.attach(gui::window::name::onBoarding_start_configuration,
-                              [](Application *app, const std::string &name) {
+                              [](ApplicationCommon *app, const std::string &name) {
                                   return std::make_unique<app::onBoarding::StartConfigurationWindow>(app);
                               });
-        windowsFactory.attach(gui::window::name::onBoarding_eula, [&](Application *app, const std::string &name) {
+        windowsFactory.attach(gui::window::name::onBoarding_eula, [&](ApplicationCommon *app, const std::string &name) {
             auto eulaRepository = std::make_unique<app::onBoarding::EULARepository>("assets/licenses", "eula.txt");
             auto presenter      = std::make_unique<app::onBoarding::EULALicenseWindowPresenter>([&]() { acceptEULA(); },
                                                                                            std::move(eulaRepository));
             return std::make_unique<app::onBoarding::EULALicenseWindow>(app, std::move(presenter));
         });
-        windowsFactory.attach(gui::window::name::onBoarding_sim_select, [](Application *app, const std::string &name) {
-            return std::make_unique<app::onBoarding::OnBoardingSimSelectWindow>(
-                app, gui::window::name::onBoarding_sim_select);
-        });
+        windowsFactory.attach(gui::window::name::onBoarding_sim_select,
+                              [](ApplicationCommon *app, const std::string &name) {
+                                  return std::make_unique<app::onBoarding::OnBoardingSimSelectWindow>(
+                                      app, gui::window::name::onBoarding_sim_select);
+                              });
         windowsFactory.attach(gui::window::name::onBoarding_no_sim_selected,
-                              [](Application *app, const std::string &name) {
+                              [](ApplicationCommon *app, const std::string &name) {
                                   return std::make_unique<app::onBoarding::NoSimSelectedDialogWindow>(app);
                               });
         windowsFactory.attach(gui::window::name::onBoarding_configuration_successful,
-                              [](Application *app, const std::string &name) {
+                              [](ApplicationCommon *app, const std::string &name) {
                                   return std::make_unique<app::onBoarding::ConfigurationSuccessfulDialogWindow>(app);
                               });
         windowsFactory.attach(gui::window::name::onBoarding_no_configuration,
-                              [](Application *app, const std::string &name) {
+                              [](ApplicationCommon *app, const std::string &name) {
                                   return std::make_unique<app::onBoarding::NoConfigurationDialogWindow>(app);
                               });
-        windowsFactory.attach(gui::window::name::onBoarding_update, [&](Application *app, const std::string &name) {
-            auto presenter =
-                std::make_unique<app::onBoarding::OnBoardingFinalizeWindowPresenter>([&]() { finalizeOnBoarding(); });
-            return std::make_unique<app::onBoarding::UpdateDialogWindow>(app, std::move(presenter));
-        });
-        windowsFactory.attach(gui::window::name::onBoarding_skip, [](Application *app, const std::string &name) {
+        windowsFactory.attach(
+            gui::window::name::onBoarding_update, [&](ApplicationCommon *app, const std::string &name) {
+                auto presenter = std::make_unique<app::onBoarding::OnBoardingFinalizeWindowPresenter>(
+                    [&]() { finalizeOnBoarding(); });
+                return std::make_unique<app::onBoarding::UpdateDialogWindow>(app, std::move(presenter));
+            });
+        windowsFactory.attach(gui::window::name::onBoarding_skip, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<app::onBoarding::SkipDialogWindow>(app);
         });
         windowsFactory.attach(gui::window::name::onBoarding_date_and_time,
-                              [](Application *app, const std::string &name) {
+                              [](ApplicationCommon *app, const std::string &name) {
                                   return std::make_unique<app::onBoarding::OnBoardingDateAndTimeWindow>(app);
                               });
         windowsFactory.attach(gui::window::name::onBoarding_change_date_and_time,
-                              [](Application *app, const std::string &name) {
+                              [](ApplicationCommon *app, const std::string &name) {
                                   return std::make_unique<app::onBoarding::OnBoardingChangeDateAndTimeWindow>(app);
                               });
-        windowsFactory.attach(gui::window::name::change_time_zone, [](Application *app, const std::string &name) {
+        windowsFactory.attach(gui::window::name::change_time_zone, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::ChangeTimeZone>(app);
         });
-        windowsFactory.attach(gui::window::name::dialog_confirm, [](Application *app, const std::string &name) {
+        windowsFactory.attach(gui::window::name::dialog_confirm, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::DialogConfirm>(app, gui::window::name::dialog_confirm);
         });
 
diff --git a/module-apps/application-onboarding/windows/ConfigurationSuccessfulDialogWindow.cpp b/module-apps/application-onboarding/windows/ConfigurationSuccessfulDialogWindow.cpp
index fbde74b31..4d8a3ade8 100644
--- a/module-apps/application-onboarding/windows/ConfigurationSuccessfulDialogWindow.cpp
+++ b/module-apps/application-onboarding/windows/ConfigurationSuccessfulDialogWindow.cpp
@@ -14,7 +14,7 @@
 
 namespace app::onBoarding
 {
-    ConfigurationSuccessfulDialogWindow::ConfigurationSuccessfulDialogWindow(app::Application *app)
+    ConfigurationSuccessfulDialogWindow::ConfigurationSuccessfulDialogWindow(app::ApplicationCommon *app)
         : gui::Dialog(app, gui::window::name::onBoarding_configuration_successful)
     {
         header->navigationIndicatorAdd(new gui::header::IceAction(), gui::header::BoxSelection::Left);
diff --git a/module-apps/application-onboarding/windows/ConfigurationSuccessfulDialogWindow.hpp b/module-apps/application-onboarding/windows/ConfigurationSuccessfulDialogWindow.hpp
index d28db7c97..f055bb2e3 100644
--- a/module-apps/application-onboarding/windows/ConfigurationSuccessfulDialogWindow.hpp
+++ b/module-apps/application-onboarding/windows/ConfigurationSuccessfulDialogWindow.hpp
@@ -16,7 +16,7 @@ namespace app::onBoarding
     class ConfigurationSuccessfulDialogWindow : public gui::Dialog
     {
       public:
-        explicit ConfigurationSuccessfulDialogWindow(app::Application *app);
+        explicit ConfigurationSuccessfulDialogWindow(app::ApplicationCommon *app);
 
         bool onInput(const gui::InputEvent &inputEvent) override;
     };
diff --git a/module-apps/application-onboarding/windows/EULALicenseWindow.cpp b/module-apps/application-onboarding/windows/EULALicenseWindow.cpp
index 16d3e028e..ff2710958 100644
--- a/module-apps/application-onboarding/windows/EULALicenseWindow.cpp
+++ b/module-apps/application-onboarding/windows/EULALicenseWindow.cpp
@@ -12,7 +12,7 @@
 
 namespace app::onBoarding
 {
-    EULALicenseWindow::EULALicenseWindow(app::Application *app,
+    EULALicenseWindow::EULALicenseWindow(app::ApplicationCommon *app,
                                          std::unique_ptr<EULALicenseWindowContract::Presenter> &&windowPresenter)
         : gui::AppWindow(app, gui::window::name::onBoarding_eula), presenter{std::move(windowPresenter)}
     {
diff --git a/module-apps/application-onboarding/windows/EULALicenseWindow.hpp b/module-apps/application-onboarding/windows/EULALicenseWindow.hpp
index 851cb8b0f..8e13ffdfe 100644
--- a/module-apps/application-onboarding/windows/EULALicenseWindow.hpp
+++ b/module-apps/application-onboarding/windows/EULALicenseWindow.hpp
@@ -16,7 +16,7 @@ namespace app::onBoarding
     class EULALicenseWindow : public gui::AppWindow, public EULALicenseWindowContract::View
     {
       public:
-        explicit EULALicenseWindow(app::Application *app,
+        explicit EULALicenseWindow(app::ApplicationCommon *app,
                                    std::unique_ptr<EULALicenseWindowContract::Presenter> &&windowPresenter);
         ~EULALicenseWindow() noexcept override;
 
diff --git a/module-apps/application-onboarding/windows/NoConfigurationDialogWindow.cpp b/module-apps/application-onboarding/windows/NoConfigurationDialogWindow.cpp
index 3def4cc4f..95c749644 100644
--- a/module-apps/application-onboarding/windows/NoConfigurationDialogWindow.cpp
+++ b/module-apps/application-onboarding/windows/NoConfigurationDialogWindow.cpp
@@ -14,7 +14,7 @@
 
 namespace app::onBoarding
 {
-    NoConfigurationDialogWindow::NoConfigurationDialogWindow(app::Application *app)
+    NoConfigurationDialogWindow::NoConfigurationDialogWindow(app::ApplicationCommon *app)
         : gui::Dialog(app, gui::window::name::onBoarding_no_configuration)
     {
         header->navigationIndicatorAdd(new gui::header::IceAction(), gui::header::BoxSelection::Left);
diff --git a/module-apps/application-onboarding/windows/NoConfigurationDialogWindow.hpp b/module-apps/application-onboarding/windows/NoConfigurationDialogWindow.hpp
index 121ab5447..c12166d70 100644
--- a/module-apps/application-onboarding/windows/NoConfigurationDialogWindow.hpp
+++ b/module-apps/application-onboarding/windows/NoConfigurationDialogWindow.hpp
@@ -16,7 +16,7 @@ namespace app::onBoarding
     class NoConfigurationDialogWindow : public gui::Dialog
     {
       public:
-        explicit NoConfigurationDialogWindow(app::Application *app);
+        explicit NoConfigurationDialogWindow(app::ApplicationCommon *app);
 
         bool onInput(const gui::InputEvent &inputEvent) override;
     };
diff --git a/module-apps/application-onboarding/windows/NoSimSelectedDialogWindow.cpp b/module-apps/application-onboarding/windows/NoSimSelectedDialogWindow.cpp
index eec022cbd..68e84746b 100644
--- a/module-apps/application-onboarding/windows/NoSimSelectedDialogWindow.cpp
+++ b/module-apps/application-onboarding/windows/NoSimSelectedDialogWindow.cpp
@@ -10,7 +10,7 @@
 
 namespace app::onBoarding
 {
-    NoSimSelectedDialogWindow::NoSimSelectedDialogWindow(app::Application *app)
+    NoSimSelectedDialogWindow::NoSimSelectedDialogWindow(app::ApplicationCommon *app)
         : gui::Dialog(app, gui::window::name::onBoarding_no_sim_selected)
     {
         bottomBar->setText(gui::BottomBar::Side::CENTER, utils::translate(style::strings::common::ok));
diff --git a/module-apps/application-onboarding/windows/NoSimSelectedDialogWindow.hpp b/module-apps/application-onboarding/windows/NoSimSelectedDialogWindow.hpp
index 3b1af3f91..1a19a1904 100644
--- a/module-apps/application-onboarding/windows/NoSimSelectedDialogWindow.hpp
+++ b/module-apps/application-onboarding/windows/NoSimSelectedDialogWindow.hpp
@@ -12,7 +12,7 @@ namespace app::onBoarding
     class NoSimSelectedDialogWindow : public gui::Dialog
     {
       public:
-        explicit NoSimSelectedDialogWindow(app::Application *app);
+        explicit NoSimSelectedDialogWindow(app::ApplicationCommon *app);
 
         bool onInput(const gui::InputEvent &inputEvent) override;
     };
diff --git a/module-apps/application-onboarding/windows/OnBoardingChangeDateAndTimeWindow.cpp b/module-apps/application-onboarding/windows/OnBoardingChangeDateAndTimeWindow.cpp
index 30caa3b86..29b5e2b3e 100644
--- a/module-apps/application-onboarding/windows/OnBoardingChangeDateAndTimeWindow.cpp
+++ b/module-apps/application-onboarding/windows/OnBoardingChangeDateAndTimeWindow.cpp
@@ -7,7 +7,7 @@
 
 namespace app::onBoarding
 {
-    OnBoardingChangeDateAndTimeWindow::OnBoardingChangeDateAndTimeWindow(app::Application *app)
+    OnBoardingChangeDateAndTimeWindow::OnBoardingChangeDateAndTimeWindow(app::ApplicationCommon *app)
         : ChangeDateAndTimeWindow(app, gui::window::name::onBoarding_change_date_and_time)
     {}
 
diff --git a/module-apps/application-onboarding/windows/OnBoardingChangeDateAndTimeWindow.hpp b/module-apps/application-onboarding/windows/OnBoardingChangeDateAndTimeWindow.hpp
index 9750bde59..0f97a8094 100644
--- a/module-apps/application-onboarding/windows/OnBoardingChangeDateAndTimeWindow.hpp
+++ b/module-apps/application-onboarding/windows/OnBoardingChangeDateAndTimeWindow.hpp
@@ -10,7 +10,7 @@ namespace app::onBoarding
     class OnBoardingChangeDateAndTimeWindow : public gui::ChangeDateAndTimeWindow
     {
       public:
-        explicit OnBoardingChangeDateAndTimeWindow(app::Application *app);
+        explicit OnBoardingChangeDateAndTimeWindow(app::ApplicationCommon *app);
 
         bool onInput(const gui::InputEvent &inputEvent) override;
     };
diff --git a/module-apps/application-onboarding/windows/OnBoardingDateAndTimeWindow.cpp b/module-apps/application-onboarding/windows/OnBoardingDateAndTimeWindow.cpp
index 7131d05fd..093489219 100644
--- a/module-apps/application-onboarding/windows/OnBoardingDateAndTimeWindow.cpp
+++ b/module-apps/application-onboarding/windows/OnBoardingDateAndTimeWindow.cpp
@@ -13,7 +13,7 @@
 
 namespace app::onBoarding
 {
-    OnBoardingDateAndTimeWindow::OnBoardingDateAndTimeWindow(app::Application *app)
+    OnBoardingDateAndTimeWindow::OnBoardingDateAndTimeWindow(app::ApplicationCommon *app)
         : DateAndTimeMainWindow(app, gui::window::name::onBoarding_date_and_time)
     {
         changeDateAndTimeWindow = gui::window::name::onBoarding_change_date_and_time;
diff --git a/module-apps/application-onboarding/windows/OnBoardingDateAndTimeWindow.hpp b/module-apps/application-onboarding/windows/OnBoardingDateAndTimeWindow.hpp
index 997ab879a..53b3ec5b4 100644
--- a/module-apps/application-onboarding/windows/OnBoardingDateAndTimeWindow.hpp
+++ b/module-apps/application-onboarding/windows/OnBoardingDateAndTimeWindow.hpp
@@ -10,7 +10,7 @@ namespace app::onBoarding
     class OnBoardingDateAndTimeWindow : public gui::DateAndTimeMainWindow
     {
       public:
-        explicit OnBoardingDateAndTimeWindow(app::Application *app);
+        explicit OnBoardingDateAndTimeWindow(app::ApplicationCommon *app);
         ~OnBoardingDateAndTimeWindow();
 
       protected:
diff --git a/module-apps/application-onboarding/windows/OnBoardingLanguagesWindow.cpp b/module-apps/application-onboarding/windows/OnBoardingLanguagesWindow.cpp
index 2b93f86c7..5d7b2bbe5 100644
--- a/module-apps/application-onboarding/windows/OnBoardingLanguagesWindow.cpp
+++ b/module-apps/application-onboarding/windows/OnBoardingLanguagesWindow.cpp
@@ -10,7 +10,7 @@
 
 namespace app::onBoarding
 {
-    OnBoardingLanguagesWindow::OnBoardingLanguagesWindow(app::Application *app, const std::string &name)
+    OnBoardingLanguagesWindow::OnBoardingLanguagesWindow(app::ApplicationCommon *app, const std::string &name)
         : LanguagesWindow(app, name)
     {
         applyToStatusBar([](gui::status_bar::Configuration configuration) {
diff --git a/module-apps/application-onboarding/windows/OnBoardingLanguagesWindow.hpp b/module-apps/application-onboarding/windows/OnBoardingLanguagesWindow.hpp
index 93041f6a1..482dc747c 100644
--- a/module-apps/application-onboarding/windows/OnBoardingLanguagesWindow.hpp
+++ b/module-apps/application-onboarding/windows/OnBoardingLanguagesWindow.hpp
@@ -10,7 +10,7 @@ namespace app::onBoarding
     class OnBoardingLanguagesWindow : public gui::LanguagesWindow
     {
       public:
-        explicit OnBoardingLanguagesWindow(app::Application *app, const std::string &);
+        explicit OnBoardingLanguagesWindow(app::ApplicationCommon *app, const std::string &);
 
       private:
         void onBeforeShow(gui::ShowMode mode, gui::SwitchData *data) override;
diff --git a/module-apps/application-onboarding/windows/OnBoardingSimSelectWindow.cpp b/module-apps/application-onboarding/windows/OnBoardingSimSelectWindow.cpp
index 2c2382318..92bf89467 100644
--- a/module-apps/application-onboarding/windows/OnBoardingSimSelectWindow.cpp
+++ b/module-apps/application-onboarding/windows/OnBoardingSimSelectWindow.cpp
@@ -13,7 +13,7 @@
 
 namespace app::onBoarding
 {
-    OnBoardingSimSelectWindow::OnBoardingSimSelectWindow(app::Application *app, std::string name)
+    OnBoardingSimSelectWindow::OnBoardingSimSelectWindow(app::ApplicationCommon *app, std::string name)
         : BaseSettingsWindow(app, std::move(name))
     {
         buildInterface();
diff --git a/module-apps/application-onboarding/windows/OnBoardingSimSelectWindow.hpp b/module-apps/application-onboarding/windows/OnBoardingSimSelectWindow.hpp
index d52ba3ee5..075be45d8 100644
--- a/module-apps/application-onboarding/windows/OnBoardingSimSelectWindow.hpp
+++ b/module-apps/application-onboarding/windows/OnBoardingSimSelectWindow.hpp
@@ -11,7 +11,7 @@ namespace app::onBoarding
     class OnBoardingSimSelectWindow : public gui::BaseSettingsWindow
     {
       public:
-        explicit OnBoardingSimSelectWindow(app::Application *app, std::string name);
+        explicit OnBoardingSimSelectWindow(app::ApplicationCommon *app, std::string name);
         void buildInterface() override;
 
       private:
diff --git a/module-apps/application-onboarding/windows/SkipDialogWindow.cpp b/module-apps/application-onboarding/windows/SkipDialogWindow.cpp
index 89d498672..043c63959 100644
--- a/module-apps/application-onboarding/windows/SkipDialogWindow.cpp
+++ b/module-apps/application-onboarding/windows/SkipDialogWindow.cpp
@@ -6,7 +6,7 @@
 
 namespace app::onBoarding
 {
-    SkipDialogWindow::SkipDialogWindow(app::Application *app)
+    SkipDialogWindow::SkipDialogWindow(app::ApplicationCommon *app)
         : gui::DialogYesNo(app, gui::window::name::onBoarding_skip)
     {
         applyToStatusBar([](gui::status_bar::Configuration configuration) {
diff --git a/module-apps/application-onboarding/windows/SkipDialogWindow.hpp b/module-apps/application-onboarding/windows/SkipDialogWindow.hpp
index e009e4df5..137e1be30 100644
--- a/module-apps/application-onboarding/windows/SkipDialogWindow.hpp
+++ b/module-apps/application-onboarding/windows/SkipDialogWindow.hpp
@@ -10,6 +10,6 @@ namespace app::onBoarding
     class SkipDialogWindow : public gui::DialogYesNo
     {
       public:
-        explicit SkipDialogWindow(app::Application *app);
+        explicit SkipDialogWindow(app::ApplicationCommon *app);
     };
 } // namespace app::onBoarding
diff --git a/module-apps/application-onboarding/windows/StartConfigurationWindow.cpp b/module-apps/application-onboarding/windows/StartConfigurationWindow.cpp
index e0b25bc65..93bf8ba16 100644
--- a/module-apps/application-onboarding/windows/StartConfigurationWindow.cpp
+++ b/module-apps/application-onboarding/windows/StartConfigurationWindow.cpp
@@ -17,7 +17,7 @@
 
 namespace app::onBoarding
 {
-    StartConfigurationWindow::StartConfigurationWindow(app::Application *app)
+    StartConfigurationWindow::StartConfigurationWindow(app::ApplicationCommon *app)
         : gui::AppWindow(app, gui::window::name::onBoarding_start_configuration)
     {
         buildInterface();
diff --git a/module-apps/application-onboarding/windows/StartConfigurationWindow.hpp b/module-apps/application-onboarding/windows/StartConfigurationWindow.hpp
index b88d9e05f..eca5b0667 100644
--- a/module-apps/application-onboarding/windows/StartConfigurationWindow.hpp
+++ b/module-apps/application-onboarding/windows/StartConfigurationWindow.hpp
@@ -13,7 +13,7 @@ namespace app::onBoarding
     class StartConfigurationWindow : public gui::AppWindow
     {
       public:
-        explicit StartConfigurationWindow(app::Application *app);
+        explicit StartConfigurationWindow(app::ApplicationCommon *app);
 
         gui::status_bar::Configuration configureStatusBar(gui::status_bar::Configuration appConfiguration) override;
         bool onInput(const gui::InputEvent &inputEvent) override;
diff --git a/module-apps/application-onboarding/windows/UpdateDialogWindow.cpp b/module-apps/application-onboarding/windows/UpdateDialogWindow.cpp
index 83342340f..cadc5c01f 100644
--- a/module-apps/application-onboarding/windows/UpdateDialogWindow.cpp
+++ b/module-apps/application-onboarding/windows/UpdateDialogWindow.cpp
@@ -12,7 +12,7 @@
 
 namespace app::onBoarding
 {
-    UpdateDialogWindow::UpdateDialogWindow(app::Application *app,
+    UpdateDialogWindow::UpdateDialogWindow(app::ApplicationCommon *app,
                                            std::unique_ptr<OnBoardingFinalizeContract::Presenter> &&windowPresenter)
         : gui::Dialog(app, gui::window::name::onBoarding_update), presenter(std::move(windowPresenter))
     {
diff --git a/module-apps/application-onboarding/windows/UpdateDialogWindow.hpp b/module-apps/application-onboarding/windows/UpdateDialogWindow.hpp
index 29f1add18..8c8502e44 100644
--- a/module-apps/application-onboarding/windows/UpdateDialogWindow.hpp
+++ b/module-apps/application-onboarding/windows/UpdateDialogWindow.hpp
@@ -16,7 +16,7 @@ namespace app::onBoarding
         std::unique_ptr<OnBoardingFinalizeContract::Presenter> presenter;
 
       public:
-        UpdateDialogWindow(app::Application *app,
+        UpdateDialogWindow(app::ApplicationCommon *app,
                            std::unique_ptr<OnBoardingFinalizeContract::Presenter> &&windowPresenter);
         void onBeforeShow(gui::ShowMode mode, gui::SwitchData *data) override;
         bool onInput(const gui::InputEvent &inputEvent) override;
diff --git a/module-apps/application-phonebook/ApplicationPhonebook.cpp b/module-apps/application-phonebook/ApplicationPhonebook.cpp
index a58aab4d1..0c8321590 100644
--- a/module-apps/application-phonebook/ApplicationPhonebook.cpp
+++ b/module-apps/application-phonebook/ApplicationPhonebook.cpp
@@ -97,41 +97,42 @@ namespace app
 
     void ApplicationPhonebook::createUserInterface()
     {
-        windowsFactory.attach(gui::name::window::main_window, [](Application *app, const std::string &name) {
+        windowsFactory.attach(gui::name::window::main_window, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::PhonebookMainWindow>(app);
         });
-        windowsFactory.attach(gui::window::name::contact, [](Application *app, const std::string &name) {
+        windowsFactory.attach(gui::window::name::contact, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::PhonebookContactDetails>(app);
         });
-        windowsFactory.attach(gui::window::name::search, [](Application *app, const std::string &name) {
+        windowsFactory.attach(gui::window::name::search, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::PhonebookSearch>(app);
         });
-        windowsFactory.attach(gui::window::name::search_results, [](Application *app, const std::string &name) {
+        windowsFactory.attach(gui::window::name::search_results, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::PhonebookSearchResults>(app);
         });
-        windowsFactory.attach(gui::window::name::dialog, [](Application *app, const std::string &name) {
+        windowsFactory.attach(gui::window::name::dialog, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::Dialog>(app, name);
         });
-        windowsFactory.attach(gui::window::name::dialog_yes_no, [](Application *app, const std::string &name) {
+        windowsFactory.attach(gui::window::name::dialog_yes_no, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::DialogYesNo>(app, gui::window::name::dialog_yes_no);
         });
-        windowsFactory.attach(gui::window::name::dialog_yes_no_icon_txt, [](Application *app, const std::string &name) {
-            return std::make_unique<gui::DialogYesNoIconTxt>(app, name);
-        });
-        windowsFactory.attach(gui::window::name::dialog_confirm, [](Application *app, const std::string &name) {
+        windowsFactory.attach(gui::window::name::dialog_yes_no_icon_txt,
+                              [](ApplicationCommon *app, const std::string &name) {
+                                  return std::make_unique<gui::DialogYesNoIconTxt>(app, name);
+                              });
+        windowsFactory.attach(gui::window::name::dialog_confirm, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::DialogConfirm>(app, gui::window::name::dialog_confirm);
         });
-        windowsFactory.attach(gui::window::name::contact_options, [](Application *app, const std::string &name) {
+        windowsFactory.attach(gui::window::name::contact_options, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::PhonebookContactOptions>(app);
         });
-        windowsFactory.attach(gui::window::name::namecard_options, [](Application *app, const std::string &name) {
+        windowsFactory.attach(gui::window::name::namecard_options, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::PhonebookNamecardOptions>(app);
         });
-        windowsFactory.attach(gui::window::name::ice_contacts, [](Application *app, const std::string &name) {
+        windowsFactory.attach(gui::window::name::ice_contacts, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::PhonebookIceContacts>(app);
         });
 
-        windowsFactory.attach(gui::window::name::new_contact, [](Application *app, const std::string &name) {
+        windowsFactory.attach(gui::window::name::new_contact, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::PhonebookNewContact>(app);
         });
 
diff --git a/module-apps/application-phonebook/CMakeLists.txt b/module-apps/application-phonebook/CMakeLists.txt
index 6a498dbf4..8bb2aa1c0 100644
--- a/module-apps/application-phonebook/CMakeLists.txt
+++ b/module-apps/application-phonebook/CMakeLists.txt
@@ -63,6 +63,7 @@ target_compile_definitions(application-phonebook
 
 target_link_libraries(application-phonebook
     PRIVATE
+        app
         utf8
         module-gui
         module-utils
diff --git a/module-apps/application-phonebook/models/ContactDetailsModel.cpp b/module-apps/application-phonebook/models/ContactDetailsModel.cpp
index 009563afb..5e6ddf4f5 100644
--- a/module-apps/application-phonebook/models/ContactDetailsModel.cpp
+++ b/module-apps/application-phonebook/models/ContactDetailsModel.cpp
@@ -11,7 +11,7 @@
 #include <time/ScopedTime.hpp>
 #include <module-apps/application-phonebook/data/PhonebookInternals.hpp>
 
-ContactDetailsModel::ContactDetailsModel(app::Application *app) : application(app)
+ContactDetailsModel::ContactDetailsModel(app::ApplicationCommon *app) : application(app)
 {}
 
 void ContactDetailsModel::clearData()
diff --git a/module-apps/application-phonebook/models/ContactDetailsModel.hpp b/module-apps/application-phonebook/models/ContactDetailsModel.hpp
index 8ca2ad4e6..cf70a7e40 100644
--- a/module-apps/application-phonebook/models/ContactDetailsModel.hpp
+++ b/module-apps/application-phonebook/models/ContactDetailsModel.hpp
@@ -12,10 +12,10 @@
 
 class ContactDetailsModel : public app::InternalModel<gui::ContactListItem *>, public gui::ListItemProvider
 {
-    app::Application *application = nullptr;
+    app::ApplicationCommon *application = nullptr;
 
   public:
-    ContactDetailsModel(app::Application *app);
+    ContactDetailsModel(app::ApplicationCommon *app);
 
     void clearData();
     void loadData(std::shared_ptr<ContactRecord> contactRecord);
diff --git a/module-apps/application-phonebook/models/NewContactModel.cpp b/module-apps/application-phonebook/models/NewContactModel.cpp
index f43de0259..6b2bb91ad 100644
--- a/module-apps/application-phonebook/models/NewContactModel.cpp
+++ b/module-apps/application-phonebook/models/NewContactModel.cpp
@@ -12,7 +12,7 @@
 #include <time/ScopedTime.hpp>
 #include <BottomBar.hpp>
 
-NewContactModel::NewContactModel(app::Application *app) : application(app)
+NewContactModel::NewContactModel(app::ApplicationCommon *app) : application(app)
 {}
 
 auto NewContactModel::requestRecordsCount() -> unsigned int
diff --git a/module-apps/application-phonebook/models/NewContactModel.hpp b/module-apps/application-phonebook/models/NewContactModel.hpp
index 56a8961a9..2a8bcc58c 100644
--- a/module-apps/application-phonebook/models/NewContactModel.hpp
+++ b/module-apps/application-phonebook/models/NewContactModel.hpp
@@ -12,10 +12,10 @@
 
 class NewContactModel : public app::InternalModel<gui::ContactListItem *>, public gui::ListItemProvider
 {
-    app::Application *application = nullptr;
+    app::ApplicationCommon *application = nullptr;
 
   public:
-    NewContactModel(app::Application *app);
+    NewContactModel(app::ApplicationCommon *app);
 
     void clearData();
     void saveData(std::shared_ptr<ContactRecord> contactRecord);
diff --git a/module-apps/application-phonebook/models/PhonebookModel.cpp b/module-apps/application-phonebook/models/PhonebookModel.cpp
index 91a442032..0408f66d1 100644
--- a/module-apps/application-phonebook/models/PhonebookModel.cpp
+++ b/module-apps/application-phonebook/models/PhonebookModel.cpp
@@ -22,7 +22,7 @@
 
 const static std::uint32_t phonebookModelTimeout = 1000;
 
-PhonebookModel::PhonebookModel(app::Application *app,
+PhonebookModel::PhonebookModel(app::ApplicationCommon *app,
                                std::string filter,
                                std::uint32_t groupFilter,
                                std::uint32_t displayMode)
diff --git a/module-apps/application-phonebook/models/PhonebookModel.hpp b/module-apps/application-phonebook/models/PhonebookModel.hpp
index 2563a3371..10245087c 100644
--- a/module-apps/application-phonebook/models/PhonebookModel.hpp
+++ b/module-apps/application-phonebook/models/PhonebookModel.hpp
@@ -5,9 +5,9 @@
 
 #include <vector>
 
+#include <apps-common/ApplicationCommon.hpp>
 #include "application-phonebook/data/PhonebookStyle.hpp"
 #include "application-phonebook/widgets/PhonebookItem.hpp"
-#include "Application.hpp"
 #include "Common/Query.hpp"
 #include "DatabaseModel.hpp"
 #include "Interface/ContactRecord.hpp"
@@ -29,7 +29,7 @@ class PhonebookModel : public app::DatabaseModel<ContactRecord>,
 
   public:
     ContactsMapData letterMap;
-    PhonebookModel(app::Application *app,
+    PhonebookModel(app::ApplicationCommon *app,
                    std::string filter        = "",
                    std::uint32_t groupFilter = 0,
                    std::uint32_t displayMode = 0);
diff --git a/module-apps/application-phonebook/widgets/InformationWidget.cpp b/module-apps/application-phonebook/widgets/InformationWidget.cpp
index a276806db..589091ab2 100644
--- a/module-apps/application-phonebook/widgets/InformationWidget.cpp
+++ b/module-apps/application-phonebook/widgets/InformationWidget.cpp
@@ -13,7 +13,7 @@
 
 namespace gui
 {
-    InformationWidget::InformationWidget(app::Application *app)
+    InformationWidget::InformationWidget(app::ApplicationCommon *app)
     {
         setMargins(gui::Margins(style::widgets::leftMargin, style::margins::huge, 0, 0));
 
diff --git a/module-apps/application-phonebook/widgets/InformationWidget.hpp b/module-apps/application-phonebook/widgets/InformationWidget.hpp
index 8d69f0f19..e826b1d82 100644
--- a/module-apps/application-phonebook/widgets/InformationWidget.hpp
+++ b/module-apps/application-phonebook/widgets/InformationWidget.hpp
@@ -17,7 +17,7 @@ namespace gui
     class InformationWidget : public ContactListItem
     {
       public:
-        InformationWidget(app::Application *app);
+        InformationWidget(app::ApplicationCommon *app);
         ~InformationWidget() override = default;
         VBox *vBox                               = nullptr;
         Label *titleLabel                        = nullptr;
diff --git a/module-apps/application-phonebook/widgets/PhonebookListView.hpp b/module-apps/application-phonebook/widgets/PhonebookListView.hpp
index 34e6a7985..4553ee50f 100644
--- a/module-apps/application-phonebook/widgets/PhonebookListView.hpp
+++ b/module-apps/application-phonebook/widgets/PhonebookListView.hpp
@@ -4,7 +4,7 @@
 #pragma once
 
 #include "application-phonebook/widgets/PhonebookItem.hpp"
-#include "Application.hpp"
+#include <apps-common/ApplicationCommon.hpp>
 
 #include <ListView.hpp>
 
diff --git a/module-apps/application-phonebook/windows/PhonebookContactDetails.cpp b/module-apps/application-phonebook/windows/PhonebookContactDetails.cpp
index 9e316fdf4..399646ddb 100644
--- a/module-apps/application-phonebook/windows/PhonebookContactDetails.cpp
+++ b/module-apps/application-phonebook/windows/PhonebookContactDetails.cpp
@@ -10,7 +10,7 @@
 
 namespace gui
 {
-    PhonebookContactDetails::PhonebookContactDetails(app::Application *app)
+    PhonebookContactDetails::PhonebookContactDetails(app::ApplicationCommon *app)
         : AppWindow(app, gui::window::name::contact), contactDetailsModel{std::make_shared<ContactDetailsModel>(app)}
     {
         buildInterface();
diff --git a/module-apps/application-phonebook/windows/PhonebookContactDetails.hpp b/module-apps/application-phonebook/windows/PhonebookContactDetails.hpp
index 55bdcfa9c..41cd214e4 100644
--- a/module-apps/application-phonebook/windows/PhonebookContactDetails.hpp
+++ b/module-apps/application-phonebook/windows/PhonebookContactDetails.hpp
@@ -16,7 +16,7 @@ namespace gui
     class PhonebookContactDetails : public AppWindow
     {
       public:
-        PhonebookContactDetails(app::Application *app);
+        PhonebookContactDetails(app::ApplicationCommon *app);
         ~PhonebookContactDetails() override;
 
         auto onInput(const InputEvent &inputEvent) -> bool override;
diff --git a/module-apps/application-phonebook/windows/PhonebookContactOptions.cpp b/module-apps/application-phonebook/windows/PhonebookContactOptions.cpp
index d5c836cac..c7080bd05 100644
--- a/module-apps/application-phonebook/windows/PhonebookContactOptions.cpp
+++ b/module-apps/application-phonebook/windows/PhonebookContactOptions.cpp
@@ -14,7 +14,7 @@
 namespace gui
 {
 
-    PhonebookContactOptions::PhonebookContactOptions(app::Application *app)
+    PhonebookContactOptions::PhonebookContactOptions(app::ApplicationCommon *app)
         : OptionWindow(app, gui::window::name::contact_options)
     {}
 
diff --git a/module-apps/application-phonebook/windows/PhonebookContactOptions.hpp b/module-apps/application-phonebook/windows/PhonebookContactOptions.hpp
index 035f88357..f7c7c263a 100644
--- a/module-apps/application-phonebook/windows/PhonebookContactOptions.hpp
+++ b/module-apps/application-phonebook/windows/PhonebookContactOptions.hpp
@@ -12,7 +12,7 @@ namespace gui
     class PhonebookContactOptions : public OptionWindow
     {
       public:
-        PhonebookContactOptions(app::Application *app);
+        PhonebookContactOptions(app::ApplicationCommon *app);
         ~PhonebookContactOptions() override = default;
         auto handleSwitchData(SwitchData *data) -> bool override;
 
diff --git a/module-apps/application-phonebook/windows/PhonebookIceContacts.cpp b/module-apps/application-phonebook/windows/PhonebookIceContacts.cpp
index ad1d469e3..63d8fdd39 100644
--- a/module-apps/application-phonebook/windows/PhonebookIceContacts.cpp
+++ b/module-apps/application-phonebook/windows/PhonebookIceContacts.cpp
@@ -9,7 +9,7 @@
 
 namespace gui
 {
-    PhonebookIceContacts::PhonebookIceContacts(app::Application *app)
+    PhonebookIceContacts::PhonebookIceContacts(app::ApplicationCommon *app)
         : AppWindow(app, gui::window::name::ice_contacts), phonebookModel{std::make_shared<PhonebookModel>(
                                                                this->application, "", ContactsDB::iceGroupId())}
     {
diff --git a/module-apps/application-phonebook/windows/PhonebookIceContacts.hpp b/module-apps/application-phonebook/windows/PhonebookIceContacts.hpp
index 4c3ab19df..2018c74c9 100644
--- a/module-apps/application-phonebook/windows/PhonebookIceContacts.hpp
+++ b/module-apps/application-phonebook/windows/PhonebookIceContacts.hpp
@@ -15,7 +15,7 @@ namespace gui
     class PhonebookIceContacts : public AppWindow
     {
       public:
-        PhonebookIceContacts(app::Application *app);
+        PhonebookIceContacts(app::ApplicationCommon *app);
         virtual ~PhonebookIceContacts();
 
         bool onInput(const InputEvent &inputEvent) override;
diff --git a/module-apps/application-phonebook/windows/PhonebookMainWindow.cpp b/module-apps/application-phonebook/windows/PhonebookMainWindow.cpp
index be62b1163..601d846e9 100644
--- a/module-apps/application-phonebook/windows/PhonebookMainWindow.cpp
+++ b/module-apps/application-phonebook/windows/PhonebookMainWindow.cpp
@@ -16,7 +16,7 @@
 
 namespace gui
 {
-    PhonebookMainWindow::PhonebookMainWindow(app::Application *app)
+    PhonebookMainWindow::PhonebookMainWindow(app::ApplicationCommon *app)
         : AppWindow(app, gui::name::window::main_window), phonebookModel{
                                                               std::make_shared<PhonebookModel>(this->application)}
     {
diff --git a/module-apps/application-phonebook/windows/PhonebookMainWindow.hpp b/module-apps/application-phonebook/windows/PhonebookMainWindow.hpp
index 79c822783..36a14aed5 100644
--- a/module-apps/application-phonebook/windows/PhonebookMainWindow.hpp
+++ b/module-apps/application-phonebook/windows/PhonebookMainWindow.hpp
@@ -32,7 +32,7 @@ namespace gui
         void onListFilled();
 
       public:
-        PhonebookMainWindow(app::Application *app);
+        PhonebookMainWindow(app::ApplicationCommon *app);
         virtual ~PhonebookMainWindow();
 
         // virtual methods
diff --git a/module-apps/application-phonebook/windows/PhonebookNamecardOptions.cpp b/module-apps/application-phonebook/windows/PhonebookNamecardOptions.cpp
index 391841037..feaf09ffe 100644
--- a/module-apps/application-phonebook/windows/PhonebookNamecardOptions.cpp
+++ b/module-apps/application-phonebook/windows/PhonebookNamecardOptions.cpp
@@ -11,7 +11,7 @@
 namespace gui
 {
 
-    PhonebookNamecardOptions::PhonebookNamecardOptions(app::Application *app)
+    PhonebookNamecardOptions::PhonebookNamecardOptions(app::ApplicationCommon *app)
         : OptionWindow(app, gui::window::name::namecard_options)
     {
         addOptions(namecardOptionsList());
diff --git a/module-apps/application-phonebook/windows/PhonebookNamecardOptions.hpp b/module-apps/application-phonebook/windows/PhonebookNamecardOptions.hpp
index 477a4ac64..17dc3d3c3 100644
--- a/module-apps/application-phonebook/windows/PhonebookNamecardOptions.hpp
+++ b/module-apps/application-phonebook/windows/PhonebookNamecardOptions.hpp
@@ -12,7 +12,7 @@ namespace gui
     class PhonebookNamecardOptions : public OptionWindow
     {
       public:
-        PhonebookNamecardOptions(app::Application *app);
+        PhonebookNamecardOptions(app::ApplicationCommon *app);
         ~PhonebookNamecardOptions() override = default;
         auto onInput(const InputEvent &inputEvent) -> bool override;
         auto handleSwitchData(SwitchData *data) -> bool override;
diff --git a/module-apps/application-phonebook/windows/PhonebookNewContact.cpp b/module-apps/application-phonebook/windows/PhonebookNewContact.cpp
index a0ec5dc55..7d5b2b191 100644
--- a/module-apps/application-phonebook/windows/PhonebookNewContact.cpp
+++ b/module-apps/application-phonebook/windows/PhonebookNewContact.cpp
@@ -14,7 +14,7 @@
 namespace gui
 {
 
-    PhonebookNewContact::PhonebookNewContact(app::Application *app)
+    PhonebookNewContact::PhonebookNewContact(app::ApplicationCommon *app)
         : AppWindow(app, gui::window::name::new_contact), newContactModel{std::make_shared<NewContactModel>(app)}
     {
         buildInterface();
diff --git a/module-apps/application-phonebook/windows/PhonebookNewContact.hpp b/module-apps/application-phonebook/windows/PhonebookNewContact.hpp
index d5eeb5105..4c1086cc0 100644
--- a/module-apps/application-phonebook/windows/PhonebookNewContact.hpp
+++ b/module-apps/application-phonebook/windows/PhonebookNewContact.hpp
@@ -15,7 +15,7 @@ namespace gui
     class PhonebookNewContact : public AppWindow
     {
       public:
-        PhonebookNewContact(app::Application *app);
+        PhonebookNewContact(app::ApplicationCommon *app);
 
         auto onInput(const InputEvent &inputEvent) -> bool override;
         void onBeforeShow(ShowMode mode, SwitchData *data) override;
diff --git a/module-apps/application-phonebook/windows/PhonebookSearch.cpp b/module-apps/application-phonebook/windows/PhonebookSearch.cpp
index d168c7e1f..1c465ad38 100644
--- a/module-apps/application-phonebook/windows/PhonebookSearch.cpp
+++ b/module-apps/application-phonebook/windows/PhonebookSearch.cpp
@@ -8,7 +8,7 @@
 
 namespace gui
 {
-    PhonebookSearch::PhonebookSearch(app::Application *app) : AppWindow(app, gui::window::name::search)
+    PhonebookSearch::PhonebookSearch(app::ApplicationCommon *app) : AppWindow(app, gui::window::name::search)
     {
         buildInterface();
     }
diff --git a/module-apps/application-phonebook/windows/PhonebookSearch.hpp b/module-apps/application-phonebook/windows/PhonebookSearch.hpp
index 19e84a249..cdb137506 100644
--- a/module-apps/application-phonebook/windows/PhonebookSearch.hpp
+++ b/module-apps/application-phonebook/windows/PhonebookSearch.hpp
@@ -12,7 +12,7 @@ namespace gui
     class PhonebookSearch : public AppWindow
     {
       public:
-        explicit PhonebookSearch(app::Application *app);
+        explicit PhonebookSearch(app::ApplicationCommon *app);
 
       private:
         void buildInterface() override;
diff --git a/module-apps/application-phonebook/windows/PhonebookSearchResults.cpp b/module-apps/application-phonebook/windows/PhonebookSearchResults.cpp
index 0bf8887c7..64e86cb8a 100644
--- a/module-apps/application-phonebook/windows/PhonebookSearchResults.cpp
+++ b/module-apps/application-phonebook/windows/PhonebookSearchResults.cpp
@@ -11,7 +11,7 @@
 
 namespace gui
 {
-    PhonebookSearchResults::PhonebookSearchResults(app::Application *app)
+    PhonebookSearchResults::PhonebookSearchResults(app::ApplicationCommon *app)
         : AppWindow(app, gui::window::name::search_results)
     {
         buildInterface();
diff --git a/module-apps/application-phonebook/windows/PhonebookSearchResults.hpp b/module-apps/application-phonebook/windows/PhonebookSearchResults.hpp
index 5d3b24080..ceb21f262 100644
--- a/module-apps/application-phonebook/windows/PhonebookSearchResults.hpp
+++ b/module-apps/application-phonebook/windows/PhonebookSearchResults.hpp
@@ -13,7 +13,7 @@ namespace gui
     class PhonebookSearchResults : public AppWindow
     {
       public:
-        explicit PhonebookSearchResults(app::Application *app);
+        explicit PhonebookSearchResults(app::ApplicationCommon *app);
         ~PhonebookSearchResults() override;
 
       private:
diff --git a/module-apps/application-settings/ApplicationSettings.cpp b/module-apps/application-settings/ApplicationSettings.cpp
index b99bac4c9..24686754b 100644
--- a/module-apps/application-settings/ApplicationSettings.cpp
+++ b/module-apps/application-settings/ApplicationSettings.cpp
@@ -362,203 +362,210 @@ namespace app
 
     void ApplicationSettings::createUserInterface()
     {
-        windowsFactory.attach(gui::name::window::main_window, [](Application *app, const std::string &name) {
+        windowsFactory.attach(gui::name::window::main_window, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::OptionWindow>(
                 app, utils::translate("app_settings_title_main"), mainWindowOptionsNew(app));
         });
 
         // Advanced
-        windowsFactory.attach(gui::window::name::advanced, [](Application *app, const std::string &name) {
+        windowsFactory.attach(gui::window::name::advanced, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::OptionWindow>(
                 app, utils::translate("app_settings_advanced"), advancedOptions(app));
         });
-        windowsFactory.attach(gui::window::name::information, [](Application *app, const std::string &name) {
+        windowsFactory.attach(gui::window::name::information, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::InformationWindow>(app);
         });
-        windowsFactory.attach(gui::window::name::ui_test, [](Application *app, const std::string &name) {
+        windowsFactory.attach(gui::window::name::ui_test, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::UiTestWindow>(app);
         });
-        windowsFactory.attach(gui::window::name::eink_mode, [](Application *app, const std::string &name) {
+        windowsFactory.attach(gui::window::name::eink_mode, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::EinkModeWindow>(app);
         });
-        windowsFactory.attach(gui::window::name::color_test_window, [](Application *app, const std::string &name) {
-            return std::make_unique<gui::ColorTestWindow>(app);
-        });
-        windowsFactory.attach(gui::window::name::status_bar_img_type, [](Application *app, const std::string &name) {
-            return std::make_unique<gui::StatusBarImageTypeWindow>(app);
-        });
+        windowsFactory.attach(gui::window::name::color_test_window,
+                              [](ApplicationCommon *app, const std::string &name) {
+                                  return std::make_unique<gui::ColorTestWindow>(app);
+                              });
+        windowsFactory.attach(gui::window::name::status_bar_img_type,
+                              [](ApplicationCommon *app, const std::string &name) {
+                                  return std::make_unique<gui::StatusBarImageTypeWindow>(app);
+                              });
 
         // Bluetooth
-        windowsFactory.attach(gui::window::name::bluetooth, [](Application *app, const std::string &name) {
+        windowsFactory.attach(gui::window::name::bluetooth, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::BluetoothWindow>(app);
         });
-        windowsFactory.attach(gui::window::name::add_device, [this](Application *app, const std::string &name) {
+        windowsFactory.attach(gui::window::name::add_device, [this](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::AddDeviceWindow>(app, bluetoothSettingsModel);
         });
-        windowsFactory.attach(gui::window::name::all_devices, [this](Application *app, const std::string &name) {
+        windowsFactory.attach(gui::window::name::all_devices, [this](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::AllDevicesWindow>(app, bluetoothSettingsModel);
         });
-        windowsFactory.attach(gui::window::name::phone_name, [](Application *app, const std::string &name) {
+        windowsFactory.attach(gui::window::name::phone_name, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::PhoneNameWindow>(app);
         });
         windowsFactory.attach(gui::window::name::bluetooth_check_passkey,
-                              [](Application *app, const std::string &name) {
+                              [](ApplicationCommon *app, const std::string &name) {
                                   return std::make_unique<gui::BluetoothCheckPasskeyWindow>(app);
                               });
 
         // Network
-        windowsFactory.attach(gui::window::name::network, [](Application *app, const std::string &name) {
+        windowsFactory.attach(gui::window::name::network, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::NetworkWindow>(app, static_cast<ApplicationSettings *>(app));
         });
-        windowsFactory.attach(gui::window::name::sim_cards, [](Application *app, const std::string &name) {
+        windowsFactory.attach(gui::window::name::sim_cards, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::SimCardsWindow>(app, static_cast<ApplicationSettings *>(app));
         });
-        windowsFactory.attach(gui::window::name::sim_pin_settings, [](Application *app, const std::string &name) {
+        windowsFactory.attach(gui::window::name::sim_pin_settings, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::SimPINSettingsWindow>(app);
         });
-        windowsFactory.attach(gui::window::name::import_contacts, [&](Application *app, const std::string &name) {
+        windowsFactory.attach(gui::window::name::import_contacts, [&](ApplicationCommon *app, const std::string &name) {
             auto repository = std::make_unique<SimContactsRepository>(this);
             auto model      = std::make_unique<SimContactsImportModel>(this, std::move(repository));
             auto presenter  = std::make_unique<SimContactsImportWindowPresenter>(this, std::move(model));
             return std::make_unique<gui::SimContactsImportWindow>(app, std::move(presenter));
         });
 
-        windowsFactory.attach(gui::window::name::new_apn, [](Application *app, const std::string &name) {
+        windowsFactory.attach(gui::window::name::new_apn, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::NewApnWindow>(app);
         });
-        windowsFactory.attach(gui::window::name::apn_settings, [](Application *app, const std::string &name) {
+        windowsFactory.attach(gui::window::name::apn_settings, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::ApnSettingsWindow>(app);
         });
-        windowsFactory.attach(gui::window::name::apn_options, [](Application *app, const std::string &name) {
+        windowsFactory.attach(gui::window::name::apn_options, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::ApnOptionsWindow>(app);
         });
 
         // Display and keypad
-        windowsFactory.attach(gui::window::name::display_and_keypad, [](Application *app, const std::string &name) {
-            return std::make_unique<gui::DisplayAndKeypadWindow>(app);
-        });
-        windowsFactory.attach(gui::window::name::display_light, [](Application *app, const std::string &name) {
+        windowsFactory.attach(gui::window::name::display_and_keypad,
+                              [](ApplicationCommon *app, const std::string &name) {
+                                  return std::make_unique<gui::DisplayAndKeypadWindow>(app);
+                              });
+        windowsFactory.attach(gui::window::name::display_light, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::DisplayLightWindow>(app, static_cast<ApplicationSettings *>(app));
         });
-        windowsFactory.attach(gui::window::name::font_size, [](Application *app, const std::string &name) {
+        windowsFactory.attach(gui::window::name::font_size, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::FontSizeWindow>(app);
         });
-        windowsFactory.attach(gui::window::name::wallpaper, [](Application *app, const std::string &name) {
+        windowsFactory.attach(gui::window::name::wallpaper, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::WallpaperWindow>(app);
         });
-        windowsFactory.attach(gui::window::name::quotes, [](Application *app, const std::string &name) {
+        windowsFactory.attach(gui::window::name::quotes, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::QuotesMainWindow>(app);
         });
-        windowsFactory.attach(gui::window::name::new_quote, [](Application *app, const std::string &name) {
+        windowsFactory.attach(gui::window::name::new_quote, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::QuoteAddEditWindow>(app);
         });
-        windowsFactory.attach(gui::window::name::options_quote, [](Application *app, const std::string &name) {
+        windowsFactory.attach(gui::window::name::options_quote, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::QuotesOptionsWindow>(app);
         });
-        windowsFactory.attach(gui::window::name::edit_quotes, [](Application *app, const std::string &name) {
+        windowsFactory.attach(gui::window::name::edit_quotes, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::EditQuotesWindow>(app);
         });
-        windowsFactory.attach(gui::window::name::quote_categories, [](Application *app, const std::string &name) {
+        windowsFactory.attach(gui::window::name::quote_categories, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::QuoteCategoriesWindow>(app);
         });
-        windowsFactory.attach(gui::window::name::quotes_dialog_yes_no, [](Application *app, const std::string &name) {
-            return std::make_unique<gui::DialogYesNo>(app, name);
-        });
-        windowsFactory.attach(gui::window::name::keypad_light, [](Application *app, const std::string &name) {
+        windowsFactory.attach(gui::window::name::quotes_dialog_yes_no,
+                              [](ApplicationCommon *app, const std::string &name) {
+                                  return std::make_unique<gui::DialogYesNo>(app, name);
+                              });
+        windowsFactory.attach(gui::window::name::keypad_light, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::KeypadLightWindow>(app, static_cast<ApplicationSettings *>(app));
         });
-        windowsFactory.attach(gui::window::name::input_language, [](Application *app, const std::string &name) {
+        windowsFactory.attach(gui::window::name::input_language, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::InputLanguageWindow>(app);
         });
 
         // Phone modes
-        windowsFactory.attach(gui::window::name::phone_modes, [](Application *app, const std::string &name) {
+        windowsFactory.attach(gui::window::name::phone_modes, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::PhoneModesWindow>(app, static_cast<ApplicationSettings *>(app));
         });
-        windowsFactory.attach(gui::window::name::do_not_disturb, [](Application *app, const std::string &name) {
+        windowsFactory.attach(gui::window::name::do_not_disturb, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::DoNotDisturbWindow>(app, static_cast<ApplicationSettings *>(app));
         });
-        windowsFactory.attach(gui::window::name::offline, [](Application *app, const std::string &name) {
+        windowsFactory.attach(gui::window::name::offline, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::OfflineWindow>(app, static_cast<ApplicationSettings *>(app));
         });
-        windowsFactory.attach(gui::window::name::connection_frequency, [](Application *app, const std::string &name) {
-            return std::make_unique<gui::ConnectionFrequencyWindow>(app, static_cast<ApplicationSettings *>(app));
-        });
+        windowsFactory.attach(
+            gui::window::name::connection_frequency, [](ApplicationCommon *app, const std::string &name) {
+                return std::make_unique<gui::ConnectionFrequencyWindow>(app, static_cast<ApplicationSettings *>(app));
+            });
 
         // Apps
-        windowsFactory.attach(gui::window::name::apps, [](Application *app, const std::string &name) {
+        windowsFactory.attach(gui::window::name::apps, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::AppsWindow>(app);
         });
-        windowsFactory.attach(gui::window::name::phone, [](Application *app, const std::string &name) {
+        windowsFactory.attach(gui::window::name::phone, [](ApplicationCommon *app, const std::string &name) {
             auto audioModel =
                 std::make_unique<audio_settings::AudioSettingsModel>(app, audio_settings::PlaybackType::CallRingtone);
             return std::make_unique<gui::PhoneWindow>(app, std::move(audioModel));
         });
-        windowsFactory.attach(gui::window::name::messages, [](Application *app, const std::string &name) {
+        windowsFactory.attach(gui::window::name::messages, [](ApplicationCommon *app, const std::string &name) {
             auto audioModel = std::make_unique<audio_settings::AudioSettingsModel>(
                 app, audio_settings::PlaybackType::TextMessageRingtone);
             return std::make_unique<gui::MessagesWindow>(app, std::move(audioModel));
         });
-        windowsFactory.attach(gui::window::name::alarm_clock, [](Application *app, const std::string &name) {
+        windowsFactory.attach(gui::window::name::alarm_clock, [](ApplicationCommon *app, const std::string &name) {
             auto audioModel =
                 std::make_unique<audio_settings::AudioSettingsModel>(app, audio_settings::PlaybackType::Alarm);
             return std::make_unique<gui::AlarmClockWindow>(app, std::move(audioModel));
         });
-        windowsFactory.attach(gui::window::name::sound_select, [this](Application *app, const std::string &name) {
+        windowsFactory.attach(gui::window::name::sound_select, [this](ApplicationCommon *app, const std::string &name) {
             auto model = std::make_shared<SoundsModel>(soundsPlayer);
             return std::make_unique<gui::SoundSelectWindow>(app, name, std::move(model));
         });
 
         // Security
-        windowsFactory.attach(gui::window::name::security, [](Application *app, const std::string &name) {
+        windowsFactory.attach(gui::window::name::security, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::SecurityMainWindow>(app);
         });
-        windowsFactory.attach(gui::window::name::autolock, [](Application *app, const std::string &name) {
+        windowsFactory.attach(gui::window::name::autolock, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::AutolockWindow>(app, static_cast<ApplicationSettings *>(app));
         });
 
         // System
-        windowsFactory.attach(gui::window::name::system, [](Application *app, const std::string &name) {
+        windowsFactory.attach(gui::window::name::system, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::SystemMainWindow>(app);
         });
-        windowsFactory.attach(gui::window::name::languages, [](Application *app, const std::string &name) {
+        windowsFactory.attach(gui::window::name::languages, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::LanguagesWindow>(app);
         });
-        windowsFactory.attach(gui::window::name::date_and_time, [](Application *app, const std::string &name) {
+        windowsFactory.attach(gui::window::name::date_and_time, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::DateAndTimeMainWindow>(app, gui::window::name::date_and_time);
         });
-        windowsFactory.attach(gui::window::name::change_time_zone, [](Application *app, const std::string &name) {
+        windowsFactory.attach(gui::window::name::change_time_zone, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::ChangeTimeZone>(app);
         });
-        windowsFactory.attach(gui::window::name::change_date_and_time, [](Application *app, const std::string &name) {
-            return std::make_unique<gui::ChangeDateAndTimeWindow>(app);
-        });
-        windowsFactory.attach(gui::window::name::technical_information, [&](Application *app, const std::string &name) {
-            auto factoryData = std::make_unique<FactoryData>(*settings);
-            auto repository  = std::make_unique<TechnicalInformationRepository>(this);
-            auto model     = std::make_unique<TechnicalInformationModel>(std::move(factoryData), std::move(repository));
-            auto presenter = std::make_unique<TechnicalWindowPresenter>(this, std::move(model));
-            return std::make_unique<gui::TechnicalInformationWindow>(app, std::move(presenter));
-        });
-        windowsFactory.attach(gui::window::name::certification, [](Application *app, const std::string &name) {
+        windowsFactory.attach(gui::window::name::change_date_and_time,
+                              [](ApplicationCommon *app, const std::string &name) {
+                                  return std::make_unique<gui::ChangeDateAndTimeWindow>(app);
+                              });
+        windowsFactory.attach(
+            gui::window::name::technical_information, [&](ApplicationCommon *app, const std::string &name) {
+                auto factoryData = std::make_unique<FactoryData>(*settings);
+                auto repository  = std::make_unique<TechnicalInformationRepository>(this);
+                auto model = std::make_unique<TechnicalInformationModel>(std::move(factoryData), std::move(repository));
+                auto presenter = std::make_unique<TechnicalWindowPresenter>(this, std::move(model));
+                return std::make_unique<gui::TechnicalInformationWindow>(app, std::move(presenter));
+            });
+        windowsFactory.attach(gui::window::name::certification, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::CertificationWindow>(app);
         });
-        windowsFactory.attach(gui::window::name::sar, [&](Application *app, const std::string &name) {
+        windowsFactory.attach(gui::window::name::sar, [&](ApplicationCommon *app, const std::string &name) {
             auto sarInfoRepository = std::make_unique<SARInfoRepository>("assets/certification_info", "sar.txt");
             auto presenter         = std::make_unique<SARInfoWindowPresenter>(std::move(sarInfoRepository));
             return std::make_unique<gui::SARInfoWindow>(app, std::move(presenter));
         });
-        windowsFactory.attach(gui::window::name::factory_reset, [](Application *app, const std::string &name) {
+        windowsFactory.attach(gui::window::name::factory_reset, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::DialogYesNo>(app, name);
         });
 
-        windowsFactory.attach(gui::window::name::dialog_settings, [](Application *app, const std::string &name) {
+        windowsFactory.attach(gui::window::name::dialog_settings, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::Dialog>(app, name);
         });
-        windowsFactory.attach(gui::window::name::dialog_confirm, [](Application *app, const std::string &name) {
+        windowsFactory.attach(gui::window::name::dialog_confirm, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::DialogConfirm>(app, gui::window::name::dialog_confirm);
         });
-        windowsFactory.attach(gui::window::name::dialog_retry, [](Application *app, const std::string &name) {
+        windowsFactory.attach(gui::window::name::dialog_retry, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::DialogRetry>(app, name);
         });
 
diff --git a/module-apps/application-settings/CMakeLists.txt b/module-apps/application-settings/CMakeLists.txt
index 0969bcccc..82022092f 100644
--- a/module-apps/application-settings/CMakeLists.txt
+++ b/module-apps/application-settings/CMakeLists.txt
@@ -139,7 +139,6 @@ target_sources(application-settings
 
 target_link_libraries(application-settings
     PRIVATE
-        apps-common
         eventstore
         module-bluetooth
         module-bsp
@@ -154,6 +153,8 @@ target_link_libraries(application-settings
         service-desktop
         service-evtmgr
         service-time
+    PUBLIC
+        app
 )
 
 add_dependencies(application-settings version)
diff --git a/module-apps/application-settings/include/application-settings/ApplicationSettings.hpp b/module-apps/application-settings/include/application-settings/ApplicationSettings.hpp
index 641618ff3..589bce4e0 100644
--- a/module-apps/application-settings/include/application-settings/ApplicationSettings.hpp
+++ b/module-apps/application-settings/include/application-settings/ApplicationSettings.hpp
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "Application.hpp"
+#include <Application.hpp>
 
 #include <application-settings/windows/WindowNames.hpp>
 #include <application-settings/models/apps/SoundsPlayer.hpp>
diff --git a/module-apps/application-settings/models/advanced/ColorTestModel.cpp b/module-apps/application-settings/models/advanced/ColorTestModel.cpp
index 9ed611d39..6ba5af646 100644
--- a/module-apps/application-settings/models/advanced/ColorTestModel.cpp
+++ b/module-apps/application-settings/models/advanced/ColorTestModel.cpp
@@ -8,7 +8,7 @@
 namespace gui
 {
 
-    ColorTestModel::ColorTestModel(app::Application *app) : application{app}
+    ColorTestModel::ColorTestModel(app::ApplicationCommon *app) : application{app}
     {
         createData();
     }
diff --git a/module-apps/application-settings/models/advanced/ColorTestModel.hpp b/module-apps/application-settings/models/advanced/ColorTestModel.hpp
index 968b08c1c..21d93b8ad 100644
--- a/module-apps/application-settings/models/advanced/ColorTestModel.hpp
+++ b/module-apps/application-settings/models/advanced/ColorTestModel.hpp
@@ -13,10 +13,10 @@ namespace gui
     class ColorTestModel : public app::InternalModel<gui::ColorTestListItem *>, public gui::ListItemProvider
     {
       private:
-        app::Application *application = nullptr;
+        app::ApplicationCommon *application = nullptr;
 
       public:
-        explicit ColorTestModel(app::Application *app);
+        explicit ColorTestModel(app::ApplicationCommon *app);
 
         [[nodiscard]] auto requestRecordsCount() -> unsigned int override;
         [[nodiscard]] auto getMinimalItemSpaceRequired() const -> unsigned int override;
diff --git a/module-apps/application-settings/models/apps/AbstractSoundsModel.hpp b/module-apps/application-settings/models/apps/AbstractSoundsModel.hpp
index 59d6504e1..d2f1a7751 100644
--- a/module-apps/application-settings/models/apps/AbstractSoundsModel.hpp
+++ b/module-apps/application-settings/models/apps/AbstractSoundsModel.hpp
@@ -9,7 +9,7 @@
 
 namespace app
 {
-    class Application;
+    class ApplicationCommon;
 };
 
 /// @brief Abstract SoundsModel class
@@ -21,7 +21,7 @@ class AbstractSoundsModel : public gui::ListItemProvider
     /// Creates data for model
     /// @param app pointer to current application
     /// @param model audio settings model
-    virtual void createData(app::Application *app, audio_settings::AbstractAudioSettingsModel *model) = 0;
+    virtual void createData(app::ApplicationCommon *app, audio_settings::AbstractAudioSettingsModel *model) = 0;
 
     /// Clears all data for model
     virtual void clearData() = 0;
diff --git a/module-apps/application-settings/models/apps/AudioSettingsModel.cpp b/module-apps/application-settings/models/apps/AudioSettingsModel.cpp
index 155ef313b..e81eaa7a5 100644
--- a/module-apps/application-settings/models/apps/AudioSettingsModel.cpp
+++ b/module-apps/application-settings/models/apps/AudioSettingsModel.cpp
@@ -25,7 +25,7 @@ namespace audio_settings
         return audio::PlaybackType::None;
     }
 
-    AudioSettingsModel::AudioSettingsModel(app::Application *application, PlaybackType playbackType)
+    AudioSettingsModel::AudioSettingsModel(app::ApplicationCommon *application, PlaybackType playbackType)
         : application(application), playbackType(playbackTypeToAudioPlaybackType(playbackType))
     {}
 
diff --git a/module-apps/application-settings/models/apps/AudioSettingsModel.hpp b/module-apps/application-settings/models/apps/AudioSettingsModel.hpp
index 0a066c5c2..823a64a0b 100644
--- a/module-apps/application-settings/models/apps/AudioSettingsModel.hpp
+++ b/module-apps/application-settings/models/apps/AudioSettingsModel.hpp
@@ -47,7 +47,7 @@ namespace audio_settings
       public:
         /// @param application application pointer
         /// @param playbackType playback type
-        AudioSettingsModel(app::Application *application, PlaybackType playbackType);
+        AudioSettingsModel(app::ApplicationCommon *application, PlaybackType playbackType);
 
         bool isVibrationEnabled() override;
         void setVibrationEnabled() override;
@@ -62,7 +62,7 @@ namespace audio_settings
         audio::PlaybackType getPlaybackType() override;
 
       private:
-        app::Application *application = nullptr;
+        app::ApplicationCommon *application = nullptr;
         audio::PlaybackType playbackType;
     };
 } // namespace audio_settings
diff --git a/module-apps/application-settings/models/apps/SoundsModel.cpp b/module-apps/application-settings/models/apps/SoundsModel.cpp
index a1628fb02..d233b9a36 100644
--- a/module-apps/application-settings/models/apps/SoundsModel.cpp
+++ b/module-apps/application-settings/models/apps/SoundsModel.cpp
@@ -35,7 +35,7 @@ gui::ListItem *SoundsModel::getItem(gui::Order order)
     return getRecord(order);
 }
 
-void SoundsModel::createData(app::Application *app, audio_settings::AbstractAudioSettingsModel *model)
+void SoundsModel::createData(app::ApplicationCommon *app, audio_settings::AbstractAudioSettingsModel *model)
 {
     assert(model);
     assert(app);
@@ -90,7 +90,7 @@ std::filesystem::path SoundsModel::getSoundPath(audio_settings::AbstractAudioSet
 }
 
 void SoundsModel::applyItems(const std::vector<std::filesystem::path> &sounds,
-                             app::Application *app,
+                             app::ApplicationCommon *app,
                              audio_settings::AbstractAudioSettingsModel *model)
 {
     auto currentItemIndex  = 0;
diff --git a/module-apps/application-settings/models/apps/SoundsModel.hpp b/module-apps/application-settings/models/apps/SoundsModel.hpp
index c53ddfa8d..c45e296e1 100644
--- a/module-apps/application-settings/models/apps/SoundsModel.hpp
+++ b/module-apps/application-settings/models/apps/SoundsModel.hpp
@@ -20,7 +20,7 @@ class SoundsModel : public app::InternalModel<gui::ListItem *>, public AbstractS
     /// Creates data for model
     /// @param app pointer to current application
     /// @param model audio settings model
-    void createData(app::Application *app, audio_settings::AbstractAudioSettingsModel *model) override;
+    void createData(app::ApplicationCommon *app, audio_settings::AbstractAudioSettingsModel *model) override;
 
     void clearData() override;
 
@@ -43,7 +43,7 @@ class SoundsModel : public app::InternalModel<gui::ListItem *>, public AbstractS
     /// @param app pointer to current application
     /// @param model audio settings model
     void applyItems(const std::vector<std::filesystem::path> &sounds,
-                    app::Application *app,
+                    app::ApplicationCommon *app,
                     audio_settings::AbstractAudioSettingsModel *model);
 
     std::shared_ptr<AbstractSoundsPlayer> soundsPlayer;
diff --git a/module-apps/application-settings/models/apps/SoundsPlayer.cpp b/module-apps/application-settings/models/apps/SoundsPlayer.cpp
index 198499018..594bb52c6 100644
--- a/module-apps/application-settings/models/apps/SoundsPlayer.cpp
+++ b/module-apps/application-settings/models/apps/SoundsPlayer.cpp
@@ -3,7 +3,8 @@
 
 #include "SoundsPlayer.hpp"
 
-SoundsPlayer::SoundsPlayer(app::Application *app) : audioOperations{std::make_unique<app::AsyncAudioOperations>(app)}
+SoundsPlayer::SoundsPlayer(app::ApplicationCommon *app)
+    : audioOperations{std::make_unique<app::AsyncAudioOperations>(app)}
 {}
 
 bool SoundsPlayer::play(const std::string &path)
diff --git a/module-apps/application-settings/models/apps/SoundsPlayer.hpp b/module-apps/application-settings/models/apps/SoundsPlayer.hpp
index e1e76a803..aaac9cd15 100644
--- a/module-apps/application-settings/models/apps/SoundsPlayer.hpp
+++ b/module-apps/application-settings/models/apps/SoundsPlayer.hpp
@@ -8,7 +8,7 @@
 class SoundsPlayer : public AbstractSoundsPlayer
 {
   public:
-    explicit SoundsPlayer(app::Application *app);
+    explicit SoundsPlayer(app::ApplicationCommon *app);
 
     bool play(const std::string &path) override;
     bool pause() override;
diff --git a/module-apps/application-settings/models/display-keypad/CategoriesModel.cpp b/module-apps/application-settings/models/display-keypad/CategoriesModel.cpp
index e18c198fa..cacf9b92c 100644
--- a/module-apps/application-settings/models/display-keypad/CategoriesModel.cpp
+++ b/module-apps/application-settings/models/display-keypad/CategoriesModel.cpp
@@ -14,7 +14,7 @@ namespace style::quotes::list
 
 namespace Quotes
 {
-    CategoriesModel::CategoriesModel(app::Application *application)
+    CategoriesModel::CategoriesModel(app::ApplicationCommon *application)
         : DatabaseModel(application), app::AsyncCallbackReceiver{application}, app(application)
     {}
 
diff --git a/module-apps/application-settings/models/display-keypad/CategoriesModel.hpp b/module-apps/application-settings/models/display-keypad/CategoriesModel.hpp
index 3a6d8eda7..9bf1817f5 100644
--- a/module-apps/application-settings/models/display-keypad/CategoriesModel.hpp
+++ b/module-apps/application-settings/models/display-keypad/CategoriesModel.hpp
@@ -13,7 +13,7 @@ namespace Quotes
                             public app::AsyncCallbackReceiver
     {
       public:
-        explicit CategoriesModel(app::Application *app);
+        explicit CategoriesModel(app::ApplicationCommon *app);
         [[nodiscard]] auto requestRecordsCount() -> unsigned int final;
         [[nodiscard]] auto getMinimalItemSpaceRequired() const -> unsigned int final;
         auto getItem(gui::Order order) -> gui::ListItem * final;
@@ -21,7 +21,7 @@ namespace Quotes
         bool updateRecords(std::vector<CategoryRecord> records);
 
       private:
-        app::Application *app = nullptr;
+        app::ApplicationCommon *app = nullptr;
 
         auto handleQueryResponse(db::QueryResult *queryResult) -> bool;
     };
diff --git a/module-apps/application-settings/models/display-keypad/QuotesModel.cpp b/module-apps/application-settings/models/display-keypad/QuotesModel.cpp
index 08b6e62fd..5c5f9e76b 100644
--- a/module-apps/application-settings/models/display-keypad/QuotesModel.cpp
+++ b/module-apps/application-settings/models/display-keypad/QuotesModel.cpp
@@ -16,7 +16,7 @@ namespace style::quotes::list
 
 namespace Quotes
 {
-    QuotesModel::QuotesModel(app::Application *application)
+    QuotesModel::QuotesModel(app::ApplicationCommon *application)
         : DatabaseModel(application), app::AsyncCallbackReceiver{application}, app(application)
     {}
 
diff --git a/module-apps/application-settings/models/display-keypad/QuotesModel.hpp b/module-apps/application-settings/models/display-keypad/QuotesModel.hpp
index 07cf5e4a5..fbcdda3d3 100644
--- a/module-apps/application-settings/models/display-keypad/QuotesModel.hpp
+++ b/module-apps/application-settings/models/display-keypad/QuotesModel.hpp
@@ -18,7 +18,7 @@ namespace Quotes
                         public app::AsyncCallbackReceiver
     {
       public:
-        explicit QuotesModel(app::Application *application);
+        explicit QuotesModel(app::ApplicationCommon *application);
 
         [[nodiscard]] auto requestRecordsCount() -> unsigned int final;
         [[nodiscard]] auto getMinimalItemSpaceRequired() const -> unsigned int final;
@@ -34,7 +34,7 @@ namespace Quotes
         auto handleQueryResponse(db::QueryResult *queryResult) -> bool;
 
       private:
-        app::Application *app = nullptr;
+        app::ApplicationCommon *app = nullptr;
     };
 
 } // namespace Quotes
diff --git a/module-apps/application-settings/models/network/ApnSettingsModel.cpp b/module-apps/application-settings/models/network/ApnSettingsModel.cpp
index 55410d5e6..1a4956cde 100644
--- a/module-apps/application-settings/models/network/ApnSettingsModel.cpp
+++ b/module-apps/application-settings/models/network/ApnSettingsModel.cpp
@@ -6,7 +6,7 @@
 #include <service-cellular/PacketDataCellularMessage.hpp>
 #include <service-cellular/ServiceCellular.hpp>
 
-ApnSettingsModel::ApnSettingsModel(app::Application *application) : application{application}
+ApnSettingsModel::ApnSettingsModel(app::ApplicationCommon *application) : application{application}
 {}
 
 void ApnSettingsModel::requestAPNList()
diff --git a/module-apps/application-settings/models/network/ApnSettingsModel.hpp b/module-apps/application-settings/models/network/ApnSettingsModel.hpp
index 1a8ba76da..c84e9273a 100644
--- a/module-apps/application-settings/models/network/ApnSettingsModel.hpp
+++ b/module-apps/application-settings/models/network/ApnSettingsModel.hpp
@@ -3,14 +3,14 @@
 
 #pragma once
 
-#include <apps-common/Application.hpp>
+#include <apps-common/ApplicationCommon.hpp>
 #include <service-cellular/CellularServiceAPI.hpp>
 #include <service-cellular/PacketDataTypes.hpp>
 
 class ApnSettingsModel
 {
   public:
-    explicit ApnSettingsModel(app::Application *application);
+    explicit ApnSettingsModel(app::ApplicationCommon *application);
 
     void requestAPNList();
     void saveAPN(const std::shared_ptr<packet_data::APN::Config> &apn);
@@ -18,5 +18,5 @@ class ApnSettingsModel
     void setAsDefaultAPN(const std::shared_ptr<packet_data::APN::Config> &apn);
 
   private:
-    app::Application *application = nullptr;
+    app::ApplicationCommon *application = nullptr;
 };
diff --git a/module-apps/application-settings/models/network/NewApnModel.cpp b/module-apps/application-settings/models/network/NewApnModel.cpp
index f642cf6ca..fca21c751 100644
--- a/module-apps/application-settings/models/network/NewApnModel.cpp
+++ b/module-apps/application-settings/models/network/NewApnModel.cpp
@@ -9,7 +9,7 @@
 
 #include <ListView.hpp>
 
-NewApnModel::NewApnModel(app::Application *app) : application(app)
+NewApnModel::NewApnModel(app::ApplicationCommon *app) : application(app)
 {}
 
 auto NewApnModel::requestRecordsCount() -> unsigned int
diff --git a/module-apps/application-settings/models/network/NewApnModel.hpp b/module-apps/application-settings/models/network/NewApnModel.hpp
index 59a7bc82a..6aa0ba12c 100644
--- a/module-apps/application-settings/models/network/NewApnModel.hpp
+++ b/module-apps/application-settings/models/network/NewApnModel.hpp
@@ -10,10 +10,10 @@
 
 class NewApnModel : public app::InternalModel<gui::ApnListItem *>, public gui::ListItemProvider
 {
-    app::Application *application = nullptr;
+    app::ApplicationCommon *application = nullptr;
 
   public:
-    explicit NewApnModel(app::Application *app);
+    explicit NewApnModel(app::ApplicationCommon *app);
 
     void clearData();
     void saveData(const std::shared_ptr<packet_data::APN::Config> &apnRecord);
diff --git a/module-apps/application-settings/models/network/SimContactsImportModel.cpp b/module-apps/application-settings/models/network/SimContactsImportModel.cpp
index db8c7c821..f6d2d7a98 100644
--- a/module-apps/application-settings/models/network/SimContactsImportModel.cpp
+++ b/module-apps/application-settings/models/network/SimContactsImportModel.cpp
@@ -6,7 +6,7 @@
 #include <application-settings/widgets/network/SimContactImportSelectWidget.hpp>
 #include <ListView.hpp>
 
-SimContactsImportModel::SimContactsImportModel(app::Application *app,
+SimContactsImportModel::SimContactsImportModel(app::ApplicationCommon *app,
                                                std::unique_ptr<AbstractSimContactsRepository> contactsRepository)
     : application(app), contactsRepository(std::move(contactsRepository))
 {}
diff --git a/module-apps/application-settings/models/network/SimContactsImportModel.hpp b/module-apps/application-settings/models/network/SimContactsImportModel.hpp
index 0986c82b3..1ba68df5e 100644
--- a/module-apps/application-settings/models/network/SimContactsImportModel.hpp
+++ b/module-apps/application-settings/models/network/SimContactsImportModel.hpp
@@ -15,12 +15,13 @@ class SimContactsImportModel : public app::InternalModel<gui::SimContactImportSe
                                public gui::ListItemProvider
 {
   private:
-    app::Application *application = nullptr;
+    app::ApplicationCommon *application = nullptr;
     std::shared_ptr<AbstractSimContactsRepository> contactsRepository;
     std::vector<bool> getSelectedContacts();
 
   public:
-    SimContactsImportModel(app::Application *app, std::unique_ptr<AbstractSimContactsRepository> contactsRepository);
+    SimContactsImportModel(app::ApplicationCommon *app,
+                           std::unique_ptr<AbstractSimContactsRepository> contactsRepository);
 
     void createSimImported();
     void createDuplicates();
diff --git a/module-apps/application-settings/models/network/SimContactsRepository.cpp b/module-apps/application-settings/models/network/SimContactsRepository.cpp
index 0febd19a8..b10522186 100644
--- a/module-apps/application-settings/models/network/SimContactsRepository.cpp
+++ b/module-apps/application-settings/models/network/SimContactsRepository.cpp
@@ -9,7 +9,7 @@
 
 #include <application-settings/ApplicationSettings.hpp>
 
-SimContactsRepository::SimContactsRepository(app::Application *application)
+SimContactsRepository::SimContactsRepository(app::ApplicationCommon *application)
     : app::AsyncCallbackReceiver{application}, application{application}
 {}
 
diff --git a/module-apps/application-settings/models/network/SimContactsRepository.hpp b/module-apps/application-settings/models/network/SimContactsRepository.hpp
index 5706aa4ba..e2ce413cc 100644
--- a/module-apps/application-settings/models/network/SimContactsRepository.hpp
+++ b/module-apps/application-settings/models/network/SimContactsRepository.hpp
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <apps-common/Application.hpp>
+#include <apps-common/ApplicationCommon.hpp>
 #include <module-db/Interface/ContactRecord.hpp>
 #include <service-cellular/CellularMessage.hpp>
 
@@ -27,7 +27,7 @@ class AbstractSimContactsRepository
 class SimContactsRepository : public AbstractSimContactsRepository, public app::AsyncCallbackReceiver
 {
   public:
-    explicit SimContactsRepository(app::Application *application);
+    explicit SimContactsRepository(app::ApplicationCommon *application);
 
     const std::vector<ContactRecord> &getImportedRecords() override;
     const std::vector<ContactRecord> &getDuplicatedRecords() override;
@@ -41,7 +41,7 @@ class SimContactsRepository : public AbstractSimContactsRepository, public app::
     std::vector<ContactRecord> importedRecords;
     std::vector<ContactRecord> uniqueRecords;
     std::vector<ContactRecord> duplicatedRecords;
-    app::Application *application;
+    app::ApplicationCommon *application;
 
 #if DEBUG_SIM_IMPORT_DATA == 1
     void printRecordsData(const std::string &name, const std::vector<ContactRecord> &data);
diff --git a/module-apps/application-settings/models/system/DateAndTimeModel.cpp b/module-apps/application-settings/models/system/DateAndTimeModel.cpp
index b54c1d974..8fc6aa9b2 100644
--- a/module-apps/application-settings/models/system/DateAndTimeModel.cpp
+++ b/module-apps/application-settings/models/system/DateAndTimeModel.cpp
@@ -9,7 +9,7 @@
 #include <ListView.hpp>
 #include <widgets/DateAndTimeStyle.hpp>
 
-DateAndTimeModel::DateAndTimeModel(app::Application *application) : app(application)
+DateAndTimeModel::DateAndTimeModel(app::ApplicationCommon *application) : app(application)
 {}
 
 void DateAndTimeModel::loadData(std::shared_ptr<utils::time::FromTillDate> fromTillDate)
diff --git a/module-apps/application-settings/models/system/DateAndTimeModel.hpp b/module-apps/application-settings/models/system/DateAndTimeModel.hpp
index f94d26405..2fbc4b67e 100644
--- a/module-apps/application-settings/models/system/DateAndTimeModel.hpp
+++ b/module-apps/application-settings/models/system/DateAndTimeModel.hpp
@@ -16,7 +16,7 @@ namespace gui
 class DateAndTimeModel : public app::InternalModel<gui::DateOrTimeListItem *>, public gui::ListItemProvider
 {
   public:
-    DateAndTimeModel(app::Application *application);
+    DateAndTimeModel(app::ApplicationCommon *application);
 
     void loadData(std::shared_ptr<utils::time::FromTillDate> fromTillDate);
     void saveData(std::shared_ptr<utils::time::FromTillDate> fromTillDate);
@@ -27,7 +27,7 @@ class DateAndTimeModel : public app::InternalModel<gui::DateOrTimeListItem *>, p
     [[nodiscard]] unsigned int requestRecordsCount() override;
 
   private:
-    app::Application *app           = nullptr;
+    app::ApplicationCommon *app     = nullptr;
     gui::SettingsDateItem *dateItem = nullptr;
     gui::SettingsTimeItem *timeItem = nullptr;
 
diff --git a/module-apps/application-settings/models/system/TechnicalInformationModel.hpp b/module-apps/application-settings/models/system/TechnicalInformationModel.hpp
index 70df5e412..86a09233b 100644
--- a/module-apps/application-settings/models/system/TechnicalInformationModel.hpp
+++ b/module-apps/application-settings/models/system/TechnicalInformationModel.hpp
@@ -13,7 +13,7 @@
 class TechnicalInformationModel : public app::InternalModel<gui::ListItem *>, public gui::ListItemProvider
 {
   private:
-    app::Application *application = nullptr;
+    app::ApplicationCommon *application = nullptr;
     std::unique_ptr<AbstractFactoryData> factoryData;
     std::shared_ptr<AbstractTechnicalInformationRepository> technicalInformationRepository = nullptr;
 
diff --git a/module-apps/application-settings/models/system/TechnicalInformationRepository.cpp b/module-apps/application-settings/models/system/TechnicalInformationRepository.cpp
index 140d0d29d..f03a15e14 100644
--- a/module-apps/application-settings/models/system/TechnicalInformationRepository.cpp
+++ b/module-apps/application-settings/models/system/TechnicalInformationRepository.cpp
@@ -5,7 +5,7 @@
 #include <service-cellular/ServiceCellular.hpp>
 #include <application-settings/ApplicationSettings.hpp>
 
-TechnicalInformationRepository::TechnicalInformationRepository(app::Application *application)
+TechnicalInformationRepository::TechnicalInformationRepository(app::ApplicationCommon *application)
     : app::AsyncCallbackReceiver{application}, application{application}
 {}
 
diff --git a/module-apps/application-settings/models/system/TechnicalInformationRepository.hpp b/module-apps/application-settings/models/system/TechnicalInformationRepository.hpp
index 159b35451..50a1abac8 100644
--- a/module-apps/application-settings/models/system/TechnicalInformationRepository.hpp
+++ b/module-apps/application-settings/models/system/TechnicalInformationRepository.hpp
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <apps-common/Application.hpp>
+#include <apps-common/ApplicationCommon.hpp>
 #include <service-cellular/CellularMessage.hpp>
 
 class AbstractTechnicalInformationRepository
@@ -18,11 +18,11 @@ class AbstractTechnicalInformationRepository
 class TechnicalInformationRepository : public AbstractTechnicalInformationRepository, public app::AsyncCallbackReceiver
 {
   public:
-    explicit TechnicalInformationRepository(app::Application *application);
+    explicit TechnicalInformationRepository(app::ApplicationCommon *application);
     void readImei(OnReadCallback callback) override;
     std::string getImei() override;
 
   private:
-    app::Application *application{};
+    app::ApplicationCommon *application{};
     std::string imeiStr;
 };
diff --git a/module-apps/application-settings/presenter/network/SimContactsImportWindowPresenter.cpp b/module-apps/application-settings/presenter/network/SimContactsImportWindowPresenter.cpp
index 2343358be..dd36ec52a 100644
--- a/module-apps/application-settings/presenter/network/SimContactsImportWindowPresenter.cpp
+++ b/module-apps/application-settings/presenter/network/SimContactsImportWindowPresenter.cpp
@@ -4,7 +4,7 @@
 #include "SimContactsImportWindowPresenter.hpp"
 
 SimContactsImportWindowPresenter::SimContactsImportWindowPresenter(
-    app::Application *application, std::shared_ptr<SimContactsImportModel> simContactsProvider)
+    app::ApplicationCommon *application, std::shared_ptr<SimContactsImportModel> simContactsProvider)
     : application(application), simContactsProvider{std::move(simContactsProvider)}
 {
     onSave = [&]() {
diff --git a/module-apps/application-settings/presenter/network/SimContactsImportWindowPresenter.hpp b/module-apps/application-settings/presenter/network/SimContactsImportWindowPresenter.hpp
index 5ab1f6484..9f5b33932 100644
--- a/module-apps/application-settings/presenter/network/SimContactsImportWindowPresenter.hpp
+++ b/module-apps/application-settings/presenter/network/SimContactsImportWindowPresenter.hpp
@@ -35,7 +35,7 @@ class SimContactsImportWindowContract
 class SimContactsImportWindowPresenter : public SimContactsImportWindowContract::Presenter
 {
   public:
-    explicit SimContactsImportWindowPresenter(app::Application *application,
+    explicit SimContactsImportWindowPresenter(app::ApplicationCommon *application,
                                               std::shared_ptr<SimContactsImportModel> simContactsProvider);
 
     std::shared_ptr<gui::ListItemProvider> getSimContactsProvider() const override;
@@ -46,7 +46,7 @@ class SimContactsImportWindowPresenter : public SimContactsImportWindowContract:
     bool isRequestCompleted() override;
 
   private:
-    app::Application *application               = nullptr;
+    app::ApplicationCommon *application         = nullptr;
     bool requestCompleted                       = true;
     bool duplicatesChecked                      = false;
     std::function<void()> onSave                = nullptr;
diff --git a/module-apps/application-settings/presenter/system/TechnicalWindowPresenter.cpp b/module-apps/application-settings/presenter/system/TechnicalWindowPresenter.cpp
index cd44b9124..31373b78f 100644
--- a/module-apps/application-settings/presenter/system/TechnicalWindowPresenter.cpp
+++ b/module-apps/application-settings/presenter/system/TechnicalWindowPresenter.cpp
@@ -4,7 +4,7 @@
 #include "TechnicalWindowPresenter.hpp"
 
 TechnicalWindowPresenter::TechnicalWindowPresenter(
-    app::Application *application, std::shared_ptr<TechnicalInformationModel> technicalInformationProvider)
+    app::ApplicationCommon *application, std::shared_ptr<TechnicalInformationModel> technicalInformationProvider)
     : application(application), technicalInformationProvider{std::move(technicalInformationProvider)}
 {
     onImeiReady = [&]() {
diff --git a/module-apps/application-settings/presenter/system/TechnicalWindowPresenter.hpp b/module-apps/application-settings/presenter/system/TechnicalWindowPresenter.hpp
index 4dd50d12a..6e7d5f3bb 100644
--- a/module-apps/application-settings/presenter/system/TechnicalWindowPresenter.hpp
+++ b/module-apps/application-settings/presenter/system/TechnicalWindowPresenter.hpp
@@ -30,14 +30,14 @@ class TechnicalWindowContract
 class TechnicalWindowPresenter : public TechnicalWindowContract::Presenter
 {
   public:
-    explicit TechnicalWindowPresenter(app::Application *application,
+    explicit TechnicalWindowPresenter(app::ApplicationCommon *application,
                                       std::shared_ptr<TechnicalInformationModel> technicalInformationProvider);
 
     std::shared_ptr<gui::ListItemProvider> getTechnicalInformationProvider() const override;
     void requestImei() override;
 
   private:
-    app::Application *application{};
+    app::ApplicationCommon *application{};
     std::shared_ptr<TechnicalInformationModel> technicalInformationProvider;
     std::function<void()> onImeiReady = nullptr;
 };
diff --git a/module-apps/application-settings/widgets/advanced/ColorTestListItem.cpp b/module-apps/application-settings/widgets/advanced/ColorTestListItem.cpp
index 33511f3f9..34450e3c7 100644
--- a/module-apps/application-settings/widgets/advanced/ColorTestListItem.cpp
+++ b/module-apps/application-settings/widgets/advanced/ColorTestListItem.cpp
@@ -7,7 +7,7 @@
 namespace gui
 {
 
-    ColorTestListItem::ColorTestListItem(app::Application *app, const Color color) : app{app}
+    ColorTestListItem::ColorTestListItem(app::ApplicationCommon *app, const Color color) : app{app}
     {
         setMinimumSize(style::listview::item_width_with_scroll, style::colorTest::item::color::height);
         setMargins(Margins(style::margins::very_big, 0, 0, 0));
diff --git a/module-apps/application-settings/widgets/advanced/ColorTestListItem.hpp b/module-apps/application-settings/widgets/advanced/ColorTestListItem.hpp
index f96a19329..3371a0d74 100644
--- a/module-apps/application-settings/widgets/advanced/ColorTestListItem.hpp
+++ b/module-apps/application-settings/widgets/advanced/ColorTestListItem.hpp
@@ -14,10 +14,10 @@ namespace gui
       private:
         VBox *vBox        = nullptr;
         Label *colorLabel = nullptr;
-        app::Application *app;
+        app::ApplicationCommon *app;
 
       public:
-        explicit ColorTestListItem(app::Application *app, const Color color);
+        explicit ColorTestListItem(app::ApplicationCommon *app, const Color color);
 
         bool onInput(const InputEvent &inputEvent) override;
         [[nodiscard]] uint8_t getColorIntensity();
diff --git a/module-apps/application-settings/widgets/advanced/ColorTestListView.cpp b/module-apps/application-settings/widgets/advanced/ColorTestListView.cpp
index 6b573b2c6..7c8483396 100644
--- a/module-apps/application-settings/widgets/advanced/ColorTestListView.cpp
+++ b/module-apps/application-settings/widgets/advanced/ColorTestListView.cpp
@@ -3,11 +3,12 @@
 
 #include "ColorTestListView.hpp"
 
+#include <ApplicationCommon.hpp>
 #include <InputEvent.hpp>
 
 namespace gui
 {
-    ColorTestListView::ColorTestListView(app::Application *application,
+    ColorTestListView::ColorTestListView(app::ApplicationCommon *application,
                                          Item *parent,
                                          uint32_t x,
                                          uint32_t y,
diff --git a/module-apps/application-settings/widgets/advanced/ColorTestListView.hpp b/module-apps/application-settings/widgets/advanced/ColorTestListView.hpp
index 6ce3478b8..3b17f7ef2 100644
--- a/module-apps/application-settings/widgets/advanced/ColorTestListView.hpp
+++ b/module-apps/application-settings/widgets/advanced/ColorTestListView.hpp
@@ -3,18 +3,22 @@
 
 #pragma once
 
-#include <Application.hpp>
 #include <ListView.hpp>
 
+namespace app
+{
+    class ApplicationCommon;
+}
+
 namespace gui
 {
     class ColorTestListView : public ListView
     {
       private:
-        app::Application *app;
+        app::ApplicationCommon *app;
 
       public:
-        ColorTestListView(app::Application *application,
+        ColorTestListView(app::ApplicationCommon *application,
                           Item *parent,
                           uint32_t x,
                           uint32_t y,
diff --git a/module-apps/application-settings/windows/BaseSettingsWindow.cpp b/module-apps/application-settings/windows/BaseSettingsWindow.cpp
index 8235f2ca6..8c87e5d97 100644
--- a/module-apps/application-settings/windows/BaseSettingsWindow.cpp
+++ b/module-apps/application-settings/windows/BaseSettingsWindow.cpp
@@ -5,7 +5,7 @@
 
 namespace gui
 {
-    BaseSettingsWindow::BaseSettingsWindow(app::Application *app, std::string name) : OptionWindow(app, name)
+    BaseSettingsWindow::BaseSettingsWindow(app::ApplicationCommon *app, std::string name) : OptionWindow(app, name)
     {}
 
     void BaseSettingsWindow::rebuild()
diff --git a/module-apps/application-settings/windows/BaseSettingsWindow.hpp b/module-apps/application-settings/windows/BaseSettingsWindow.hpp
index d1a02010b..010fc8a8f 100644
--- a/module-apps/application-settings/windows/BaseSettingsWindow.hpp
+++ b/module-apps/application-settings/windows/BaseSettingsWindow.hpp
@@ -11,7 +11,7 @@ namespace gui
     class BaseSettingsWindow : public OptionWindow
     {
       public:
-        BaseSettingsWindow(app::Application *app, std::string name);
+        BaseSettingsWindow(app::ApplicationCommon *app, std::string name);
 
         void rebuild() override;
 
diff --git a/module-apps/application-settings/windows/SettingsMainWindow.cpp b/module-apps/application-settings/windows/SettingsMainWindow.cpp
index 02be82ab9..0af37d695 100644
--- a/module-apps/application-settings/windows/SettingsMainWindow.cpp
+++ b/module-apps/application-settings/windows/SettingsMainWindow.cpp
@@ -7,7 +7,7 @@
 
 #include <service-appmgr/Controller.hpp>
 
-std::list<gui::Option> mainWindowOptionsNew(app::Application *app)
+std::list<gui::Option> mainWindowOptionsNew(app::ApplicationCommon *app)
 {
     std::list<gui::Option> l;
 
diff --git a/module-apps/application-settings/windows/SettingsMainWindow.hpp b/module-apps/application-settings/windows/SettingsMainWindow.hpp
index 54e8341df..d92d3ee1b 100644
--- a/module-apps/application-settings/windows/SettingsMainWindow.hpp
+++ b/module-apps/application-settings/windows/SettingsMainWindow.hpp
@@ -5,4 +5,4 @@
 
 #include <OptionWindow.hpp>
 
-std::list<gui::Option> mainWindowOptionsNew(app::Application *app);
+std::list<gui::Option> mainWindowOptionsNew(app::ApplicationCommon *app);
diff --git a/module-apps/application-settings/windows/advanced/AdvancedOptionsWindow.cpp b/module-apps/application-settings/windows/advanced/AdvancedOptionsWindow.cpp
index 3f95ed5cc..396ea5318 100644
--- a/module-apps/application-settings/windows/advanced/AdvancedOptionsWindow.cpp
+++ b/module-apps/application-settings/windows/advanced/AdvancedOptionsWindow.cpp
@@ -6,7 +6,7 @@
 #include <application-settings/windows/WindowNames.hpp>
 #include <status-bar/Style.hpp>
 
-std::list<gui::Option> advancedOptions(app::Application *app)
+std::list<gui::Option> advancedOptions(app::ApplicationCommon *app)
 {
     std::list<gui::Option> l;
 
diff --git a/module-apps/application-settings/windows/advanced/AdvancedOptionsWindow.hpp b/module-apps/application-settings/windows/advanced/AdvancedOptionsWindow.hpp
index 6c993139a..58d603331 100644
--- a/module-apps/application-settings/windows/advanced/AdvancedOptionsWindow.hpp
+++ b/module-apps/application-settings/windows/advanced/AdvancedOptionsWindow.hpp
@@ -5,4 +5,4 @@
 
 #include <OptionWindow.hpp>
 
-std::list<gui::Option> advancedOptions(app::Application *app);
+std::list<gui::Option> advancedOptions(app::ApplicationCommon *app);
diff --git a/module-apps/application-settings/windows/advanced/ColorTestWindow.cpp b/module-apps/application-settings/windows/advanced/ColorTestWindow.cpp
index c989151e2..a3cc8a84b 100644
--- a/module-apps/application-settings/windows/advanced/ColorTestWindow.cpp
+++ b/module-apps/application-settings/windows/advanced/ColorTestWindow.cpp
@@ -13,7 +13,7 @@ namespace gui
 {
     static gui::ColorScheme currentColorScheme = gui::Color::defaultColorScheme;
 
-    ColorTestWindow::ColorTestWindow(app::Application *app)
+    ColorTestWindow::ColorTestWindow(app::ApplicationCommon *app)
         : AppWindow{app, window::name::color_test_window}, colorTestModel{std::make_shared<ColorTestModel>(app)}
     {
         buildInterface();
diff --git a/module-apps/application-settings/windows/advanced/ColorTestWindow.hpp b/module-apps/application-settings/windows/advanced/ColorTestWindow.hpp
index 2afdfee6f..fd075b4e4 100644
--- a/module-apps/application-settings/windows/advanced/ColorTestWindow.hpp
+++ b/module-apps/application-settings/windows/advanced/ColorTestWindow.hpp
@@ -15,7 +15,7 @@ namespace gui
         gui::ColorTestListView *colorListView          = nullptr;
 
       public:
-        explicit ColorTestWindow(app::Application *app);
+        explicit ColorTestWindow(app::ApplicationCommon *app);
 
         void applyInputCallback();
         void buildInterface() override;
diff --git a/module-apps/application-settings/windows/advanced/EinkModeWindow.cpp b/module-apps/application-settings/windows/advanced/EinkModeWindow.cpp
index dc9747ca7..4da3a99d4 100644
--- a/module-apps/application-settings/windows/advanced/EinkModeWindow.cpp
+++ b/module-apps/application-settings/windows/advanced/EinkModeWindow.cpp
@@ -5,14 +5,14 @@
 
 #include <application-settings/windows/WindowNames.hpp>
 
-#include <apps-common/Application.hpp>
+#include <Application.hpp>
 #include <service-eink/Common.hpp>
 #include <service-eink/messages/EinkModeMessage.hpp>
 
 namespace gui
 {
 
-    EinkModeWindow::EinkModeWindow(app::Application *app) : AppWindow(app, window::name::eink_mode)
+    EinkModeWindow::EinkModeWindow(app::ApplicationCommon *app) : AppWindow(app, window::name::eink_mode)
     {
         AppWindow::buildInterface();
         bottomBar->setActive(BottomBar::Side::CENTER, true);
diff --git a/module-apps/application-settings/windows/advanced/EinkModeWindow.hpp b/module-apps/application-settings/windows/advanced/EinkModeWindow.hpp
index 29ee17e1a..ec31783af 100644
--- a/module-apps/application-settings/windows/advanced/EinkModeWindow.hpp
+++ b/module-apps/application-settings/windows/advanced/EinkModeWindow.hpp
@@ -9,6 +9,6 @@ namespace gui
     class EinkModeWindow : public AppWindow
     {
       public:
-        explicit EinkModeWindow(app::Application *app);
+        explicit EinkModeWindow(app::ApplicationCommon *app);
     };
 } /* namespace gui */
diff --git a/module-apps/application-settings/windows/advanced/InformationWindow.cpp b/module-apps/application-settings/windows/advanced/InformationWindow.cpp
index 082c954bc..30e77fdbe 100644
--- a/module-apps/application-settings/windows/advanced/InformationWindow.cpp
+++ b/module-apps/application-settings/windows/advanced/InformationWindow.cpp
@@ -11,7 +11,7 @@
 namespace gui
 {
 
-    InformationWindow::InformationWindow(app::Application *app) : AppWindow(app, gui::window::name::information)
+    InformationWindow::InformationWindow(app::ApplicationCommon *app) : AppWindow(app, gui::window::name::information)
     {
         buildInterface();
     }
diff --git a/module-apps/application-settings/windows/advanced/InformationWindow.hpp b/module-apps/application-settings/windows/advanced/InformationWindow.hpp
index 7ed392e7b..153424a43 100644
--- a/module-apps/application-settings/windows/advanced/InformationWindow.hpp
+++ b/module-apps/application-settings/windows/advanced/InformationWindow.hpp
@@ -13,7 +13,7 @@ namespace gui
         VBox *box = nullptr;
 
       public:
-        explicit InformationWindow(app::Application *app);
+        explicit InformationWindow(app::ApplicationCommon *app);
         void buildInterface() override;
 
       private:
diff --git a/module-apps/application-settings/windows/advanced/StatusBarImageTypeWindow.cpp b/module-apps/application-settings/windows/advanced/StatusBarImageTypeWindow.cpp
index cb172ac36..20a870c13 100644
--- a/module-apps/application-settings/windows/advanced/StatusBarImageTypeWindow.cpp
+++ b/module-apps/application-settings/windows/advanced/StatusBarImageTypeWindow.cpp
@@ -10,7 +10,7 @@
 
 namespace gui
 {
-    StatusBarImageTypeWindow::StatusBarImageTypeWindow(app::Application *app)
+    StatusBarImageTypeWindow::StatusBarImageTypeWindow(app::ApplicationCommon *app)
         : AppWindow(app, window::name::status_bar_img_type)
     {
         AppWindow::buildInterface();
diff --git a/module-apps/application-settings/windows/advanced/StatusBarImageTypeWindow.hpp b/module-apps/application-settings/windows/advanced/StatusBarImageTypeWindow.hpp
index 59047985a..f6ffee928 100644
--- a/module-apps/application-settings/windows/advanced/StatusBarImageTypeWindow.hpp
+++ b/module-apps/application-settings/windows/advanced/StatusBarImageTypeWindow.hpp
@@ -9,7 +9,7 @@ namespace gui
     class StatusBarImageTypeWindow : public AppWindow
     {
       public:
-        explicit StatusBarImageTypeWindow(app::Application *app);
+        explicit StatusBarImageTypeWindow(app::ApplicationCommon *app);
 
         status_bar::Configuration configureStatusBar(status_bar::Configuration appConfiguration) override;
     };
diff --git a/module-apps/application-settings/windows/advanced/UITestWindow.cpp b/module-apps/application-settings/windows/advanced/UITestWindow.cpp
index 3576168bd..5016d6cf0 100644
--- a/module-apps/application-settings/windows/advanced/UITestWindow.cpp
+++ b/module-apps/application-settings/windows/advanced/UITestWindow.cpp
@@ -11,7 +11,7 @@
 namespace gui
 {
 
-    UiTestWindow::UiTestWindow(app::Application *app) : AppWindow(app, "TEST_UI")
+    UiTestWindow::UiTestWindow(app::ApplicationCommon *app) : AppWindow(app, "TEST_UI")
     {
         AppWindow::buildInterface();
         buildInterface();
diff --git a/module-apps/application-settings/windows/advanced/UITestWindow.hpp b/module-apps/application-settings/windows/advanced/UITestWindow.hpp
index e39a5fddd..11f532d0e 100644
--- a/module-apps/application-settings/windows/advanced/UITestWindow.hpp
+++ b/module-apps/application-settings/windows/advanced/UITestWindow.hpp
@@ -14,6 +14,6 @@ namespace gui
         gui::Text *text = nullptr;
 
       public:
-        explicit UiTestWindow(app::Application *app);
+        explicit UiTestWindow(app::ApplicationCommon *app);
     };
 } // namespace gui
diff --git a/module-apps/application-settings/windows/apps/AlarmClockWindow.cpp b/module-apps/application-settings/windows/apps/AlarmClockWindow.cpp
index 7453df78e..27de0b091 100644
--- a/module-apps/application-settings/windows/apps/AlarmClockWindow.cpp
+++ b/module-apps/application-settings/windows/apps/AlarmClockWindow.cpp
@@ -8,7 +8,7 @@
 
 namespace gui
 {
-    AlarmClockWindow::AlarmClockWindow(app::Application *app,
+    AlarmClockWindow::AlarmClockWindow(app::ApplicationCommon *app,
                                        std::unique_ptr<audio_settings::AbstractAudioSettingsModel> &&audioModel)
         : BaseSettingsWindow(app, gui::window::name::alarm_clock), mWidgetMaker(this),
           mAudioModel(std::move(audioModel))
diff --git a/module-apps/application-settings/windows/apps/AlarmClockWindow.hpp b/module-apps/application-settings/windows/apps/AlarmClockWindow.hpp
index 82dd35677..9b67ca904 100644
--- a/module-apps/application-settings/windows/apps/AlarmClockWindow.hpp
+++ b/module-apps/application-settings/windows/apps/AlarmClockWindow.hpp
@@ -17,7 +17,7 @@ namespace gui
         ///  Constructor
         ///  @app parent application pointer
         /// @audioModel audio settings model
-        explicit AlarmClockWindow(app::Application *app,
+        explicit AlarmClockWindow(app::ApplicationCommon *app,
                                   std::unique_ptr<audio_settings::AbstractAudioSettingsModel> &&audioModel);
 
       private:
diff --git a/module-apps/application-settings/windows/apps/AppsWindow.cpp b/module-apps/application-settings/windows/apps/AppsWindow.cpp
index f784ba0eb..4981e4b8a 100644
--- a/module-apps/application-settings/windows/apps/AppsWindow.cpp
+++ b/module-apps/application-settings/windows/apps/AppsWindow.cpp
@@ -7,7 +7,7 @@
 
 namespace gui
 {
-    AppsWindow::AppsWindow(app::Application *app) : OptionWindow(app, gui::window::name::apps)
+    AppsWindow::AppsWindow(app::ApplicationCommon *app) : OptionWindow(app, gui::window::name::apps)
     {
         addOptions(appsAndToolsOptionsList());
         setTitle(utils::translate("app_settings_apps"));
diff --git a/module-apps/application-settings/windows/apps/AppsWindow.hpp b/module-apps/application-settings/windows/apps/AppsWindow.hpp
index e78ed20ca..2f6727433 100644
--- a/module-apps/application-settings/windows/apps/AppsWindow.hpp
+++ b/module-apps/application-settings/windows/apps/AppsWindow.hpp
@@ -10,7 +10,7 @@ namespace gui
     class AppsWindow : public OptionWindow
     {
       public:
-        explicit AppsWindow(app::Application *app);
+        explicit AppsWindow(app::ApplicationCommon *app);
 
       private:
         std::list<Option> appsAndToolsOptionsList();
diff --git a/module-apps/application-settings/windows/apps/MessagesWindow.cpp b/module-apps/application-settings/windows/apps/MessagesWindow.cpp
index 722a0438d..5849141b6 100644
--- a/module-apps/application-settings/windows/apps/MessagesWindow.cpp
+++ b/module-apps/application-settings/windows/apps/MessagesWindow.cpp
@@ -8,7 +8,7 @@
 
 namespace gui
 {
-    MessagesWindow::MessagesWindow(app::Application *app,
+    MessagesWindow::MessagesWindow(app::ApplicationCommon *app,
                                    std::unique_ptr<audio_settings::AbstractAudioSettingsModel> &&audioModel)
         : BaseSettingsWindow(app, gui::window::name::messages), mWidgetMaker(this), mAudioModel(std::move(audioModel))
     {
diff --git a/module-apps/application-settings/windows/apps/MessagesWindow.hpp b/module-apps/application-settings/windows/apps/MessagesWindow.hpp
index 4ff3466f8..731e99372 100644
--- a/module-apps/application-settings/windows/apps/MessagesWindow.hpp
+++ b/module-apps/application-settings/windows/apps/MessagesWindow.hpp
@@ -17,7 +17,7 @@ namespace gui
         ///  Constructor
         ///  @app parent application pointer
         ///  @audioModel audio settings model
-        explicit MessagesWindow(app::Application *app,
+        explicit MessagesWindow(app::ApplicationCommon *app,
                                 std::unique_ptr<audio_settings::AbstractAudioSettingsModel> &&audioModel);
 
       private:
diff --git a/module-apps/application-settings/windows/apps/PhoneWindow.cpp b/module-apps/application-settings/windows/apps/PhoneWindow.cpp
index b331b27e7..2cbd9e5ed 100644
--- a/module-apps/application-settings/windows/apps/PhoneWindow.cpp
+++ b/module-apps/application-settings/windows/apps/PhoneWindow.cpp
@@ -8,7 +8,7 @@
 
 namespace gui
 {
-    PhoneWindow::PhoneWindow(app::Application *app,
+    PhoneWindow::PhoneWindow(app::ApplicationCommon *app,
                              std::unique_ptr<audio_settings::AbstractAudioSettingsModel> &&audioModel)
         : BaseSettingsWindow(app, gui::window::name::phone), mWidgetMaker(this), mAudioModel(std::move(audioModel))
     {
diff --git a/module-apps/application-settings/windows/apps/PhoneWindow.hpp b/module-apps/application-settings/windows/apps/PhoneWindow.hpp
index d964f8c99..fe035c2c6 100644
--- a/module-apps/application-settings/windows/apps/PhoneWindow.hpp
+++ b/module-apps/application-settings/windows/apps/PhoneWindow.hpp
@@ -16,7 +16,7 @@ namespace gui
         ///  Constructor
         ///  @app parent application pointer
         ///  @audioModel audio settings model
-        explicit PhoneWindow(app::Application *app,
+        explicit PhoneWindow(app::ApplicationCommon *app,
                              std::unique_ptr<audio_settings::AbstractAudioSettingsModel> &&audioModel);
 
       private:
diff --git a/module-apps/application-settings/windows/apps/SoundSelectWindow.cpp b/module-apps/application-settings/windows/apps/SoundSelectWindow.cpp
index cb1855a65..c8f24da98 100644
--- a/module-apps/application-settings/windows/apps/SoundSelectWindow.cpp
+++ b/module-apps/application-settings/windows/apps/SoundSelectWindow.cpp
@@ -11,7 +11,7 @@
 
 namespace gui
 {
-    SoundSelectWindow::SoundSelectWindow(app::Application *app,
+    SoundSelectWindow::SoundSelectWindow(app::ApplicationCommon *app,
                                          std::string name,
                                          std::shared_ptr<AbstractSoundsModel> model)
         : AppWindow(app, name), mSoundsModel{std::move(model)}
diff --git a/module-apps/application-settings/windows/apps/SoundSelectWindow.hpp b/module-apps/application-settings/windows/apps/SoundSelectWindow.hpp
index b360e34fa..fc55cb4e4 100644
--- a/module-apps/application-settings/windows/apps/SoundSelectWindow.hpp
+++ b/module-apps/application-settings/windows/apps/SoundSelectWindow.hpp
@@ -18,7 +18,9 @@ namespace gui
         ///  Constructor
         ///  @param app pointer to application
         ///  @param name window name
-        explicit SoundSelectWindow(app::Application *app, std::string name, std::shared_ptr<AbstractSoundsModel> model);
+        explicit SoundSelectWindow(app::ApplicationCommon *app,
+                                   std::string name,
+                                   std::shared_ptr<AbstractSoundsModel> model);
 
         ///  Called before the window is shown
         ///  @param mode show mode
diff --git a/module-apps/application-settings/windows/bluetooth/AddDeviceWindow.cpp b/module-apps/application-settings/windows/bluetooth/AddDeviceWindow.cpp
index ddc08f914..974b6a780 100644
--- a/module-apps/application-settings/windows/bluetooth/AddDeviceWindow.cpp
+++ b/module-apps/application-settings/windows/bluetooth/AddDeviceWindow.cpp
@@ -12,7 +12,7 @@
 namespace gui
 {
 
-    AddDeviceWindow::AddDeviceWindow(app::Application *app,
+    AddDeviceWindow::AddDeviceWindow(app::ApplicationCommon *app,
                                      std::shared_ptr<BluetoothSettingsModel> bluetoothSettingsModel)
         : BaseSettingsWindow(app, window::name::add_device), bluetoothSettingsModel(bluetoothSettingsModel)
     {
diff --git a/module-apps/application-settings/windows/bluetooth/AddDeviceWindow.hpp b/module-apps/application-settings/windows/bluetooth/AddDeviceWindow.hpp
index 3b33a5bd6..4ec950b75 100644
--- a/module-apps/application-settings/windows/bluetooth/AddDeviceWindow.hpp
+++ b/module-apps/application-settings/windows/bluetooth/AddDeviceWindow.hpp
@@ -13,7 +13,7 @@ namespace gui
     class AddDeviceWindow : public BaseSettingsWindow
     {
       public:
-        AddDeviceWindow(app::Application *app, std::shared_ptr<BluetoothSettingsModel> bluetoothSettingsModel);
+        AddDeviceWindow(app::ApplicationCommon *app, std::shared_ptr<BluetoothSettingsModel> bluetoothSettingsModel);
 
       private:
         void onBeforeShow(ShowMode mode, SwitchData *data) override;
diff --git a/module-apps/application-settings/windows/bluetooth/AllDevicesWindow.cpp b/module-apps/application-settings/windows/bluetooth/AllDevicesWindow.cpp
index 680ab6baf..fa334138c 100644
--- a/module-apps/application-settings/windows/bluetooth/AllDevicesWindow.cpp
+++ b/module-apps/application-settings/windows/bluetooth/AllDevicesWindow.cpp
@@ -15,7 +15,7 @@
 namespace gui
 {
 
-    AllDevicesWindow::AllDevicesWindow(app::Application *app,
+    AllDevicesWindow::AllDevicesWindow(app::ApplicationCommon *app,
                                        std::shared_ptr<BluetoothSettingsModel> bluetoothSettingsModel)
         : BaseSettingsWindow(app, window::name::all_devices), bluetoothSettingsModel(bluetoothSettingsModel)
     {
diff --git a/module-apps/application-settings/windows/bluetooth/AllDevicesWindow.hpp b/module-apps/application-settings/windows/bluetooth/AllDevicesWindow.hpp
index 0bb9efcaa..4888921c3 100644
--- a/module-apps/application-settings/windows/bluetooth/AllDevicesWindow.hpp
+++ b/module-apps/application-settings/windows/bluetooth/AllDevicesWindow.hpp
@@ -12,7 +12,7 @@ namespace gui
     class AllDevicesWindow : public BaseSettingsWindow
     {
       public:
-        AllDevicesWindow(app::Application *app, std::shared_ptr<BluetoothSettingsModel> bluetoothSettingsModel);
+        AllDevicesWindow(app::ApplicationCommon *app, std::shared_ptr<BluetoothSettingsModel> bluetoothSettingsModel);
 
       private:
         void buildInterface() override;
diff --git a/module-apps/application-settings/windows/bluetooth/BluetoothCheckPasskeyWindow.cpp b/module-apps/application-settings/windows/bluetooth/BluetoothCheckPasskeyWindow.cpp
index fe3841186..f0cef7643 100644
--- a/module-apps/application-settings/windows/bluetooth/BluetoothCheckPasskeyWindow.cpp
+++ b/module-apps/application-settings/windows/bluetooth/BluetoothCheckPasskeyWindow.cpp
@@ -17,7 +17,7 @@ namespace gui
     } // namespace
     namespace passkey_style = style::settings::window::bluetooth::passkey;
 
-    BluetoothCheckPasskeyWindow::BluetoothCheckPasskeyWindow(app::Application *app)
+    BluetoothCheckPasskeyWindow::BluetoothCheckPasskeyWindow(app::ApplicationCommon *app)
         : AppWindow(app, window::name::bluetooth_check_passkey)
     {
         bluetoothSettingsModel = std::make_unique<BluetoothSettingsModel>(application);
diff --git a/module-apps/application-settings/windows/bluetooth/BluetoothCheckPasskeyWindow.hpp b/module-apps/application-settings/windows/bluetooth/BluetoothCheckPasskeyWindow.hpp
index 088fccce7..35b623475 100644
--- a/module-apps/application-settings/windows/bluetooth/BluetoothCheckPasskeyWindow.hpp
+++ b/module-apps/application-settings/windows/bluetooth/BluetoothCheckPasskeyWindow.hpp
@@ -13,7 +13,7 @@ namespace gui
     class BluetoothCheckPasskeyWindow : public AppWindow
     {
       public:
-        explicit BluetoothCheckPasskeyWindow(app::Application *app);
+        explicit BluetoothCheckPasskeyWindow(app::ApplicationCommon *app);
 
       private:
         void buildInterface() override;
diff --git a/module-apps/application-settings/windows/bluetooth/BluetoothWindow.cpp b/module-apps/application-settings/windows/bluetooth/BluetoothWindow.cpp
index cc07457e6..e1e59201a 100644
--- a/module-apps/application-settings/windows/bluetooth/BluetoothWindow.cpp
+++ b/module-apps/application-settings/windows/bluetooth/BluetoothWindow.cpp
@@ -11,7 +11,7 @@
 namespace gui
 {
 
-    BluetoothWindow::BluetoothWindow(app::Application *app) : BaseSettingsWindow(app, window::name::bluetooth)
+    BluetoothWindow::BluetoothWindow(app::ApplicationCommon *app) : BaseSettingsWindow(app, window::name::bluetooth)
     {
         bluetoothSettingsModel = std::make_unique<BluetoothSettingsModel>(application);
         bluetoothSettingsModel->requestStatus();
diff --git a/module-apps/application-settings/windows/bluetooth/BluetoothWindow.hpp b/module-apps/application-settings/windows/bluetooth/BluetoothWindow.hpp
index 60155228e..a892641cf 100644
--- a/module-apps/application-settings/windows/bluetooth/BluetoothWindow.hpp
+++ b/module-apps/application-settings/windows/bluetooth/BluetoothWindow.hpp
@@ -11,7 +11,7 @@ namespace gui
     class BluetoothWindow : public BaseSettingsWindow
     {
       public:
-        explicit BluetoothWindow(app::Application *app);
+        explicit BluetoothWindow(app::ApplicationCommon *app);
 
       private:
         void onBeforeShow(ShowMode mode, SwitchData *data) override;
diff --git a/module-apps/application-settings/windows/bluetooth/PhoneNameWindow.cpp b/module-apps/application-settings/windows/bluetooth/PhoneNameWindow.cpp
index 96defa4fc..d31f443dc 100644
--- a/module-apps/application-settings/windows/bluetooth/PhoneNameWindow.cpp
+++ b/module-apps/application-settings/windows/bluetooth/PhoneNameWindow.cpp
@@ -10,7 +10,7 @@
 
 namespace gui
 {
-    PhoneNameWindow::PhoneNameWindow(app::Application *app) : AppWindow(app, gui::window::name::phone_name)
+    PhoneNameWindow::PhoneNameWindow(app::ApplicationCommon *app) : AppWindow(app, gui::window::name::phone_name)
     {
         bluetoothSettingsModel = std::make_unique<BluetoothSettingsModel>(application);
         bluetoothSettingsModel->requestDeviceName();
diff --git a/module-apps/application-settings/windows/bluetooth/PhoneNameWindow.hpp b/module-apps/application-settings/windows/bluetooth/PhoneNameWindow.hpp
index d2d4296c1..8f2e7c060 100644
--- a/module-apps/application-settings/windows/bluetooth/PhoneNameWindow.hpp
+++ b/module-apps/application-settings/windows/bluetooth/PhoneNameWindow.hpp
@@ -10,7 +10,7 @@ namespace gui
     class PhoneNameWindow : public AppWindow
     {
       public:
-        explicit PhoneNameWindow(app::Application *app);
+        explicit PhoneNameWindow(app::ApplicationCommon *app);
 
       private:
         void buildInterface() override;
diff --git a/module-apps/application-settings/windows/display-keypad/DisplayAndKeypadWindow.cpp b/module-apps/application-settings/windows/display-keypad/DisplayAndKeypadWindow.cpp
index aeb0fb217..1f35860f8 100644
--- a/module-apps/application-settings/windows/display-keypad/DisplayAndKeypadWindow.cpp
+++ b/module-apps/application-settings/windows/display-keypad/DisplayAndKeypadWindow.cpp
@@ -9,7 +9,7 @@
 
 namespace gui
 {
-    DisplayAndKeypadWindow::DisplayAndKeypadWindow(app::Application *app)
+    DisplayAndKeypadWindow::DisplayAndKeypadWindow(app::ApplicationCommon *app)
         : OptionWindow(app, gui::window::name::display_and_keypad)
     {
         addOptions(displayAndKeypadOptionsList());
diff --git a/module-apps/application-settings/windows/display-keypad/DisplayAndKeypadWindow.hpp b/module-apps/application-settings/windows/display-keypad/DisplayAndKeypadWindow.hpp
index 8cbae4cd4..00239e431 100644
--- a/module-apps/application-settings/windows/display-keypad/DisplayAndKeypadWindow.hpp
+++ b/module-apps/application-settings/windows/display-keypad/DisplayAndKeypadWindow.hpp
@@ -10,7 +10,7 @@ namespace gui
     class DisplayAndKeypadWindow : public OptionWindow
     {
       public:
-        explicit DisplayAndKeypadWindow(app::Application *app);
+        explicit DisplayAndKeypadWindow(app::ApplicationCommon *app);
 
       private:
         std::list<Option> displayAndKeypadOptionsList();
diff --git a/module-apps/application-settings/windows/display-keypad/DisplayLightWindow.cpp b/module-apps/application-settings/windows/display-keypad/DisplayLightWindow.cpp
index 549d6d0ab..584861158 100644
--- a/module-apps/application-settings/windows/display-keypad/DisplayLightWindow.cpp
+++ b/module-apps/application-settings/windows/display-keypad/DisplayLightWindow.cpp
@@ -7,7 +7,8 @@
 
 namespace gui
 {
-    DisplayLightWindow::DisplayLightWindow(app::Application *app, app::settingsInterface::ScreenLightSettings *settings)
+    DisplayLightWindow::DisplayLightWindow(app::ApplicationCommon *app,
+                                           app::settingsInterface::ScreenLightSettings *settings)
         : BaseSettingsWindow(app, window::name::display_light), screenLightSettings(settings)
     {
         auto values = screenLightSettings->getCurrentValues();
diff --git a/module-apps/application-settings/windows/display-keypad/DisplayLightWindow.hpp b/module-apps/application-settings/windows/display-keypad/DisplayLightWindow.hpp
index efcd80a7c..c74af296e 100644
--- a/module-apps/application-settings/windows/display-keypad/DisplayLightWindow.hpp
+++ b/module-apps/application-settings/windows/display-keypad/DisplayLightWindow.hpp
@@ -20,7 +20,8 @@ namespace gui
     class DisplayLightWindow : public BaseSettingsWindow
     {
       public:
-        DisplayLightWindow(app::Application *app, app::settingsInterface::ScreenLightSettings *screenLightSettings);
+        DisplayLightWindow(app::ApplicationCommon *app,
+                           app::settingsInterface::ScreenLightSettings *screenLightSettings);
         ~DisplayLightWindow();
 
       private:
diff --git a/module-apps/application-settings/windows/display-keypad/EditQuotesWindow.cpp b/module-apps/application-settings/windows/display-keypad/EditQuotesWindow.cpp
index dc7c7e6eb..91168c9ac 100644
--- a/module-apps/application-settings/windows/display-keypad/EditQuotesWindow.cpp
+++ b/module-apps/application-settings/windows/display-keypad/EditQuotesWindow.cpp
@@ -9,7 +9,7 @@
 
 namespace gui
 {
-    EditQuotesWindow::EditQuotesWindow(app::Application *app) : BaseSettingsWindow(app, window::name::edit_quotes)
+    EditQuotesWindow::EditQuotesWindow(app::ApplicationCommon *app) : BaseSettingsWindow(app, window::name::edit_quotes)
     {
         setTitle(utils::translate("app_settings_display_wallpaper_edit_quotes"));
     }
diff --git a/module-apps/application-settings/windows/display-keypad/EditQuotesWindow.hpp b/module-apps/application-settings/windows/display-keypad/EditQuotesWindow.hpp
index a946a8c3b..4466fabce 100644
--- a/module-apps/application-settings/windows/display-keypad/EditQuotesWindow.hpp
+++ b/module-apps/application-settings/windows/display-keypad/EditQuotesWindow.hpp
@@ -12,7 +12,7 @@ namespace gui
     class EditQuotesWindow : public BaseSettingsWindow
     {
       public:
-        explicit EditQuotesWindow(app::Application *app);
+        explicit EditQuotesWindow(app::ApplicationCommon *app);
 
       private:
         void switchHandler(bool &optionSwitch);
diff --git a/module-apps/application-settings/windows/display-keypad/FontSizeWindow.cpp b/module-apps/application-settings/windows/display-keypad/FontSizeWindow.cpp
index 1742870ab..33e15e197 100644
--- a/module-apps/application-settings/windows/display-keypad/FontSizeWindow.cpp
+++ b/module-apps/application-settings/windows/display-keypad/FontSizeWindow.cpp
@@ -8,7 +8,7 @@
 namespace gui
 {
 
-    FontSizeWindow::FontSizeWindow(app::Application *app) : BaseSettingsWindow(app, gui::window::name::font_size)
+    FontSizeWindow::FontSizeWindow(app::ApplicationCommon *app) : BaseSettingsWindow(app, gui::window::name::font_size)
     {
         setTitle(utils::translate("app_settings_display_font_size"));
     }
diff --git a/module-apps/application-settings/windows/display-keypad/FontSizeWindow.hpp b/module-apps/application-settings/windows/display-keypad/FontSizeWindow.hpp
index 7d222c0b3..893c1b914 100644
--- a/module-apps/application-settings/windows/display-keypad/FontSizeWindow.hpp
+++ b/module-apps/application-settings/windows/display-keypad/FontSizeWindow.hpp
@@ -11,7 +11,7 @@ namespace gui
     class FontSizeWindow : public BaseSettingsWindow
     {
       public:
-        explicit FontSizeWindow(app::Application *app);
+        explicit FontSizeWindow(app::ApplicationCommon *app);
         auto buildOptionsList() -> std::list<gui::Option> override;
     };
 } // namespace gui
diff --git a/module-apps/application-settings/windows/display-keypad/InputLanguageWindow.cpp b/module-apps/application-settings/windows/display-keypad/InputLanguageWindow.cpp
index c1e3c991f..41b105474 100644
--- a/module-apps/application-settings/windows/display-keypad/InputLanguageWindow.cpp
+++ b/module-apps/application-settings/windows/display-keypad/InputLanguageWindow.cpp
@@ -10,7 +10,7 @@
 
 namespace gui
 {
-    InputLanguageWindow::InputLanguageWindow(app::Application *app)
+    InputLanguageWindow::InputLanguageWindow(app::ApplicationCommon *app)
         : BaseSettingsWindow(app, window::name::input_language), langList(profiles.getAvailableInputLanguages())
     {
         setTitle(utils::translate("app_settings_display_input_language"));
diff --git a/module-apps/application-settings/windows/display-keypad/InputLanguageWindow.hpp b/module-apps/application-settings/windows/display-keypad/InputLanguageWindow.hpp
index 9fb53a73c..1bb784d84 100644
--- a/module-apps/application-settings/windows/display-keypad/InputLanguageWindow.hpp
+++ b/module-apps/application-settings/windows/display-keypad/InputLanguageWindow.hpp
@@ -12,7 +12,7 @@ namespace gui
     class InputLanguageWindow : public BaseSettingsWindow
     {
       public:
-        explicit InputLanguageWindow(app::Application *app);
+        explicit InputLanguageWindow(app::ApplicationCommon *app);
 
       protected:
         auto buildOptionsList() -> std::list<gui::Option> override;
diff --git a/module-apps/application-settings/windows/display-keypad/KeypadLightWindow.cpp b/module-apps/application-settings/windows/display-keypad/KeypadLightWindow.cpp
index 497709e86..d6db7dad9 100644
--- a/module-apps/application-settings/windows/display-keypad/KeypadLightWindow.cpp
+++ b/module-apps/application-settings/windows/display-keypad/KeypadLightWindow.cpp
@@ -10,7 +10,7 @@
 namespace gui
 {
 
-    KeypadLightWindow::KeypadLightWindow(app::Application *app,
+    KeypadLightWindow::KeypadLightWindow(app::ApplicationCommon *app,
                                          app::settingsInterface::KeypdBacklightSettings *settings)
         : BaseSettingsWindow(app, window::name::keypad_light), keypadLightSettings(settings)
     {
diff --git a/module-apps/application-settings/windows/display-keypad/KeypadLightWindow.hpp b/module-apps/application-settings/windows/display-keypad/KeypadLightWindow.hpp
index 0576319b1..0371ab5a4 100644
--- a/module-apps/application-settings/windows/display-keypad/KeypadLightWindow.hpp
+++ b/module-apps/application-settings/windows/display-keypad/KeypadLightWindow.hpp
@@ -11,7 +11,7 @@ namespace gui
     class KeypadLightWindow : public BaseSettingsWindow
     {
       public:
-        KeypadLightWindow(app::Application *app, app::settingsInterface::KeypdBacklightSettings *settings);
+        KeypadLightWindow(app::ApplicationCommon *app, app::settingsInterface::KeypdBacklightSettings *settings);
 
       private:
         void onBeforeShow(ShowMode mode, SwitchData *data) override;
diff --git a/module-apps/application-settings/windows/display-keypad/QuoteCategoriesWindow.cpp b/module-apps/application-settings/windows/display-keypad/QuoteCategoriesWindow.cpp
index d69bc9152..b510d4bf0 100644
--- a/module-apps/application-settings/windows/display-keypad/QuoteCategoriesWindow.cpp
+++ b/module-apps/application-settings/windows/display-keypad/QuoteCategoriesWindow.cpp
@@ -8,7 +8,7 @@
 
 namespace gui
 {
-    QuoteCategoriesWindow::QuoteCategoriesWindow(app::Application *app)
+    QuoteCategoriesWindow::QuoteCategoriesWindow(app::ApplicationCommon *app)
         : AppWindow(app, gui::window::name::quote_categories),
           categoriesModel(std::make_shared<Quotes::CategoriesModel>(app))
     {
diff --git a/module-apps/application-settings/windows/display-keypad/QuoteCategoriesWindow.hpp b/module-apps/application-settings/windows/display-keypad/QuoteCategoriesWindow.hpp
index 3e921799c..31cdd27f0 100644
--- a/module-apps/application-settings/windows/display-keypad/QuoteCategoriesWindow.hpp
+++ b/module-apps/application-settings/windows/display-keypad/QuoteCategoriesWindow.hpp
@@ -11,7 +11,7 @@ namespace gui
     class QuoteCategoriesWindow : public AppWindow
     {
       public:
-        QuoteCategoriesWindow(app::Application *app);
+        QuoteCategoriesWindow(app::ApplicationCommon *app);
 
       private:
         void buildInterface() override;
diff --git a/module-apps/application-settings/windows/display-keypad/QuotesAddWindow.cpp b/module-apps/application-settings/windows/display-keypad/QuotesAddWindow.cpp
index 4bbb1bedc..26568774d 100644
--- a/module-apps/application-settings/windows/display-keypad/QuotesAddWindow.cpp
+++ b/module-apps/application-settings/windows/display-keypad/QuotesAddWindow.cpp
@@ -29,7 +29,7 @@ namespace gui
         }
     } // namespace
 
-    QuoteAddEditWindow::QuoteAddEditWindow(app::Application *app)
+    QuoteAddEditWindow::QuoteAddEditWindow(app::ApplicationCommon *app)
         : AppWindow(app, gui::window::name::quotes), quoteModel(std::make_shared<Quotes::QuotesModel>(app))
     {
         buildInterface();
diff --git a/module-apps/application-settings/windows/display-keypad/QuotesAddWindow.hpp b/module-apps/application-settings/windows/display-keypad/QuotesAddWindow.hpp
index 67b0b8cc9..1f6d5abbd 100644
--- a/module-apps/application-settings/windows/display-keypad/QuotesAddWindow.hpp
+++ b/module-apps/application-settings/windows/display-keypad/QuotesAddWindow.hpp
@@ -14,7 +14,7 @@ namespace gui
     class QuoteAddEditWindow : public AppWindow
     {
       public:
-        explicit QuoteAddEditWindow(app::Application *app);
+        explicit QuoteAddEditWindow(app::ApplicationCommon *app);
         void buildInterface() override;
 
       private:
diff --git a/module-apps/application-settings/windows/display-keypad/QuotesMainWindow.cpp b/module-apps/application-settings/windows/display-keypad/QuotesMainWindow.cpp
index 913dafa77..b1a5d54f3 100644
--- a/module-apps/application-settings/windows/display-keypad/QuotesMainWindow.cpp
+++ b/module-apps/application-settings/windows/display-keypad/QuotesMainWindow.cpp
@@ -22,7 +22,7 @@ namespace style::quotes
 
 namespace gui
 {
-    QuotesMainWindow::QuotesMainWindow(app::Application *app)
+    QuotesMainWindow::QuotesMainWindow(app::ApplicationCommon *app)
         : AppWindow(app, gui::window::name::quotes), quotesModel(std::make_shared<Quotes::QuotesModel>(app))
     {
         buildInterface();
diff --git a/module-apps/application-settings/windows/display-keypad/QuotesMainWindow.hpp b/module-apps/application-settings/windows/display-keypad/QuotesMainWindow.hpp
index 76e7a4c4c..0135c4afd 100644
--- a/module-apps/application-settings/windows/display-keypad/QuotesMainWindow.hpp
+++ b/module-apps/application-settings/windows/display-keypad/QuotesMainWindow.hpp
@@ -11,7 +11,7 @@ namespace gui
     class QuotesMainWindow : public AppWindow
     {
       public:
-        explicit QuotesMainWindow(app::Application *app);
+        explicit QuotesMainWindow(app::ApplicationCommon *app);
 
       private:
         void buildInterface() override;
diff --git a/module-apps/application-settings/windows/display-keypad/QuotesOptionsWindow.cpp b/module-apps/application-settings/windows/display-keypad/QuotesOptionsWindow.cpp
index 23cba6e89..5790243b2 100644
--- a/module-apps/application-settings/windows/display-keypad/QuotesOptionsWindow.cpp
+++ b/module-apps/application-settings/windows/display-keypad/QuotesOptionsWindow.cpp
@@ -13,7 +13,7 @@
 namespace gui
 {
 
-    QuotesOptionsWindow::QuotesOptionsWindow(app::Application *app)
+    QuotesOptionsWindow::QuotesOptionsWindow(app::ApplicationCommon *app)
         : BaseSettingsWindow(app, gui::window::name::quotes), quotesModel(std::make_shared<Quotes::QuotesModel>(app))
     {
         setTitle(utils::translate("app_settings_display_wallpaper_quotes_options"));
diff --git a/module-apps/application-settings/windows/display-keypad/QuotesOptionsWindow.hpp b/module-apps/application-settings/windows/display-keypad/QuotesOptionsWindow.hpp
index 96345bc1c..7fb7a7b57 100644
--- a/module-apps/application-settings/windows/display-keypad/QuotesOptionsWindow.hpp
+++ b/module-apps/application-settings/windows/display-keypad/QuotesOptionsWindow.hpp
@@ -11,7 +11,7 @@ namespace gui
     class QuotesOptionsWindow : public BaseSettingsWindow
     {
       public:
-        explicit QuotesOptionsWindow(app::Application *app);
+        explicit QuotesOptionsWindow(app::ApplicationCommon *app);
 
       private:
         std::list<Option> buildOptionsList() override;
diff --git a/module-apps/application-settings/windows/display-keypad/WallpaperWindow.cpp b/module-apps/application-settings/windows/display-keypad/WallpaperWindow.cpp
index 2720e63bf..77afc3e39 100644
--- a/module-apps/application-settings/windows/display-keypad/WallpaperWindow.cpp
+++ b/module-apps/application-settings/windows/display-keypad/WallpaperWindow.cpp
@@ -9,7 +9,7 @@
 
 namespace gui
 {
-    WallpaperWindow::WallpaperWindow(app::Application *app) : BaseSettingsWindow(app, window::name::wallpaper)
+    WallpaperWindow::WallpaperWindow(app::ApplicationCommon *app) : BaseSettingsWindow(app, window::name::wallpaper)
     {
         setTitle(utils::translate("app_settings_display_wallpaper"));
     }
diff --git a/module-apps/application-settings/windows/display-keypad/WallpaperWindow.hpp b/module-apps/application-settings/windows/display-keypad/WallpaperWindow.hpp
index b42c72e13..525eafd84 100644
--- a/module-apps/application-settings/windows/display-keypad/WallpaperWindow.hpp
+++ b/module-apps/application-settings/windows/display-keypad/WallpaperWindow.hpp
@@ -12,7 +12,7 @@ namespace gui
     class WallpaperWindow : public BaseSettingsWindow
     {
       public:
-        explicit WallpaperWindow(app::Application *app);
+        explicit WallpaperWindow(app::ApplicationCommon *app);
 
       private:
         void switchHandler(bool &onOffSwitch);
diff --git a/module-apps/application-settings/windows/network/ApnOptionsWindow.cpp b/module-apps/application-settings/windows/network/ApnOptionsWindow.cpp
index 0d4ab808e..c3358f8f1 100644
--- a/module-apps/application-settings/windows/network/ApnOptionsWindow.cpp
+++ b/module-apps/application-settings/windows/network/ApnOptionsWindow.cpp
@@ -10,7 +10,7 @@
 
 namespace gui
 {
-    ApnOptionsWindow::ApnOptionsWindow(app::Application *app) : BaseSettingsWindow(app, window::name::apn_options)
+    ApnOptionsWindow::ApnOptionsWindow(app::ApplicationCommon *app) : BaseSettingsWindow(app, window::name::apn_options)
     {
         setTitle(utils::translate("app_settings_apn_options"));
         apnSettingsModel = new ApnSettingsModel(application);
diff --git a/module-apps/application-settings/windows/network/ApnOptionsWindow.hpp b/module-apps/application-settings/windows/network/ApnOptionsWindow.hpp
index 851b96566..644462c46 100644
--- a/module-apps/application-settings/windows/network/ApnOptionsWindow.hpp
+++ b/module-apps/application-settings/windows/network/ApnOptionsWindow.hpp
@@ -12,7 +12,7 @@ namespace gui
     class ApnOptionsWindow : public BaseSettingsWindow
     {
       public:
-        ApnOptionsWindow(app::Application *app);
+        ApnOptionsWindow(app::ApplicationCommon *app);
 
       private:
         auto buildOptionsList() -> std::list<gui::Option> override;
diff --git a/module-apps/application-settings/windows/network/ApnSettingsWindow.cpp b/module-apps/application-settings/windows/network/ApnSettingsWindow.cpp
index b4f766b5a..e67fe0d9c 100644
--- a/module-apps/application-settings/windows/network/ApnSettingsWindow.cpp
+++ b/module-apps/application-settings/windows/network/ApnSettingsWindow.cpp
@@ -13,7 +13,8 @@
 namespace gui
 {
 
-    ApnSettingsWindow::ApnSettingsWindow(app::Application *app) : OptionWindow(app, gui::window::name::apn_settings)
+    ApnSettingsWindow::ApnSettingsWindow(app::ApplicationCommon *app)
+        : OptionWindow(app, gui::window::name::apn_settings)
     {
         buildInterface();
     }
diff --git a/module-apps/application-settings/windows/network/ApnSettingsWindow.hpp b/module-apps/application-settings/windows/network/ApnSettingsWindow.hpp
index e25188cc0..bac2023dd 100644
--- a/module-apps/application-settings/windows/network/ApnSettingsWindow.hpp
+++ b/module-apps/application-settings/windows/network/ApnSettingsWindow.hpp
@@ -13,7 +13,7 @@ namespace gui
     class ApnSettingsWindow : public OptionWindow
     {
       public:
-        ApnSettingsWindow(app::Application *app);
+        ApnSettingsWindow(app::ApplicationCommon *app);
 
       private:
         void buildInterface() override;
diff --git a/module-apps/application-settings/windows/network/NetworkWindow.cpp b/module-apps/application-settings/windows/network/NetworkWindow.cpp
index c43710d35..149871da7 100644
--- a/module-apps/application-settings/windows/network/NetworkWindow.cpp
+++ b/module-apps/application-settings/windows/network/NetworkWindow.cpp
@@ -10,7 +10,8 @@
 
 namespace gui
 {
-    NetworkWindow::NetworkWindow(app::Application *app, app::settingsInterface::OperatorsSettings *operatorsSettings)
+    NetworkWindow::NetworkWindow(app::ApplicationCommon *app,
+                                 app::settingsInterface::OperatorsSettings *operatorsSettings)
         : BaseSettingsWindow(app, gui::window::name::network), operatorsSettings(operatorsSettings)
     {}
 
diff --git a/module-apps/application-settings/windows/network/NetworkWindow.hpp b/module-apps/application-settings/windows/network/NetworkWindow.hpp
index 839a4328b..e969bc713 100644
--- a/module-apps/application-settings/windows/network/NetworkWindow.hpp
+++ b/module-apps/application-settings/windows/network/NetworkWindow.hpp
@@ -19,7 +19,7 @@ namespace gui
         app::settingsInterface::OperatorsSettings *operatorsSettings;
 
       public:
-        NetworkWindow(app::Application *app, app::settingsInterface::OperatorsSettings *operatorsSettings);
+        NetworkWindow(app::ApplicationCommon *app, app::settingsInterface::OperatorsSettings *operatorsSettings);
 
         void onBeforeShow(ShowMode mode, SwitchData *data) override;
     };
diff --git a/module-apps/application-settings/windows/network/NewApnWindow.cpp b/module-apps/application-settings/windows/network/NewApnWindow.cpp
index d0eeb63ba..73153ead6 100644
--- a/module-apps/application-settings/windows/network/NewApnWindow.cpp
+++ b/module-apps/application-settings/windows/network/NewApnWindow.cpp
@@ -9,7 +9,7 @@
 namespace gui
 {
 
-    NewApnWindow::NewApnWindow(app::Application *app)
+    NewApnWindow::NewApnWindow(app::ApplicationCommon *app)
         : AppWindow(app, gui::window::name::new_apn),
           apn(std::make_shared<packet_data::APN::Config>()), newApnModel{std::make_shared<NewApnModel>(app)}
     {
diff --git a/module-apps/application-settings/windows/network/NewApnWindow.hpp b/module-apps/application-settings/windows/network/NewApnWindow.hpp
index 3eb03d2ec..06b915782 100644
--- a/module-apps/application-settings/windows/network/NewApnWindow.hpp
+++ b/module-apps/application-settings/windows/network/NewApnWindow.hpp
@@ -14,7 +14,7 @@ namespace gui
     class NewApnWindow : public AppWindow
     {
       public:
-        NewApnWindow(app::Application *app);
+        NewApnWindow(app::ApplicationCommon *app);
 
       private:
         auto onInput(const InputEvent &inputEvent) -> bool override;
diff --git a/module-apps/application-settings/windows/network/SimCardsWindow.cpp b/module-apps/application-settings/windows/network/SimCardsWindow.cpp
index 623551740..a99d4a796 100644
--- a/module-apps/application-settings/windows/network/SimCardsWindow.cpp
+++ b/module-apps/application-settings/windows/network/SimCardsWindow.cpp
@@ -11,7 +11,7 @@
 
 namespace gui
 {
-    SimCardsWindow::SimCardsWindow(app::Application *app, app::settingsInterface::SimParams *simParams)
+    SimCardsWindow::SimCardsWindow(app::ApplicationCommon *app, app::settingsInterface::SimParams *simParams)
         : BaseSettingsWindow(app, gui::window::name::sim_cards), simParams(simParams)
     {}
 
diff --git a/module-apps/application-settings/windows/network/SimCardsWindow.hpp b/module-apps/application-settings/windows/network/SimCardsWindow.hpp
index f2f182a8e..0752a4edc 100644
--- a/module-apps/application-settings/windows/network/SimCardsWindow.hpp
+++ b/module-apps/application-settings/windows/network/SimCardsWindow.hpp
@@ -19,7 +19,7 @@ namespace gui
         app::settingsInterface::SimParams *simParams;
 
       public:
-        SimCardsWindow(app::Application *app, app::settingsInterface::SimParams *simParams);
+        SimCardsWindow(app::ApplicationCommon *app, app::settingsInterface::SimParams *simParams);
 
         void onBeforeShow(ShowMode mode, SwitchData *data) override;
     };
diff --git a/module-apps/application-settings/windows/network/SimContactsImportWindow.cpp b/module-apps/application-settings/windows/network/SimContactsImportWindow.cpp
index 03b2f1ce9..f7dac8ba9 100644
--- a/module-apps/application-settings/windows/network/SimContactsImportWindow.cpp
+++ b/module-apps/application-settings/windows/network/SimContactsImportWindow.cpp
@@ -10,7 +10,7 @@
 namespace gui
 {
     SimContactsImportWindow::SimContactsImportWindow(
-        app::Application *app, std::unique_ptr<SimContactsImportWindowContract::Presenter> simImportPresenter)
+        app::ApplicationCommon *app, std::unique_ptr<SimContactsImportWindowContract::Presenter> simImportPresenter)
         : AppWindow(app, gui::window::name::import_contacts), presenter(std::move(simImportPresenter))
     {
         presenter->attach(this);
diff --git a/module-apps/application-settings/windows/network/SimContactsImportWindow.hpp b/module-apps/application-settings/windows/network/SimContactsImportWindow.hpp
index 812873bab..0dc9229c5 100644
--- a/module-apps/application-settings/windows/network/SimContactsImportWindow.hpp
+++ b/module-apps/application-settings/windows/network/SimContactsImportWindow.hpp
@@ -13,7 +13,7 @@ namespace gui
     class SimContactsImportWindow : public AppWindow, public SimContactsImportWindowContract::View
     {
       public:
-        SimContactsImportWindow(app::Application *app,
+        SimContactsImportWindow(app::ApplicationCommon *app,
                                 std::unique_ptr<SimContactsImportWindowContract::Presenter> presenter);
 
       private:
diff --git a/module-apps/application-settings/windows/network/SimPINSettingsWindow.cpp b/module-apps/application-settings/windows/network/SimPINSettingsWindow.cpp
index 739092e3e..e57a9a582 100644
--- a/module-apps/application-settings/windows/network/SimPINSettingsWindow.cpp
+++ b/module-apps/application-settings/windows/network/SimPINSettingsWindow.cpp
@@ -12,7 +12,7 @@
 
 namespace gui
 {
-    SimPINSettingsWindow::SimPINSettingsWindow(app::Application *app)
+    SimPINSettingsWindow::SimPINSettingsWindow(app::ApplicationCommon *app)
         : BaseSettingsWindow(app, window::name::sim_pin_settings)
     {
         app->bus.sendUnicast<cellular::msg::request::sim::GetLockState>();
diff --git a/module-apps/application-settings/windows/network/SimPINSettingsWindow.hpp b/module-apps/application-settings/windows/network/SimPINSettingsWindow.hpp
index dedd1a99b..bcd66b04b 100644
--- a/module-apps/application-settings/windows/network/SimPINSettingsWindow.hpp
+++ b/module-apps/application-settings/windows/network/SimPINSettingsWindow.hpp
@@ -10,7 +10,7 @@ namespace gui
     class SimPINSettingsWindow : public BaseSettingsWindow
     {
       public:
-        explicit SimPINSettingsWindow(app::Application *app);
+        explicit SimPINSettingsWindow(app::ApplicationCommon *app);
 
       private:
         auto buildOptionsList() -> std::list<Option> override;
diff --git a/module-apps/application-settings/windows/phone-modes/ConnectionFrequencyWindow.cpp b/module-apps/application-settings/windows/phone-modes/ConnectionFrequencyWindow.cpp
index b5a69e4dd..b024e3ab8 100644
--- a/module-apps/application-settings/windows/phone-modes/ConnectionFrequencyWindow.cpp
+++ b/module-apps/application-settings/windows/phone-modes/ConnectionFrequencyWindow.cpp
@@ -10,7 +10,7 @@
 
 namespace gui
 {
-    ConnectionFrequencyWindow::ConnectionFrequencyWindow(app::Application *app,
+    ConnectionFrequencyWindow::ConnectionFrequencyWindow(app::ApplicationCommon *app,
                                                          app::settingsInterface::ConnectionSettings *connectionSettings)
         : BaseSettingsWindow(app, gui::window::name::connection_frequency), connectionSettings(connectionSettings)
     {
diff --git a/module-apps/application-settings/windows/phone-modes/ConnectionFrequencyWindow.hpp b/module-apps/application-settings/windows/phone-modes/ConnectionFrequencyWindow.hpp
index 9cd6d8532..21978501c 100644
--- a/module-apps/application-settings/windows/phone-modes/ConnectionFrequencyWindow.hpp
+++ b/module-apps/application-settings/windows/phone-modes/ConnectionFrequencyWindow.hpp
@@ -22,7 +22,7 @@ namespace gui
         std::vector<uint8_t> frequency{0, 15, 30, 45, 60};
 
       public:
-        ConnectionFrequencyWindow(app::Application *app,
+        ConnectionFrequencyWindow(app::ApplicationCommon *app,
                                   app::settingsInterface::ConnectionSettings *connectionSettings);
         void onBeforeShow(ShowMode m, SwitchData *d) override;
     };
diff --git a/module-apps/application-settings/windows/phone-modes/DoNotDisturbWindow.cpp b/module-apps/application-settings/windows/phone-modes/DoNotDisturbWindow.cpp
index e4321abfc..dfa2a3852 100644
--- a/module-apps/application-settings/windows/phone-modes/DoNotDisturbWindow.cpp
+++ b/module-apps/application-settings/windows/phone-modes/DoNotDisturbWindow.cpp
@@ -11,7 +11,8 @@
 
 namespace gui
 {
-    DoNotDisturbWindow::DoNotDisturbWindow(app::Application *app, app::settingsInterface::DndSettings *dndSettings)
+    DoNotDisturbWindow::DoNotDisturbWindow(app::ApplicationCommon *app,
+                                           app::settingsInterface::DndSettings *dndSettings)
         : BaseSettingsWindow(app, gui::window::name::do_not_disturb), dndSettings(dndSettings)
     {
         buildInterface();
diff --git a/module-apps/application-settings/windows/phone-modes/DoNotDisturbWindow.hpp b/module-apps/application-settings/windows/phone-modes/DoNotDisturbWindow.hpp
index 46908c661..e9dae29c5 100644
--- a/module-apps/application-settings/windows/phone-modes/DoNotDisturbWindow.hpp
+++ b/module-apps/application-settings/windows/phone-modes/DoNotDisturbWindow.hpp
@@ -17,7 +17,7 @@ namespace gui
     class DoNotDisturbWindow : public BaseSettingsWindow
     {
       public:
-        DoNotDisturbWindow(app::Application *app, app::settingsInterface::DndSettings *dndSettings);
+        DoNotDisturbWindow(app::ApplicationCommon *app, app::settingsInterface::DndSettings *dndSettings);
         void buildInterface() override;
 
       private:
diff --git a/module-apps/application-settings/windows/phone-modes/OfflineWindow.cpp b/module-apps/application-settings/windows/phone-modes/OfflineWindow.cpp
index e1a175782..48cec5ce3 100644
--- a/module-apps/application-settings/windows/phone-modes/OfflineWindow.cpp
+++ b/module-apps/application-settings/windows/phone-modes/OfflineWindow.cpp
@@ -13,7 +13,7 @@
 namespace gui
 {
 
-    OfflineWindow::OfflineWindow(app::Application *app, app::settingsInterface::OfflineSettings *offlineSettings)
+    OfflineWindow::OfflineWindow(app::ApplicationCommon *app, app::settingsInterface::OfflineSettings *offlineSettings)
         : BaseSettingsWindow(app, gui::window::name::offline), offlineSettings(offlineSettings)
     {
         isFlightMode = offlineSettings->isFlightMode();
diff --git a/module-apps/application-settings/windows/phone-modes/OfflineWindow.hpp b/module-apps/application-settings/windows/phone-modes/OfflineWindow.hpp
index 6a33a00d4..fc6f01caf 100644
--- a/module-apps/application-settings/windows/phone-modes/OfflineWindow.hpp
+++ b/module-apps/application-settings/windows/phone-modes/OfflineWindow.hpp
@@ -17,7 +17,7 @@ namespace gui
     class OfflineWindow : public BaseSettingsWindow
     {
       public:
-        OfflineWindow(app::Application *app, app::settingsInterface::OfflineSettings *offlineSettings);
+        OfflineWindow(app::ApplicationCommon *app, app::settingsInterface::OfflineSettings *offlineSettings);
         void buildInterface() override;
 
       private:
diff --git a/module-apps/application-settings/windows/phone-modes/PhoneModesWindow.cpp b/module-apps/application-settings/windows/phone-modes/PhoneModesWindow.cpp
index 25ebc63ae..ecea60df3 100644
--- a/module-apps/application-settings/windows/phone-modes/PhoneModesWindow.cpp
+++ b/module-apps/application-settings/windows/phone-modes/PhoneModesWindow.cpp
@@ -10,7 +10,7 @@
 
 namespace gui
 {
-    PhoneModesWindow::PhoneModesWindow(app::Application *app,
+    PhoneModesWindow::PhoneModesWindow(app::ApplicationCommon *app,
                                        app::settingsInterface::PhoneModeSettings *phoneModeSettings)
         : OptionWindow(app, gui::window::name::phone_modes), phoneModeSettings(phoneModeSettings)
     {
diff --git a/module-apps/application-settings/windows/phone-modes/PhoneModesWindow.hpp b/module-apps/application-settings/windows/phone-modes/PhoneModesWindow.hpp
index 36f90778c..d65f22511 100644
--- a/module-apps/application-settings/windows/phone-modes/PhoneModesWindow.hpp
+++ b/module-apps/application-settings/windows/phone-modes/PhoneModesWindow.hpp
@@ -25,6 +25,6 @@ namespace gui
         std::vector<std::string> modifiedModesStrings{initialModesStrings};
 
       public:
-        PhoneModesWindow(app::Application *app, app::settingsInterface::PhoneModeSettings *phoneModeSettings);
+        PhoneModesWindow(app::ApplicationCommon *app, app::settingsInterface::PhoneModeSettings *phoneModeSettings);
     };
 } // namespace gui
diff --git a/module-apps/application-settings/windows/security/AutolockWindow.cpp b/module-apps/application-settings/windows/security/AutolockWindow.cpp
index 92024398d..fe1046aa8 100644
--- a/module-apps/application-settings/windows/security/AutolockWindow.cpp
+++ b/module-apps/application-settings/windows/security/AutolockWindow.cpp
@@ -24,7 +24,8 @@ namespace gui
             {"20m", std::chrono::minutes{20}}};
     } // namespace
 
-    AutolockWindow::AutolockWindow(app::Application *app, app::settingsInterface::AutoLockSettings *autoLockSettings)
+    AutolockWindow::AutolockWindow(app::ApplicationCommon *app,
+                                   app::settingsInterface::AutoLockSettings *autoLockSettings)
         : BaseSettingsWindow(app, window::name::autolock), autoLockSettings(autoLockSettings)
     {
         setTitle(utils::translate("app_settings_display_security_autolock"));
diff --git a/module-apps/application-settings/windows/security/AutolockWindow.hpp b/module-apps/application-settings/windows/security/AutolockWindow.hpp
index 9b42dcb64..19f5ed9d1 100644
--- a/module-apps/application-settings/windows/security/AutolockWindow.hpp
+++ b/module-apps/application-settings/windows/security/AutolockWindow.hpp
@@ -15,7 +15,7 @@ namespace gui
     class AutolockWindow : public BaseSettingsWindow
     {
       public:
-        AutolockWindow(app::Application *app, app::settingsInterface::AutoLockSettings *autoLockSettings);
+        AutolockWindow(app::ApplicationCommon *app, app::settingsInterface::AutoLockSettings *autoLockSettings);
         void onBeforeShow(ShowMode mode, SwitchData *data) override;
 
       private:
diff --git a/module-apps/application-settings/windows/security/SecurityMainWindow.cpp b/module-apps/application-settings/windows/security/SecurityMainWindow.cpp
index 19dd393d2..a1ee3e116 100644
--- a/module-apps/application-settings/windows/security/SecurityMainWindow.cpp
+++ b/module-apps/application-settings/windows/security/SecurityMainWindow.cpp
@@ -9,7 +9,8 @@
 
 namespace gui
 {
-    SecurityMainWindow::SecurityMainWindow(app::Application *app) : BaseSettingsWindow(app, window::name::security)
+    SecurityMainWindow::SecurityMainWindow(app::ApplicationCommon *app)
+        : BaseSettingsWindow(app, window::name::security)
     {}
 
     void SecurityMainWindow::onBeforeShow(ShowMode mode, SwitchData *data)
diff --git a/module-apps/application-settings/windows/security/SecurityMainWindow.hpp b/module-apps/application-settings/windows/security/SecurityMainWindow.hpp
index 1f6eea682..920277c9b 100644
--- a/module-apps/application-settings/windows/security/SecurityMainWindow.hpp
+++ b/module-apps/application-settings/windows/security/SecurityMainWindow.hpp
@@ -10,7 +10,7 @@ namespace gui
     class SecurityMainWindow : public BaseSettingsWindow
     {
       public:
-        explicit SecurityMainWindow(app::Application *app);
+        explicit SecurityMainWindow(app::ApplicationCommon *app);
 
       private:
         auto buildOptionsList() -> std::list<Option> override;
diff --git a/module-apps/application-settings/windows/system/CertificationWindow.cpp b/module-apps/application-settings/windows/system/CertificationWindow.cpp
index 603582a68..484d0b4b7 100644
--- a/module-apps/application-settings/windows/system/CertificationWindow.cpp
+++ b/module-apps/application-settings/windows/system/CertificationWindow.cpp
@@ -10,7 +10,8 @@
 
 namespace gui
 {
-    CertificationWindow::CertificationWindow(app::Application *app) : AppWindow(app, gui::window::name::certification)
+    CertificationWindow::CertificationWindow(app::ApplicationCommon *app)
+        : AppWindow(app, gui::window::name::certification)
     {
         buildInterface();
     }
diff --git a/module-apps/application-settings/windows/system/CertificationWindow.hpp b/module-apps/application-settings/windows/system/CertificationWindow.hpp
index 638d40995..8522059c0 100644
--- a/module-apps/application-settings/windows/system/CertificationWindow.hpp
+++ b/module-apps/application-settings/windows/system/CertificationWindow.hpp
@@ -10,7 +10,7 @@ namespace gui
     class CertificationWindow : public AppWindow
     {
       public:
-        explicit CertificationWindow(app::Application *app);
+        explicit CertificationWindow(app::ApplicationCommon *app);
 
       private:
         void buildInterface() override;
diff --git a/module-apps/application-settings/windows/system/ChangeDateAndTimeWindow.cpp b/module-apps/application-settings/windows/system/ChangeDateAndTimeWindow.cpp
index 172e17d23..1f3ea66a3 100644
--- a/module-apps/application-settings/windows/system/ChangeDateAndTimeWindow.cpp
+++ b/module-apps/application-settings/windows/system/ChangeDateAndTimeWindow.cpp
@@ -11,7 +11,7 @@
 
 namespace gui
 {
-    ChangeDateAndTimeWindow::ChangeDateAndTimeWindow(app::Application *app, std::string name)
+    ChangeDateAndTimeWindow::ChangeDateAndTimeWindow(app::ApplicationCommon *app, std::string name)
         : AppWindow(app, name), dateAndTimeModel{std::make_shared<DateAndTimeModel>(this->application)}
     {
         buildInterface();
diff --git a/module-apps/application-settings/windows/system/ChangeDateAndTimeWindow.hpp b/module-apps/application-settings/windows/system/ChangeDateAndTimeWindow.hpp
index 358cb27d6..390ce0805 100644
--- a/module-apps/application-settings/windows/system/ChangeDateAndTimeWindow.hpp
+++ b/module-apps/application-settings/windows/system/ChangeDateAndTimeWindow.hpp
@@ -12,7 +12,7 @@ namespace gui
     class ChangeDateAndTimeWindow : public AppWindow
     {
       public:
-        explicit ChangeDateAndTimeWindow(app::Application *app,
+        explicit ChangeDateAndTimeWindow(app::ApplicationCommon *app,
                                          std::string name = gui::window::name::change_date_and_time);
 
         void buildInterface() override;
diff --git a/module-apps/application-settings/windows/system/ChangeTimeZone.cpp b/module-apps/application-settings/windows/system/ChangeTimeZone.cpp
index fc9cd0ee3..f72a53cc5 100644
--- a/module-apps/application-settings/windows/system/ChangeTimeZone.cpp
+++ b/module-apps/application-settings/windows/system/ChangeTimeZone.cpp
@@ -13,7 +13,7 @@
 
 namespace gui
 {
-    ChangeTimeZone::ChangeTimeZone(app::Application *app)
+    ChangeTimeZone::ChangeTimeZone(app::ApplicationCommon *app)
         : BaseSettingsWindow(app, window::name::change_date_and_time),
           timeZonesList(utils::time::getAvailableTimeZonesWithOffset())
     {
diff --git a/module-apps/application-settings/windows/system/ChangeTimeZone.hpp b/module-apps/application-settings/windows/system/ChangeTimeZone.hpp
index 5cd0074b1..ae0e6083c 100644
--- a/module-apps/application-settings/windows/system/ChangeTimeZone.hpp
+++ b/module-apps/application-settings/windows/system/ChangeTimeZone.hpp
@@ -11,7 +11,7 @@ namespace gui
     class ChangeTimeZone : public BaseSettingsWindow
     {
       public:
-        explicit ChangeTimeZone(app::Application *app);
+        explicit ChangeTimeZone(app::ApplicationCommon *app);
 
       protected:
         [[nodiscard]] auto buildOptionsList() -> std::list<Option> override;
diff --git a/module-apps/application-settings/windows/system/DateAndTimeMainWindow.cpp b/module-apps/application-settings/windows/system/DateAndTimeMainWindow.cpp
index a761f5b17..2777a3f62 100644
--- a/module-apps/application-settings/windows/system/DateAndTimeMainWindow.cpp
+++ b/module-apps/application-settings/windows/system/DateAndTimeMainWindow.cpp
@@ -12,7 +12,7 @@
 
 namespace gui
 {
-    DateAndTimeMainWindow::DateAndTimeMainWindow(app::Application *app, std::string name)
+    DateAndTimeMainWindow::DateAndTimeMainWindow(app::ApplicationCommon *app, std::string name)
         : BaseSettingsWindow(app, std::move(name))
     {
         setTitle(utils::translate("app_settings_date_and_time"));
diff --git a/module-apps/application-settings/windows/system/DateAndTimeMainWindow.hpp b/module-apps/application-settings/windows/system/DateAndTimeMainWindow.hpp
index 363b4bc2e..ed3e4df41 100644
--- a/module-apps/application-settings/windows/system/DateAndTimeMainWindow.hpp
+++ b/module-apps/application-settings/windows/system/DateAndTimeMainWindow.hpp
@@ -12,7 +12,7 @@ namespace gui
     class DateAndTimeMainWindow : public BaseSettingsWindow
     {
       public:
-        DateAndTimeMainWindow(app::Application *app, std::string name);
+        DateAndTimeMainWindow(app::ApplicationCommon *app, std::string name);
 
       protected:
         auto buildOptionsList() -> std::list<Option> override;
diff --git a/module-apps/application-settings/windows/system/LanguagesWindow.cpp b/module-apps/application-settings/windows/system/LanguagesWindow.cpp
index e295e5ad3..d3c941d7d 100644
--- a/module-apps/application-settings/windows/system/LanguagesWindow.cpp
+++ b/module-apps/application-settings/windows/system/LanguagesWindow.cpp
@@ -8,7 +8,7 @@
 
 namespace gui
 {
-    LanguagesWindow::LanguagesWindow(app::Application *app, std::string name)
+    LanguagesWindow::LanguagesWindow(app::ApplicationCommon *app, std::string name)
         : BaseSettingsWindow(app, std::move(name)), langList(loader.getAvailableDisplayLanguages())
     {
         setTitle(utils::translate("app_settings_title_languages"));
diff --git a/module-apps/application-settings/windows/system/LanguagesWindow.hpp b/module-apps/application-settings/windows/system/LanguagesWindow.hpp
index 2397c2431..b6383567a 100644
--- a/module-apps/application-settings/windows/system/LanguagesWindow.hpp
+++ b/module-apps/application-settings/windows/system/LanguagesWindow.hpp
@@ -11,7 +11,7 @@ namespace gui
     class LanguagesWindow : public BaseSettingsWindow
     {
       public:
-        explicit LanguagesWindow(app::Application *app, std::string name = window::name::languages);
+        explicit LanguagesWindow(app::ApplicationCommon *app, std::string name = window::name::languages);
 
       protected:
         auto buildOptionsList() -> std::list<Option> override;
diff --git a/module-apps/application-settings/windows/system/SARInfoWindow.cpp b/module-apps/application-settings/windows/system/SARInfoWindow.cpp
index af3ac0ad5..f0fd5d49c 100644
--- a/module-apps/application-settings/windows/system/SARInfoWindow.cpp
+++ b/module-apps/application-settings/windows/system/SARInfoWindow.cpp
@@ -10,7 +10,7 @@
 
 namespace gui
 {
-    SARInfoWindow::SARInfoWindow(app::Application *app,
+    SARInfoWindow::SARInfoWindow(app::ApplicationCommon *app,
                                  std::unique_ptr<SARInfoWindowContract::Presenter> &&windowPresenter)
         : gui::AppWindow(app, window::name::sar), presenter{std::move(windowPresenter)}
     {
diff --git a/module-apps/application-settings/windows/system/SARInfoWindow.hpp b/module-apps/application-settings/windows/system/SARInfoWindow.hpp
index 260c3f3a8..600485de9 100644
--- a/module-apps/application-settings/windows/system/SARInfoWindow.hpp
+++ b/module-apps/application-settings/windows/system/SARInfoWindow.hpp
@@ -13,7 +13,7 @@ namespace gui
     class SARInfoWindow : public gui::AppWindow, public SARInfoWindowContract::View
     {
       public:
-        explicit SARInfoWindow(app::Application *app,
+        explicit SARInfoWindow(app::ApplicationCommon *app,
                                std::unique_ptr<SARInfoWindowContract::Presenter> &&windowPresenter);
 
       private:
diff --git a/module-apps/application-settings/windows/system/SystemMainWindow.cpp b/module-apps/application-settings/windows/system/SystemMainWindow.cpp
index 0e9a5d127..4d7d28816 100644
--- a/module-apps/application-settings/windows/system/SystemMainWindow.cpp
+++ b/module-apps/application-settings/windows/system/SystemMainWindow.cpp
@@ -12,7 +12,7 @@
 
 namespace gui
 {
-    SystemMainWindow::SystemMainWindow(app::Application *app) : BaseSettingsWindow(app, window::name::system)
+    SystemMainWindow::SystemMainWindow(app::ApplicationCommon *app) : BaseSettingsWindow(app, window::name::system)
     {}
 
     auto SystemMainWindow::buildOptionsList() -> std::list<Option>
diff --git a/module-apps/application-settings/windows/system/SystemMainWindow.hpp b/module-apps/application-settings/windows/system/SystemMainWindow.hpp
index 6b4df379a..68cbf8426 100644
--- a/module-apps/application-settings/windows/system/SystemMainWindow.hpp
+++ b/module-apps/application-settings/windows/system/SystemMainWindow.hpp
@@ -10,7 +10,7 @@ namespace gui
     class SystemMainWindow : public BaseSettingsWindow
     {
       public:
-        explicit SystemMainWindow(app::Application *app);
+        explicit SystemMainWindow(app::ApplicationCommon *app);
 
       private:
         auto buildOptionsList() -> std::list<Option> override;
diff --git a/module-apps/application-settings/windows/system/TechnicalInformationWindow.cpp b/module-apps/application-settings/windows/system/TechnicalInformationWindow.cpp
index 60e775b0c..2a64cee26 100644
--- a/module-apps/application-settings/windows/system/TechnicalInformationWindow.cpp
+++ b/module-apps/application-settings/windows/system/TechnicalInformationWindow.cpp
@@ -8,7 +8,7 @@
 namespace gui
 {
     TechnicalInformationWindow::TechnicalInformationWindow(
-        app::Application *app, std::shared_ptr<TechnicalWindowContract::Presenter> technicalPresenter)
+        app::ApplicationCommon *app, std::shared_ptr<TechnicalWindowContract::Presenter> technicalPresenter)
         : AppWindow(app, gui::window::name::technical_information), presenter(std::move(technicalPresenter))
     {
         presenter->attach(this);
diff --git a/module-apps/application-settings/windows/system/TechnicalInformationWindow.hpp b/module-apps/application-settings/windows/system/TechnicalInformationWindow.hpp
index eb4d035ac..df2c7a51d 100644
--- a/module-apps/application-settings/windows/system/TechnicalInformationWindow.hpp
+++ b/module-apps/application-settings/windows/system/TechnicalInformationWindow.hpp
@@ -12,7 +12,7 @@ namespace gui
     {
 
       public:
-        TechnicalInformationWindow(app::Application *app,
+        TechnicalInformationWindow(app::ApplicationCommon *app,
                                    std::shared_ptr<TechnicalWindowContract::Presenter> presenter);
 
       private:
diff --git a/module-apps/application-special-input/ApplicationSpecialInput.cpp b/module-apps/application-special-input/ApplicationSpecialInput.cpp
index 8b2008ee4..61b09d888 100644
--- a/module-apps/application-special-input/ApplicationSpecialInput.cpp
+++ b/module-apps/application-special-input/ApplicationSpecialInput.cpp
@@ -24,7 +24,7 @@ ApplicationSpecialInput::ApplicationSpecialInput(std::string name,
         return actionHandled();
     });
 
-    windowsFactory.attach(app::char_select, [](Application *app, const std::string &name) {
+    windowsFactory.attach(app::char_select, [](ApplicationCommon *app, const std::string &name) {
         return std::make_unique<gui::SpecialInputMainWindow>(app);
     });
 
diff --git a/module-apps/application-special-input/CMakeLists.txt b/module-apps/application-special-input/CMakeLists.txt
index 75ddab206..ec0b88eeb 100644
--- a/module-apps/application-special-input/CMakeLists.txt
+++ b/module-apps/application-special-input/CMakeLists.txt
@@ -29,6 +29,7 @@ target_sources(application-special-input
 
 target_link_libraries(application-special-input
     PRIVATE
+        app
         apps-common
         i18n
         service-appmgr
diff --git a/module-apps/application-special-input/models/SpecialInputModel.cpp b/module-apps/application-special-input/models/SpecialInputModel.cpp
index bcce7593e..efd837f90 100644
--- a/module-apps/application-special-input/models/SpecialInputModel.cpp
+++ b/module-apps/application-special-input/models/SpecialInputModel.cpp
@@ -5,7 +5,7 @@
 #include "SpecialInputTableWidget.hpp"
 #include <ListView.hpp>
 
-SpecialInputModel::SpecialInputModel(app::Application *app) : application(app)
+SpecialInputModel::SpecialInputModel(app::ApplicationCommon *app) : application(app)
 {}
 
 auto SpecialInputModel::requestRecordsCount() -> unsigned int
diff --git a/module-apps/application-special-input/models/SpecialInputModel.hpp b/module-apps/application-special-input/models/SpecialInputModel.hpp
index f158f78fe..831fa4045 100644
--- a/module-apps/application-special-input/models/SpecialInputModel.hpp
+++ b/module-apps/application-special-input/models/SpecialInputModel.hpp
@@ -12,12 +12,12 @@
 class SpecialInputModel : public app::InternalModel<gui::ListItem *>, public gui::ListItemProvider
 {
   private:
-    app::Application *application = nullptr;
+    app::ApplicationCommon *application = nullptr;
     [[nodiscard]] auto getMaxGridElements() const -> ssize_t;
     void buildGrid(const std::vector<char32_t> &elements);
 
   public:
-    SpecialInputModel(app::Application *app);
+    SpecialInputModel(app::ApplicationCommon *app);
     void clearData();
     void createData(specialInputStyle::CharactersType type = specialInputStyle::CharactersType::SpecialCharacters);
 
diff --git a/module-apps/application-special-input/widgets/SpecialInputTableWidget.cpp b/module-apps/application-special-input/widgets/SpecialInputTableWidget.cpp
index ce7c968bd..1197cdabe 100644
--- a/module-apps/application-special-input/widgets/SpecialInputTableWidget.cpp
+++ b/module-apps/application-special-input/widgets/SpecialInputTableWidget.cpp
@@ -16,7 +16,7 @@ namespace gui
 
     using namespace specialInputStyle;
 
-    SpecialInputTableWidget::SpecialInputTableWidget(app::Application *app, std::list<Carrier> &&carrier)
+    SpecialInputTableWidget::SpecialInputTableWidget(app::ApplicationCommon *app, std::list<Carrier> &&carrier)
         : application(app)
     {
         setMinimumSize(specialCharacterTableWidget::window_grid_w, specialCharacterTableWidget::window_grid_h);
diff --git a/module-apps/application-special-input/widgets/SpecialInputTableWidget.hpp b/module-apps/application-special-input/widgets/SpecialInputTableWidget.hpp
index e5e168101..283833bf0 100644
--- a/module-apps/application-special-input/widgets/SpecialInputTableWidget.hpp
+++ b/module-apps/application-special-input/widgets/SpecialInputTableWidget.hpp
@@ -5,7 +5,7 @@
 
 #include "SpecialCharactersTableStyle.hpp"
 #include "SpecialInputMainWindow.hpp"
-#include <apps-common/Application.hpp>
+#include <apps-common/ApplicationCommon.hpp>
 #include <ListItem.hpp>
 #include <Text.hpp>
 #include <TextFixedSize.hpp>
@@ -29,10 +29,10 @@ namespace gui
       protected:
         void decorateActionActivated(Item *it, const std::string &str);
         GridLayout *box               = nullptr;
-        app::Application *application = nullptr;
+        app::ApplicationCommon *application = nullptr;
 
       public:
-        SpecialInputTableWidget(app::Application *app, std::list<Carrier> &&carier);
+        SpecialInputTableWidget(app::ApplicationCommon *app, std::list<Carrier> &&carier);
     };
 
 } /* namespace gui */
diff --git a/module-apps/application-special-input/windows/SpecialInputMainWindow.cpp b/module-apps/application-special-input/windows/SpecialInputMainWindow.cpp
index 41c492e78..59944f73f 100644
--- a/module-apps/application-special-input/windows/SpecialInputMainWindow.cpp
+++ b/module-apps/application-special-input/windows/SpecialInputMainWindow.cpp
@@ -10,7 +10,7 @@
 
 using namespace gui;
 
-SpecialInputMainWindow::SpecialInputMainWindow(app::Application *app)
+SpecialInputMainWindow::SpecialInputMainWindow(app::ApplicationCommon *app)
     : AppWindow(app, app::char_select), model{std::make_shared<SpecialInputModel>(this->application)}
 {
     buildInterface();
diff --git a/module-apps/application-special-input/windows/SpecialInputMainWindow.hpp b/module-apps/application-special-input/windows/SpecialInputMainWindow.hpp
index 03e045d71..a6d839567 100644
--- a/module-apps/application-special-input/windows/SpecialInputMainWindow.hpp
+++ b/module-apps/application-special-input/windows/SpecialInputMainWindow.hpp
@@ -26,7 +26,7 @@ namespace gui
         void switchPage();
 
       public:
-        SpecialInputMainWindow(app::Application *app);
+        SpecialInputMainWindow(app::ApplicationCommon *app);
         virtual ~SpecialInputMainWindow() = default;
 
         // virtual methods
diff --git a/module-apps/apps-common/Application.cpp b/module-apps/apps-common/ApplicationCommon.cpp
similarity index 81%
rename from module-apps/apps-common/Application.cpp
rename to module-apps/apps-common/ApplicationCommon.cpp
index 212bb2566..43cd416c3 100644
--- a/module-apps/apps-common/Application.cpp
+++ b/module-apps/apps-common/ApplicationCommon.cpp
@@ -1,7 +1,7 @@
 // Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include "Application.hpp"
+#include "ApplicationCommon.hpp"
 #include "Common.hpp"                         // for RefreshModes
 #include "GuiTimer.hpp"                       // for GuiTimer
 #include "Item.hpp"                           // for Item
@@ -76,7 +76,7 @@ namespace app
         return std::make_shared<ActionHandledResponse>(sys::ReturnCodes::Failure);
     }
 
-    const char *Application::stateStr(Application::State st)
+    const char *ApplicationCommon::stateStr(ApplicationCommon::State st)
     {
         switch (st) {
         case State::NONE:
@@ -98,13 +98,13 @@ namespace app
         }
     }
 
-    Application::Application(std::string name,
-                             std::string parent,
-                             sys::phone_modes::PhoneMode phoneMode,
-                             sys::bluetooth::BluetoothMode bluetoothMode,
-                             StartInBackground startInBackground,
-                             uint32_t stackDepth,
-                             sys::ServicePriority priority)
+    ApplicationCommon::ApplicationCommon(std::string name,
+                                         std::string parent,
+                                         sys::phone_modes::PhoneMode phoneMode,
+                                         sys::bluetooth::BluetoothMode bluetoothMode,
+                                         StartInBackground startInBackground,
+                                         uint32_t stackDepth,
+                                         sys::ServicePriority priority)
         : Service(std::move(name), std::move(parent), stackDepth, priority),
           default_window(gui::name::window::main_window), windowsStack(this),
           keyTranslator{std::make_unique<gui::KeyInputSimpleTranslation>()}, startInBackground{startInBackground},
@@ -165,17 +165,17 @@ namespace app
         });
     }
 
-    Application::~Application() noexcept
+    ApplicationCommon::~ApplicationCommon() noexcept
     {
         windowsStack.windows.clear();
     }
 
-    Application::State Application::getState()
+    ApplicationCommon::State ApplicationCommon::getState()
     {
         return state;
     }
 
-    void Application::setState(State st)
+    void ApplicationCommon::setState(State st)
     {
 #if DEBUG_APPLICATION_MANAGEMENT == 1
         LOG_DEBUG("[%s] (%s) -> (%s)", GetName().c_str(), stateStr(state), stateStr(st));
@@ -183,7 +183,7 @@ namespace app
         state = st;
     }
 
-    void Application::longPressTimerCallback()
+    void ApplicationCommon::longPressTimerCallback()
     {
         const auto actualTimeStamp = xTaskGetTickCount();
         if (keyTranslator->isKeyPressTimedOut(actualTimeStamp)) {
@@ -194,12 +194,12 @@ namespace app
         }
     }
 
-    void Application::clearLongPressTimeout()
+    void ApplicationCommon::clearLongPressTimeout()
     {
         keyTranslator->setPreviousKeyTimedOut(false);
     }
 
-    void Application::render(gui::RefreshModes mode)
+    void ApplicationCommon::render(gui::RefreshModes mode)
     {
         if (windowsStack.isEmpty()) {
             LOG_ERROR("Current window is not defined");
@@ -233,7 +233,7 @@ namespace app
             suspendInProgress = false;
     }
 
-    void Application::updateWindow(const std::string &windowName, std::unique_ptr<gui::SwitchData> data)
+    void ApplicationCommon::updateWindow(const std::string &windowName, std::unique_ptr<gui::SwitchData> data)
     {
         const auto currentWindow = getCurrentWindow();
         auto msg =
@@ -241,10 +241,10 @@ namespace app
         bus.sendUnicast(std::move(msg), this->GetName());
     }
 
-    void Application::switchWindow(const std::string &windowName,
-                                   gui::ShowMode cmd,
-                                   std::unique_ptr<gui::SwitchData> data,
-                                   SwitchReason reason)
+    void ApplicationCommon::switchWindow(const std::string &windowName,
+                                         gui::ShowMode cmd,
+                                         std::unique_ptr<gui::SwitchData> data,
+                                         SwitchReason reason)
     {
 
         std::string window;
@@ -269,7 +269,7 @@ namespace app
         }
     }
 
-    void Application::returnToPreviousWindow(const uint32_t times)
+    void ApplicationCommon::returnToPreviousWindow(const uint32_t times)
     {
         if (const auto prevWindow = getPrevWindow(times); prevWindow == gui::name::window::no_window) {
             app::manager::Controller::switchBack(this);
@@ -280,14 +280,14 @@ namespace app
         }
     }
 
-    void Application::popCurrentWindow()
+    void ApplicationCommon::popCurrentWindow()
     {
         if (!windowsStack.stack.empty()) {
             windowsStack.stack.pop_back();
         }
     }
 
-    void Application::popWindow(const std::string &window)
+    void ApplicationCommon::popWindow(const std::string &window)
     {
         auto popWindow = std::find(windowsStack.stack.begin(), windowsStack.stack.end(), window);
         if (popWindow != windowsStack.stack.end()) {
@@ -295,7 +295,7 @@ namespace app
         }
     }
 
-    void Application::refreshWindow(gui::RefreshModes mode)
+    void ApplicationCommon::refreshWindow(gui::RefreshModes mode)
     {
         if (not windowsStack.isEmpty()) {
             auto msg = std::make_shared<AppRefreshMessage>(mode, getCurrentWindow()->getName());
@@ -303,7 +303,7 @@ namespace app
         }
     }
 
-    sys::MessagePointer Application::DataReceivedHandler(sys::DataMessage *msgl)
+    sys::MessagePointer ApplicationCommon::DataReceivedHandler(sys::DataMessage *msgl)
     {
         auto msg = dynamic_cast<CellularNotificationMessage *>(msgl);
         if (msg != nullptr) {
@@ -348,7 +348,7 @@ namespace app
         return sys::msgNotHandled();
     }
 
-    sys::MessagePointer Application::handleAsyncResponse(sys::ResponseMessage *resp)
+    sys::MessagePointer ApplicationCommon::handleAsyncResponse(sys::ResponseMessage *resp)
     {
         if (resp != nullptr) {
             if (auto command = callbackStorage->getCallback(resp); command->execute()) {
@@ -362,7 +362,7 @@ namespace app
         }
     }
 
-    sys::MessagePointer Application::handleSignalStrengthUpdate(sys::Message *msgl)
+    sys::MessagePointer ApplicationCommon::handleSignalStrengthUpdate(sys::Message *msgl)
     {
         if ((state == State::ACTIVE_FORGROUND) && getCurrentWindow()->updateSignalStrength()) {
             refreshWindow(gui::RefreshModes::GUI_REFRESH_FAST);
@@ -370,7 +370,7 @@ namespace app
         return sys::msgHandled();
     }
 
-    sys::MessagePointer Application::handleNetworkAccessTechnologyUpdate(sys::Message *msgl)
+    sys::MessagePointer ApplicationCommon::handleNetworkAccessTechnologyUpdate(sys::Message *msgl)
     {
         if ((state == State::ACTIVE_FORGROUND) && getCurrentWindow()->updateNetworkAccessTechnology()) {
             refreshWindow(gui::RefreshModes::GUI_REFRESH_FAST);
@@ -378,7 +378,7 @@ namespace app
         return sys::msgHandled();
     }
 
-    sys::MessagePointer Application::handleInputEvent(sys::Message *msgl)
+    sys::MessagePointer ApplicationCommon::handleInputEvent(sys::Message *msgl)
     {
         AppInputEventMessage *msg = reinterpret_cast<AppInputEventMessage *>(msgl);
         if (msg->getEvent().isKeyPress()) {
@@ -393,9 +393,9 @@ namespace app
         return sys::msgHandled();
     }
 
-    sys::MessagePointer Application::handleKBDKeyEvent(sys::Message *msgl)
+    sys::MessagePointer ApplicationCommon::handleKBDKeyEvent(sys::Message *msgl)
     {
-        if (this->getState() != app::Application::State::ACTIVE_FORGROUND) {
+        if (this->getState() != app::ApplicationCommon::State::ACTIVE_FORGROUND) {
             LOG_FATAL("!!! Terrible terrible damage! application with no focus grabbed key!");
         }
         sevm::KbdMessage *msg = static_cast<sevm::KbdMessage *>(msgl);
@@ -406,7 +406,7 @@ namespace app
         return sys::msgHandled();
     }
 
-    sys::MessagePointer Application::handleBatteryStatusChange()
+    sys::MessagePointer ApplicationCommon::handleBatteryStatusChange()
     {
         if ((state == State::ACTIVE_FORGROUND) && getCurrentWindow()->updateBatteryStatus()) {
             refreshWindow(gui::RefreshModes::GUI_REFRESH_FAST);
@@ -414,7 +414,7 @@ namespace app
         return sys::msgHandled();
     }
 
-    sys::MessagePointer Application::handleMinuteUpdated(sys::Message *msgl)
+    sys::MessagePointer ApplicationCommon::handleMinuteUpdated(sys::Message *msgl)
     {
         if (state == State::ACTIVE_FORGROUND && getCurrentWindow()->updateTime()) {
             refreshWindow(gui::RefreshModes::GUI_REFRESH_FAST);
@@ -422,7 +422,7 @@ namespace app
         return sys::msgHandled();
     }
 
-    sys::MessagePointer Application::handleAction(sys::Message *msgl)
+    sys::MessagePointer ApplicationCommon::handleAction(sys::Message *msgl)
     {
         auto *msg         = static_cast<AppActionRequest *>(msgl);
         const auto action = msg->getAction();
@@ -445,7 +445,7 @@ namespace app
         return actionNotHandled();
     }
 
-    sys::MessagePointer Application::handleApplicationSwitch(sys::Message *msgl)
+    sys::MessagePointer ApplicationCommon::handleApplicationSwitch(sys::Message *msgl)
     {
         auto *msg = static_cast<AppSwitchMessage *>(msgl);
 
@@ -459,7 +459,7 @@ namespace app
         return sys::msgNotHandled();
     }
 
-    sys::MessagePointer Application::handleApplicationSwitchLaunch(sys::Message *msgl)
+    sys::MessagePointer ApplicationCommon::handleApplicationSwitchLaunch(sys::Message *msgl)
     {
         auto *msg    = static_cast<AppSwitchMessage *>(msgl);
         bool handled = false;
@@ -506,7 +506,7 @@ namespace app
         return sys::msgNotHandled();
     }
 
-    sys::MessagePointer Application::handleApplicationSwitchOnAction(sys::Message *msgl)
+    sys::MessagePointer ApplicationCommon::handleApplicationSwitchOnAction(sys::Message *msgl)
     {
         if ((state == State::ACTIVATING) || (state == State::INITIALIZING) || (state == State::ACTIVE_BACKGROUND)) {
             setState(State::ACTIVE_FORGROUND);
@@ -519,7 +519,7 @@ namespace app
         }
     }
 
-    sys::MessagePointer Application::handleSwitchWindow(sys::Message *msgl)
+    sys::MessagePointer ApplicationCommon::handleSwitchWindow(sys::Message *msgl)
     {
         auto msg = static_cast<AppSwitchWindowMessage *>(msgl);
         // check if specified window is in the application
@@ -559,7 +559,7 @@ namespace app
         return sys::msgHandled();
     }
 
-    sys::MessagePointer Application::handleUpdateWindow(sys::Message *msgl)
+    sys::MessagePointer ApplicationCommon::handleUpdateWindow(sys::Message *msgl)
     {
         auto msg = static_cast<AppUpdateWindowMessage *>(msgl);
 
@@ -575,7 +575,7 @@ namespace app
         return sys::msgHandled();
     }
 
-    sys::MessagePointer Application::handleAppClose(sys::Message *msgl)
+    sys::MessagePointer ApplicationCommon::handleAppClose(sys::Message *msgl)
     {
         setState(State::DEACTIVATING);
 
@@ -595,7 +595,7 @@ namespace app
         }
     }
 
-    void Application::checkBlockingRequests()
+    void ApplicationCommon::checkBlockingRequests()
     {
         if (getState() == State::FINALIZING_CLOSE && !callbackStorage->checkBlockingCloseRequests()) {
             LOG_INFO("Blocking requests done for [%s]. Closing application.", GetName().c_str());
@@ -604,7 +604,7 @@ namespace app
         }
     }
 
-    sys::MessagePointer Application::handleAppRebuild(sys::Message *msgl)
+    sys::MessagePointer ApplicationCommon::handleAppRebuild(sys::Message *msgl)
     {
         LOG_INFO("Application %s rebuilding gui", GetName().c_str());
         for (auto &[name, window] : windowsStack) {
@@ -619,7 +619,7 @@ namespace app
         return sys::msgHandled();
     }
 
-    sys::MessagePointer Application::handleAppRefresh(sys::Message *msgl)
+    sys::MessagePointer ApplicationCommon::handleAppRefresh(sys::Message *msgl)
     {
         auto *msg = static_cast<AppRefreshMessage *>(msgl);
         assert(msg);
@@ -633,7 +633,7 @@ namespace app
         return sys::msgHandled();
     }
 
-    sys::MessagePointer Application::handleGetDOM(sys::Message *msgl)
+    sys::MessagePointer ApplicationCommon::handleGetDOM(sys::Message *msgl)
     {
         if (windowsStack.isEmpty()) {
             LOG_ERROR("Current window is not defined - can't dump DOM");
@@ -652,7 +652,7 @@ namespace app
         return sys::msgHandled();
     }
 
-    sys::MessagePointer Application::handleAppFocusLost(sys::Message *msgl)
+    sys::MessagePointer ApplicationCommon::handleAppFocusLost(sys::Message *msgl)
     {
         if (state == State::ACTIVE_FORGROUND) {
             setState(State::ACTIVE_BACKGROUND);
@@ -661,7 +661,7 @@ namespace app
         return sys::msgHandled();
     }
 
-    sys::MessagePointer Application::handleSimStateUpdateMessage(sys::Message *msgl)
+    sys::MessagePointer ApplicationCommon::handleSimStateUpdateMessage(sys::Message *msgl)
     {
         if (getCurrentWindow()->updateSim()) {
             refreshWindow(gui::RefreshModes::GUI_REFRESH_FAST);
@@ -669,7 +669,7 @@ namespace app
         return sys::msgHandled();
     }
 
-    sys::ReturnCodes Application::InitHandler()
+    sys::ReturnCodes ApplicationCommon::InitHandler()
     {
         setState(State::INITIALIZING);
 
@@ -683,7 +683,7 @@ namespace app
         return sys::ReturnCodes::Success;
     }
 
-    sys::ReturnCodes Application::DeinitHandler()
+    sys::ReturnCodes ApplicationCommon::DeinitHandler()
     {
         settings->deinit();
         LOG_INFO("Closing an application: %s", GetName().c_str());
@@ -692,78 +692,78 @@ namespace app
         return sys::ReturnCodes::Success;
     }
 
-    void Application::setActiveWindow(const std::string &windowName)
+    void ApplicationCommon::setActiveWindow(const std::string &windowName)
     {
         pushWindow(windowName);
     }
 
-    bool Application::adjustCurrentVolume(const int step)
+    bool ApplicationCommon::adjustCurrentVolume(const int step)
     {
         return AudioServiceAPI::KeyPressed(this, step);
     }
 
-    void Application::toggleTorchOnOff()
+    void ApplicationCommon::toggleTorchOnOff()
     {
         auto msg = std::make_shared<sevm::ToggleTorchOnOffMessage>();
         bus.sendUnicast(std::move(msg), service::name::evt_manager);
     }
 
-    void Application::toggleTorchColor()
+    void ApplicationCommon::toggleTorchColor()
     {
         auto msg = std::make_shared<sevm::ToggleTorchColorMessage>();
         bus.sendUnicast(std::move(msg), service::name::evt_manager);
     }
 
-    void Application::requestAction(sys::Service *sender,
-                                    const ApplicationName &applicationName,
-                                    manager::actions::ActionId actionId,
-                                    manager::actions::ActionParamsPtr &&data)
+    void ApplicationCommon::requestAction(sys::Service *sender,
+                                          const ApplicationName &applicationName,
+                                          manager::actions::ActionId actionId,
+                                          manager::actions::ActionParamsPtr &&data)
     {
         auto msg = std::make_shared<AppActionRequest>(actionId, std::move(data));
         sender->bus.sendUnicast(msg, applicationName);
     }
 
-    void Application::messageSwitchApplication(sys::Service *sender,
-                                               std::string application,
-                                               std::string window,
-                                               std::unique_ptr<gui::SwitchData> data,
-                                               StartupReason startupReason)
+    void ApplicationCommon::messageSwitchApplication(sys::Service *sender,
+                                                     std::string application,
+                                                     std::string window,
+                                                     std::unique_ptr<gui::SwitchData> data,
+                                                     StartupReason startupReason)
     {
         auto msg = std::make_shared<AppSwitchMessage>(application, window, std::move(data), startupReason);
         sender->bus.sendUnicast(msg, application);
     }
 
-    void Application::messageCloseApplication(sys::Service *sender, std::string application)
+    void ApplicationCommon::messageCloseApplication(sys::Service *sender, std::string application)
     {
         auto msg = std::make_shared<AppMessage>(MessageType::AppClose);
         sender->bus.sendUnicast(msg, application);
     }
 
-    void Application::messageRebuildApplication(sys::Service *sender, std::string application)
+    void ApplicationCommon::messageRebuildApplication(sys::Service *sender, std::string application)
     {
         auto msg = std::make_shared<AppRebuildMessage>();
         sender->bus.sendUnicast(msg, application);
     }
 
-    void Application::messageApplicationLostFocus(sys::Service *sender, std::string application)
+    void ApplicationCommon::messageApplicationLostFocus(sys::Service *sender, std::string application)
     {
         sender->bus.sendUnicast(std::make_shared<AppLostFocusMessage>(), application);
     }
 
-    void Application::messageSwitchBack(sys::Service *sender, const std::string &application)
+    void ApplicationCommon::messageSwitchBack(sys::Service *sender, const std::string &application)
     {
         sender->bus.sendUnicast(std::make_shared<AppSwitchBackMessage>(), application);
     }
 
-    void Application::messageInputEventApplication(sys::Service *sender,
-                                                   std::string application,
-                                                   const gui::InputEvent &event)
+    void ApplicationCommon::messageInputEventApplication(sys::Service *sender,
+                                                         std::string application,
+                                                         const gui::InputEvent &event)
     {
         auto msg = std::make_shared<AppInputEventMessage>(event);
         sender->bus.sendUnicast(msg, application);
     }
 
-    void Application::handlePhoneModeChanged(sys::phone_modes::PhoneMode mode)
+    void ApplicationCommon::handlePhoneModeChanged(sys::phone_modes::PhoneMode mode)
     {
         auto flightModeSetting = settings->getValue(settings::Cellular::offlineMode, settings::SettingsScope::Global);
         bool flightMode        = flightModeSetting == "1" ? true : false;
@@ -778,7 +778,7 @@ namespace app
         }
     }
 
-    void Application::handleVolumeChanged(audio::Volume volume, audio::Context context)
+    void ApplicationCommon::handleVolumeChanged(audio::Volume volume, audio::Context context)
     {
         using namespace gui::popup;
         const auto popupName = resolveWindowName(gui::popup::ID::Volume);
@@ -790,31 +790,31 @@ namespace app
         }
     }
 
-    void Application::attachPopups(const std::vector<gui::popup::ID> &popupsList)
+    void ApplicationCommon::attachPopups(const std::vector<gui::popup::ID> &popupsList)
     {
         using namespace gui::popup;
         for (auto popup : popupsList) {
             switch (popup) {
             case ID::Volume:
-                windowsFactory.attach(window::volume_window, [](Application *app, const std::string &name) {
+                windowsFactory.attach(window::volume_window, [](ApplicationCommon *app, const std::string &name) {
                     return std::make_unique<gui::VolumeWindow>(app, window::volume_window);
                 });
                 break;
             case ID::Tethering:
             case ID::TetheringPhoneModeChangeProhibited:
                 windowsFactory.attach(window::tethering_confirmation_window,
-                                      [](Application *app, const std::string &name) {
+                                      [](ApplicationCommon *app, const std::string &name) {
                                           return std::make_unique<gui::TetheringConfirmationPopup>(
                                               app, window::tethering_confirmation_window);
                                       });
                 windowsFactory.attach(window::tethering_phonemode_change_window,
-                                      [](Application *app, const std::string &name) {
+                                      [](ApplicationCommon *app, const std::string &name) {
                                           return std::make_unique<gui::TetheringPhoneModePopup>(
                                               app, window::tethering_phonemode_change_window);
                                       });
                 break;
             case ID::PhoneModes:
-                windowsFactory.attach(window::phone_modes_window, [](Application *app, const std::string &name) {
+                windowsFactory.attach(window::phone_modes_window, [](ApplicationCommon *app, const std::string &name) {
                     return std::make_unique<gui::HomeModesWindow>(app, window::phone_modes_window);
                 });
                 break;
@@ -824,21 +824,23 @@ namespace app
             case ID::PhoneLockInput:
             case ID::PhoneLockInfo:
             case ID::PhoneLockChangeInfo:
-                windowsFactory.attach(window::phone_lock_window, [](Application *app, const std::string &name) {
+                windowsFactory.attach(window::phone_lock_window, [](ApplicationCommon *app, const std::string &name) {
                     return std::make_unique<gui::PhoneLockedWindow>(app, window::phone_lock_window);
                 });
-                windowsFactory.attach(window::phone_lock_info_window, [](Application *app, const std::string &name) {
-                    return std::make_unique<gui::PhoneLockedInfoWindow>(app, window::phone_lock_info_window);
-                });
-                windowsFactory.attach(window::phone_lock_input_window, [](Application *app, const std::string &name) {
-                    return std::make_unique<gui::PhoneLockInputWindow>(app, window::phone_lock_input_window);
-                });
+                windowsFactory.attach(
+                    window::phone_lock_info_window, [](ApplicationCommon *app, const std::string &name) {
+                        return std::make_unique<gui::PhoneLockedInfoWindow>(app, window::phone_lock_info_window);
+                    });
+                windowsFactory.attach(
+                    window::phone_lock_input_window, [](ApplicationCommon *app, const std::string &name) {
+                        return std::make_unique<gui::PhoneLockInputWindow>(app, window::phone_lock_input_window);
+                    });
                 windowsFactory.attach(window::phone_lock_change_info_window,
-                                      [](Application *app, const std::string &name) {
+                                      [](ApplicationCommon *app, const std::string &name) {
                                           return std::make_unique<gui::PhoneLockChangeInfoWindow>(
                                               app, window::phone_lock_change_info_window);
                                       });
-                windowsFactory.attach(window::power_off_window, [](Application *app, const std::string &name) {
+                windowsFactory.attach(window::power_off_window, [](ApplicationCommon *app, const std::string &name) {
                     auto presenter = std::make_unique<gui::PowerOffPresenter>(app);
                     return std::make_unique<gui::PowerOffWindow>(app, std::move(presenter));
                 });
@@ -846,15 +848,16 @@ namespace app
             case ID::SimLock:
             case ID::SimInfo:
             case ID::SimNotReady:
-                windowsFactory.attach(window::sim_unlock_window, [](Application *app, const std::string &name) {
+                windowsFactory.attach(window::sim_unlock_window, [](ApplicationCommon *app, const std::string &name) {
                     return std::make_unique<gui::SimLockInputWindow>(app, window::sim_unlock_window);
                 });
-                windowsFactory.attach(window::sim_info_window, [](Application *app, const std::string &name) {
+                windowsFactory.attach(window::sim_info_window, [](ApplicationCommon *app, const std::string &name) {
                     return std::make_unique<gui::SimInfoWindow>(app, window::sim_info_window);
                 });
-                windowsFactory.attach(window::sim_not_ready_window, [](Application *app, const std::string &name) {
-                    return std::make_unique<gui::SimNotReadyWindow>(app, window::sim_not_ready_window);
-                });
+                windowsFactory.attach(
+                    window::sim_not_ready_window, [](ApplicationCommon *app, const std::string &name) {
+                        return std::make_unique<gui::SimNotReadyWindow>(app, window::sim_not_ready_window);
+                    });
                 break;
             default:
                 break;
@@ -862,7 +865,7 @@ namespace app
         }
     }
 
-    void Application::showPopup(gui::popup::ID id, const gui::PopupRequestParams *params)
+    void ApplicationCommon::showPopup(gui::popup::ID id, const gui::PopupRequestParams *params)
     {
         using namespace gui::popup;
         if (id == ID::PhoneModes) {
@@ -900,7 +903,7 @@ namespace app
         }
     }
 
-    void Application::abortPopup(gui::popup::ID id)
+    void ApplicationCommon::abortPopup(gui::popup::ID id)
     {
         const auto popupName = gui::popup::resolveWindowName(id);
 
@@ -912,12 +915,12 @@ namespace app
         }
     }
 
-    bool Application::isPopupPermitted([[maybe_unused]] gui::popup::ID popupId) const
+    bool ApplicationCommon::isPopupPermitted([[maybe_unused]] gui::popup::ID popupId) const
     {
         return true;
     }
 
-    bool Application::popToWindow(const std::string &window)
+    bool ApplicationCommon::popToWindow(const std::string &window)
     {
         if (window == gui::name::window::no_window) {
             bool ret = false;
@@ -940,7 +943,7 @@ namespace app
         return false;
     }
 
-    void Application::pushWindow(const std::string &newWindow)
+    void ApplicationCommon::pushWindow(const std::string &newWindow)
     {
         // handle if window was already on
         LOG_DEBUG("App: %s window %s request", GetName().c_str(), newWindow.c_str());
@@ -958,7 +961,7 @@ namespace app
 #endif
     };
 
-    const std::string Application::getPrevWindow(uint32_t count) const
+    const std::string ApplicationCommon::getPrevWindow(uint32_t count) const
     {
         if (this->windowsStack.stack.size() <= 1 || count > this->windowsStack.stack.size()) {
             return gui::name::window::no_window;
@@ -966,7 +969,7 @@ namespace app
         return *std::prev(windowsStack.stack.end(), count + 1);
     }
 
-    gui::AppWindow *Application::getCurrentWindow()
+    gui::AppWindow *ApplicationCommon::getCurrentWindow()
     {
         if (windowsStack.stack.size() == 0) {
             windowsStack.push(default_window, windowsFactory.build(this, default_window));
@@ -975,7 +978,7 @@ namespace app
         return windowsStack.get(windowsStack.stack.back());
     }
 
-    bool Application::isCurrentWindow(const std::string &windowName) const noexcept
+    bool ApplicationCommon::isCurrentWindow(const std::string &windowName) const noexcept
     {
         if (windowsStack.isEmpty()) {
             return false;
@@ -983,55 +986,55 @@ namespace app
         return windowsStack.stack.back() == windowName;
     }
 
-    gui::AppWindow *Application::getWindow(const std::string &name)
+    gui::AppWindow *ApplicationCommon::getWindow(const std::string &name)
     {
         return windowsStack.get(name);
     }
 
-    void Application::connect(GuiTimer *timer, gui::Item *item)
+    void ApplicationCommon::connect(GuiTimer *timer, gui::Item *item)
     {
         item->attachTimer(timer);
     }
 
-    const gui::status_bar::Configuration &Application::getStatusBarConfiguration() const noexcept
+    const gui::status_bar::Configuration &ApplicationCommon::getStatusBarConfiguration() const noexcept
     {
         return statusBarManager->getConfiguration();
     }
 
-    void Application::addActionReceiver(manager::actions::ActionId actionId, OnActionReceived &&callback)
+    void ApplicationCommon::addActionReceiver(manager::actions::ActionId actionId, OnActionReceived &&callback)
     {
         receivers.insert_or_assign(actionId, std::move(callback));
     }
 
-    void Application::handleNotificationsChanged(std::unique_ptr<gui::SwitchData> notificationsParams)
+    void ApplicationCommon::handleNotificationsChanged(std::unique_ptr<gui::SwitchData> notificationsParams)
     {
         if (auto window = getCurrentWindow()->getName(); window == gui::popup::window::phone_lock_window) {
             switchWindow(window, std::move(notificationsParams));
         }
     }
 
-    void Application::cancelCallbacks(AsyncCallbackReceiver::Ptr receiver)
+    void ApplicationCommon::cancelCallbacks(AsyncCallbackReceiver::Ptr receiver)
     {
         callbackStorage->removeAll(receiver);
     }
 
-    auto Application::getPhoneLockSubject() noexcept -> locks::PhoneLockSubject &
+    auto ApplicationCommon::getPhoneLockSubject() noexcept -> locks::PhoneLockSubject &
     {
         return phoneLockSubject;
     }
 
-    bool Application::isPhoneLockEnabled() const noexcept
+    bool ApplicationCommon::isPhoneLockEnabled() const noexcept
     {
         return (utils::getNumericValue<bool>(
             settings->getValue(settings::SystemProperties::lockScreenPasscodeIsOn, settings::SettingsScope::Global)));
     }
 
-    auto Application::getLockPolicyHandler() noexcept -> locks::LockPolicyHandlerInterface &
+    auto ApplicationCommon::getLockPolicyHandler() noexcept -> locks::LockPolicyHandlerInterface &
     {
         return lockPolicyHandler;
     }
 
-    auto Application::getSimLockSubject() noexcept -> locks::SimLockSubject &
+    auto ApplicationCommon::getSimLockSubject() noexcept -> locks::SimLockSubject &
     {
         return simLockSubject;
     }
diff --git a/module-apps/apps-common/Application.hpp b/module-apps/apps-common/ApplicationCommon.hpp
similarity index 95%
rename from module-apps/apps-common/Application.hpp
rename to module-apps/apps-common/ApplicationCommon.hpp
index c4299f336..f6165b0e4 100644
--- a/module-apps/apps-common/Application.hpp
+++ b/module-apps/apps-common/ApplicationCommon.hpp
@@ -12,11 +12,11 @@
 #include "Service/Message.hpp" // for MessagePointer
 #include "Service/Service.hpp" // for Service
 #include "Timers/TimerHandle.hpp"
-#include "SwitchData.hpp"                  // for SwitchData
+#include "SwitchData.hpp" // for SwitchData
 #include <SystemManager/SystemManagerCommon.hpp>
 #include <hal/key_input/KeyEventDefinitions.hpp>
-#include "gui/Common.hpp"                  // for ShowMode
-#include "projdefs.h"                      // for pdMS_TO_TICKS
+#include "gui/Common.hpp" // for ShowMode
+#include "projdefs.h"     // for pdMS_TO_TICKS
 #include <PhoneModes/Observer.hpp>
 
 #include <service-appmgr/ApplicationManifest.hpp>
@@ -55,7 +55,7 @@ namespace settings
 
 namespace app
 {
-    class Application;
+    class ApplicationCommon;
     class GuiTimer;
 
     class ActionHandledResponse; // Forward declaration
@@ -122,7 +122,7 @@ namespace app
     /// This is template for creating new applications. Main difference between Application and service is that:
     /// 1. Application has access to GUI and Input
     /// 2. Application lifetime is managed with app::manager::ApplicationManager
-    class Application : public sys::Service, public AsyncCallbacksDeleter
+    class ApplicationCommon : public sys::Service, public AsyncCallbacksDeleter
     {
       public:
         /// state in which application is right now
@@ -197,17 +197,18 @@ namespace app
         sys::TimerHandle longPressTimer;
         void clearLongPressTimeout();
 
-        explicit Application(std::string name,
-                             std::string parent                          = "",
-                             sys::phone_modes::PhoneMode phoneMode       = sys::phone_modes::PhoneMode::Connected,
-                             sys::bluetooth::BluetoothMode bluetoothMode = sys::bluetooth::BluetoothMode::Disabled,
-                             StartInBackground startInBackground         = {false},
-                             uint32_t stackDepth                         = 4096,
-                             sys::ServicePriority priority               = sys::ServicePriority::Idle);
+        explicit ApplicationCommon(
+            std::string name,
+            std::string parent                          = "",
+            sys::phone_modes::PhoneMode phoneMode       = sys::phone_modes::PhoneMode::Connected,
+            sys::bluetooth::BluetoothMode bluetoothMode = sys::bluetooth::BluetoothMode::Disabled,
+            StartInBackground startInBackground         = {false},
+            uint32_t stackDepth                         = 4096,
+            sys::ServicePriority priority               = sys::ServicePriority::Idle);
 
-        virtual ~Application() noexcept;
+        virtual ~ApplicationCommon() noexcept;
 
-        Application::State getState();
+        ApplicationCommon::State getState();
         void setState(State st);
 
         /// Method responsible for rendering currently active window.
diff --git a/module-apps/apps-common/ApplicationLauncher.hpp b/module-apps/apps-common/ApplicationLauncher.hpp
index a1c779caa..5704061ba 100644
--- a/module-apps/apps-common/ApplicationLauncher.hpp
+++ b/module-apps/apps-common/ApplicationLauncher.hpp
@@ -3,8 +3,6 @@
 
 #pragma once
 
-#include "Application.hpp"
-
 namespace app
 {
     using ApplicationManifest = app::manager::ApplicationManifest;
@@ -75,7 +73,7 @@ namespace app
             return false;
         }
 
-        std::shared_ptr<Application> handle = nullptr;
+        std::shared_ptr<ApplicationCommon> handle = nullptr;
     };
 
     /// application launcher boilerplate
diff --git a/module-apps/apps-common/AsyncTask.cpp b/module-apps/apps-common/AsyncTask.cpp
index 3dba77997..bd0b3b6a4 100644
--- a/module-apps/apps-common/AsyncTask.cpp
+++ b/module-apps/apps-common/AsyncTask.cpp
@@ -2,7 +2,7 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "AsyncTask.hpp"
-#include "Application.hpp"
+#include <apps-common/ApplicationCommon.hpp>
 #include "log.hpp"
 
 namespace app
@@ -17,7 +17,7 @@ namespace app
         }
     }
 
-    void AsyncTask::execute(Application *application,
+    void AsyncTask::execute(ApplicationCommon *application,
                             AsyncCallbackReceiver::Ptr receiverObject,
                             std::optional<std::function<bool(sys::ResponseMessage *)>> callback,
                             ReceiverBehavior receiverBehavior)
@@ -47,7 +47,7 @@ namespace app
         query->setQueryListener(db::QueryCallback::fromFunction(std::move(callback)));
     }
 
-    RequestId AsyncQuery::onExecute(Application *application)
+    RequestId AsyncQuery::onExecute(ApplicationCommon *application)
     {
         const auto [result, id] = DBServiceAPI::GetQuery(application, target, std::move(query));
         if (!result) {
@@ -66,7 +66,7 @@ namespace app
         : message{std::move(message)}, serviceName{serviceName}
     {}
 
-    auto AsyncRequest::onExecute(Application *application) -> RequestId
+    auto AsyncRequest::onExecute(ApplicationCommon *application) -> RequestId
     {
         std::shared_ptr<sys::DataMessage> msg{std::move(message)};
         bool result = application->bus.sendUnicast(msg, serviceName);
diff --git a/module-apps/apps-common/AsyncTask.hpp b/module-apps/apps-common/AsyncTask.hpp
index 82a8e7f1b..e2bb80e53 100644
--- a/module-apps/apps-common/AsyncTask.hpp
+++ b/module-apps/apps-common/AsyncTask.hpp
@@ -10,7 +10,7 @@
 
 namespace app
 {
-    class Application; // Forward declaration
+    class ApplicationCommon; // Forward declaration
 
     using RequestId = std::uint64_t;
     class AsyncCallbackReceiver;
@@ -57,7 +57,7 @@ namespace app
          * @param application       Application
          * @param receiverObject    The context of receiver
          */
-        void execute(Application *application,
+        void execute(ApplicationCommon *application,
                      AsyncCallbackReceiver::Ptr receiverObject,
                      std::optional<std::function<bool(sys::ResponseMessage *)>> callback = std::nullopt,
                      ReceiverBehavior receiverBehavior                                   = ReceiverBehavior::None);
@@ -68,7 +68,7 @@ namespace app
          * @param application   Application
          * @return Request identifier, to be matched with a response.
          */
-        [[nodiscard]] virtual auto onExecute(Application *application) -> RequestId = 0;
+        [[nodiscard]] virtual auto onExecute(ApplicationCommon *application) -> RequestId = 0;
     };
 
     /**
@@ -86,7 +86,7 @@ namespace app
         void setCallback(std::unique_ptr<db::QueryListener> &&listener) noexcept;
 
       private:
-        [[nodiscard]] auto onExecute(Application *application) -> RequestId override;
+        [[nodiscard]] auto onExecute(ApplicationCommon *application) -> RequestId override;
 
         std::unique_ptr<db::Query> query;
         db::Interface::Name target;
@@ -103,7 +103,7 @@ namespace app
         void setCallback(std::function<bool> &&callback) noexcept;
 
       private:
-        [[nodiscard]] auto onExecute(Application *application) -> RequestId override;
+        [[nodiscard]] auto onExecute(ApplicationCommon *application) -> RequestId override;
 
         std::unique_ptr<sys::DataMessage> message;
         std::string serviceName;
diff --git a/module-apps/apps-common/AudioOperations.cpp b/module-apps/apps-common/AudioOperations.cpp
index 769bb5498..af69a9068 100644
--- a/module-apps/apps-common/AudioOperations.cpp
+++ b/module-apps/apps-common/AudioOperations.cpp
@@ -14,7 +14,7 @@
 
 namespace app
 {
-    AsyncAudioOperations::AsyncAudioOperations(Application *application)
+    AsyncAudioOperations::AsyncAudioOperations(ApplicationCommon *application)
         : app::AsyncCallbackReceiver{application}, application(application)
     {}
 
diff --git a/module-apps/apps-common/AudioOperations.hpp b/module-apps/apps-common/AudioOperations.hpp
index 1ea91e646..7117ed75b 100644
--- a/module-apps/apps-common/AudioOperations.hpp
+++ b/module-apps/apps-common/AudioOperations.hpp
@@ -3,13 +3,14 @@
 
 #pragma once
 
-#include <apps-common/Application.hpp>
 #include <Audio/decoder/Decoder.hpp>
 
 #include <AsyncTask.hpp>
 
 namespace app
 {
+    class ApplicationCommon;
+
     class AbstractAudioOperations
     {
       public:
@@ -29,7 +30,7 @@ namespace app
     class AsyncAudioOperations : public AbstractAudioOperations, public app::AsyncCallbackReceiver
     {
       public:
-        explicit AsyncAudioOperations(Application *application);
+        explicit AsyncAudioOperations(ApplicationCommon *application);
 
         bool play(const std::string &filePath, const OnPlayCallback &callback) override;
         bool pause(const audio::Token &token, const OnPauseCallback &callback) override;
@@ -37,6 +38,6 @@ namespace app
         bool stop(const audio::Token &token, const OnStopCallback &callback) override;
 
       private:
-        Application *application = nullptr;
+        ApplicationCommon *application = nullptr;
     };
 } // namespace app
diff --git a/module-apps/apps-common/CMakeLists.txt b/module-apps/apps-common/CMakeLists.txt
index 749e40cb5..f43513469 100644
--- a/module-apps/apps-common/CMakeLists.txt
+++ b/module-apps/apps-common/CMakeLists.txt
@@ -5,7 +5,7 @@ add_library(apps-common STATIC)
 
 target_sources(apps-common
     PRIVATE
-        Application.cpp
+        ApplicationCommon.cpp
         AsyncTask.cpp
         AudioOperations.cpp
         AudioOperations.hpp
@@ -52,6 +52,7 @@ target_sources(apps-common
         windows/OptionWindow.cpp
 
     PUBLIC
+        ApplicationCommon.hpp
         widgets/TimeSetFmtSpinner.hpp
         actions/AlarmRingingData.hpp
         actions/AlarmTriggeredAction.hpp
diff --git a/module-apps/apps-common/DatabaseModel.hpp b/module-apps/apps-common/DatabaseModel.hpp
index 8c4d0d84c..86cb83e2d 100644
--- a/module-apps/apps-common/DatabaseModel.hpp
+++ b/module-apps/apps-common/DatabaseModel.hpp
@@ -9,7 +9,7 @@
 #include <utility>
 #include <algorithm>
 
-#include "Application.hpp"
+#include <apps-common/ApplicationCommon.hpp>
 
 namespace app
 {
@@ -17,13 +17,13 @@ namespace app
     template <class T> class DatabaseModel
     {
       protected:
-        Application *application  = nullptr;
+        ApplicationCommon *application = nullptr;
         unsigned int recordsCount = std::numeric_limits<unsigned int>::max();
         int modelIndex            = 0;
         std::vector<std::shared_ptr<T>> records;
 
       public:
-        explicit DatabaseModel(Application *app) : application{app}
+        explicit DatabaseModel(ApplicationCommon *app) : application{app}
         {}
 
         virtual ~DatabaseModel()
diff --git a/module-apps/apps-common/GuiTimer.cpp b/module-apps/apps-common/GuiTimer.cpp
index 1961c96a1..46374a2ab 100644
--- a/module-apps/apps-common/GuiTimer.cpp
+++ b/module-apps/apps-common/GuiTimer.cpp
@@ -4,7 +4,7 @@
 #include "GuiTimer.hpp"
 #include "Item.hpp" // for Item
 
-#include <apps-common/Application.hpp> // for Application
+#include <apps-common/ApplicationCommon.hpp> // for Application
 
 #include "module-sys/Timers/SystemTimer.hpp" // for Timer, Timer::Type, Timer::Ty...
 #include "module-sys/Timers/TimerFactory.hpp"
@@ -27,7 +27,7 @@ namespace app
     class GuiTimer::Impl
     {
       public:
-        Impl(Application *parent,
+        Impl(ApplicationCommon *parent,
              gui::Item *item,
              const std::string &name,
              std::chrono::milliseconds timeout,
@@ -35,15 +35,21 @@ namespace app
         std::unique_ptr<sys::timer::SystemTimer> timer;
     };
 
-    GuiTimer::Impl::Impl(
-        Application *parent, gui::Item *item, const std::string &name, std::chrono::milliseconds timeout, Type type)
+    GuiTimer::Impl::Impl(ApplicationCommon *parent,
+                         gui::Item *item,
+                         const std::string &name,
+                         std::chrono::milliseconds timeout,
+                         Type type)
         : timer{std::make_unique<sys::timer::SystemTimer>(parent, name, timeout, guiTypeToSysType(type))}
     {
         timer->connect([item](sys::Timer &self) { item->onTimer(self); });
     }
 
-    GuiTimer::GuiTimer(
-        Application *parent, gui::Item *item, const std::string &name, std::chrono::milliseconds timeout, Type type)
+    GuiTimer::GuiTimer(ApplicationCommon *parent,
+                       gui::Item *item,
+                       const std::string &name,
+                       std::chrono::milliseconds timeout,
+                       Type type)
         : pimpl(std::make_unique<GuiTimer::Impl>(parent, item, name, timeout, type)), item{item}
     {}
 
@@ -72,7 +78,7 @@ namespace app
         return pimpl->timer->isActive();
     }
 
-    sys::TimerHandle GuiTimerFactory::createSingleShotTimer(Application *parent,
+    sys::TimerHandle GuiTimerFactory::createSingleShotTimer(ApplicationCommon *parent,
                                                             gui::Item *item,
                                                             const std::string &name,
                                                             std::chrono::milliseconds interval)
@@ -80,7 +86,7 @@ namespace app
         return createGuiTimer(parent, item, name, interval, GuiTimer::Type::SingleShot);
     }
 
-    sys::TimerHandle GuiTimerFactory::createPeriodicTimer(Application *parent,
+    sys::TimerHandle GuiTimerFactory::createPeriodicTimer(ApplicationCommon *parent,
                                                           gui::Item *item,
                                                           const std::string &name,
                                                           std::chrono::milliseconds interval)
@@ -88,7 +94,7 @@ namespace app
         return createGuiTimer(parent, item, name, interval, GuiTimer::Type::Periodic);
     }
 
-    sys::TimerHandle GuiTimerFactory::createGuiTimer(Application *parent,
+    sys::TimerHandle GuiTimerFactory::createGuiTimer(ApplicationCommon *parent,
                                                      gui::Item *item,
                                                      const std::string &name,
                                                      std::chrono::milliseconds interval,
diff --git a/module-apps/apps-common/GuiTimer.hpp b/module-apps/apps-common/GuiTimer.hpp
index 1cee9f4d9..d1b28433d 100644
--- a/module-apps/apps-common/GuiTimer.hpp
+++ b/module-apps/apps-common/GuiTimer.hpp
@@ -16,7 +16,7 @@ namespace gui
 
 namespace app
 {
-    class Application;
+    class ApplicationCommon;
 
     /// Proxies system timer capabilities to the gui layer
     class GuiTimer : public sys::Timer
@@ -28,7 +28,7 @@ namespace app
             Periodic
         };
 
-        GuiTimer(Application *parent,
+        GuiTimer(ApplicationCommon *parent,
                  gui::Item *item,
                  const std::string &name,
                  std::chrono::milliseconds timeout,
@@ -48,17 +48,17 @@ namespace app
     class GuiTimerFactory
     {
       public:
-        static sys::TimerHandle createSingleShotTimer(Application *parent,
+        static sys::TimerHandle createSingleShotTimer(ApplicationCommon *parent,
                                                       gui::Item *item,
                                                       const std::string &name,
                                                       std::chrono::milliseconds interval);
-        static sys::TimerHandle createPeriodicTimer(Application *parent,
+        static sys::TimerHandle createPeriodicTimer(ApplicationCommon *parent,
                                                     gui::Item *item,
                                                     const std::string &name,
                                                     std::chrono::milliseconds interval);
 
       private:
-        static sys::TimerHandle createGuiTimer(Application *parent,
+        static sys::TimerHandle createGuiTimer(ApplicationCommon *parent,
                                                gui::Item *item,
                                                const std::string &name,
                                                std::chrono::milliseconds interval,
diff --git a/module-apps/apps-common/WindowsFactory.cpp b/module-apps/apps-common/WindowsFactory.cpp
index 0248e64d6..a227cf0f7 100644
--- a/module-apps/apps-common/WindowsFactory.cpp
+++ b/module-apps/apps-common/WindowsFactory.cpp
@@ -17,7 +17,7 @@ namespace app
         return builders.find(name) != std::end(builders);
     }
 
-    auto WindowsFactory::build(Application *app, const std::string &name) -> handle
+    auto WindowsFactory::build(ApplicationCommon *app, const std::string &name) -> handle
     {
         return builders[name](app, name);
     }
diff --git a/module-apps/apps-common/WindowsFactory.hpp b/module-apps/apps-common/WindowsFactory.hpp
index 03d78a426..c123599b1 100644
--- a/module-apps/apps-common/WindowsFactory.hpp
+++ b/module-apps/apps-common/WindowsFactory.hpp
@@ -10,7 +10,7 @@
 
 namespace app
 {
-    class Application;
+    class ApplicationCommon;
 };
 
 namespace gui
@@ -24,7 +24,7 @@ namespace app
     {
       public:
         using handle  = std::unique_ptr<gui::AppWindow>;
-        using builder = std::function<handle(Application *, std::string)>;
+        using builder = std::function<handle(ApplicationCommon *, std::string)>;
 
       private:
         std::map<std::string, builder> builders;
@@ -38,6 +38,6 @@ namespace app
 
         void attach(const std::string &name, builder builder);
         [[nodiscard]] auto isRegistered(const std::string &name) const -> bool;
-        auto build(Application *app, const std::string &name) -> handle;
+        auto build(ApplicationCommon *app, const std::string &name) -> handle;
     };
 } // namespace app
diff --git a/module-apps/apps-common/WindowsStack.hpp b/module-apps/apps-common/WindowsStack.hpp
index bc3fb6da6..45d88493b 100644
--- a/module-apps/apps-common/WindowsStack.hpp
+++ b/module-apps/apps-common/WindowsStack.hpp
@@ -12,14 +12,14 @@
 namespace app
 {
 
-    class Application;
+    class ApplicationCommon;
 
     class WindowsStack
     {
-        Application *parent;
+        ApplicationCommon *parent;
 
       public:
-        WindowsStack(Application *parent) : parent(parent)
+        WindowsStack(ApplicationCommon *parent) : parent(parent)
         {}
 
         std::vector<std::string> stack;
diff --git a/module-apps/apps-common/locks/handlers/LockPolicyHandler.cpp b/module-apps/apps-common/locks/handlers/LockPolicyHandler.cpp
index 75e9911ad..e5aa3565e 100644
--- a/module-apps/apps-common/locks/handlers/LockPolicyHandler.cpp
+++ b/module-apps/apps-common/locks/handlers/LockPolicyHandler.cpp
@@ -3,7 +3,7 @@
 
 #include "LockPolicyHandler.hpp"
 #include <log.hpp>
-#include <Application.hpp>
+#include <ApplicationCommon.hpp>
 #include <gsl/assert>
 
 using namespace locks;
@@ -34,7 +34,7 @@ bool LockPolicyHandlerInterface::preventsAutoLocking()
     return true;
 }
 
-LockPolicyHandler::LockPolicyHandler(app::Application *owner,
+LockPolicyHandler::LockPolicyHandler(app::ApplicationCommon *owner,
                                      std::function<bool()> preventsAutoLockByStateCallback) noexcept
     : owner{owner}, preventsAutoLockByStateCallback(std::move(preventsAutoLockByStateCallback))
 {
diff --git a/module-apps/apps-common/locks/handlers/LockPolicyHandler.hpp b/module-apps/apps-common/locks/handlers/LockPolicyHandler.hpp
index 667ec08a3..dea344ce7 100644
--- a/module-apps/apps-common/locks/handlers/LockPolicyHandler.hpp
+++ b/module-apps/apps-common/locks/handlers/LockPolicyHandler.hpp
@@ -6,7 +6,7 @@
 namespace app
 {
     class ApplicationLauncher;
-    class Application;
+    class ApplicationCommon;
 } // namespace app
 
 namespace locks
@@ -45,14 +45,14 @@ namespace locks
 
     class LockPolicyHandler : public LockPolicyHandlerInterface
     {
-        app::Application *owner = nullptr;
+        app::ApplicationCommon *owner = nullptr;
         std::function<bool()> preventsAutoLockByStateCallback;
 
         [[nodiscard]] bool preventsAutoLockByWindow() final;
         [[nodiscard]] bool preventsAutoLockByState() const final;
 
       public:
-        explicit LockPolicyHandler(app::Application *owner,
+        explicit LockPolicyHandler(app::ApplicationCommon *owner,
                                    std::function<bool()> preventsAutoLockByStateCallback = nullptr) noexcept;
 
         void setPreventsAutoLockByStateCallback(std::function<bool()> _preventsAutoLockByStateCallback) noexcept;
diff --git a/module-apps/apps-common/locks/windows/LockInputWindow.hpp b/module-apps/apps-common/locks/windows/LockInputWindow.hpp
index 26562d1ca..9911ed3af 100644
--- a/module-apps/apps-common/locks/windows/LockInputWindow.hpp
+++ b/module-apps/apps-common/locks/windows/LockInputWindow.hpp
@@ -51,7 +51,7 @@ namespace gui
         gui::HBox *pinLabelsBox           = nullptr;
 
       protected:
-        LockInputWindow(app::Application *app, std::string name) : AppWindow(app, std::move(name))
+        LockInputWindow(app::ApplicationCommon *app, std::string name) : AppWindow(app, std::move(name))
         {}
 
         void build();
diff --git a/module-apps/apps-common/notifications/NotificationsModel.hpp b/module-apps/apps-common/notifications/NotificationsModel.hpp
index d7835c3c3..26e211820 100644
--- a/module-apps/apps-common/notifications/NotificationsModel.hpp
+++ b/module-apps/apps-common/notifications/NotificationsModel.hpp
@@ -7,7 +7,7 @@
 #include "NotificationData.hpp"
 #include "ListItemProvider.hpp"
 
-#include "Application.hpp"
+#include <apps-common/ApplicationCommon.hpp>
 #include "InternalModel.hpp"
 #include <service-appmgr/data/NotificationsChangedActionsParams.hpp>
 
diff --git a/module-apps/apps-common/options/OptionsModel.cpp b/module-apps/apps-common/options/OptionsModel.cpp
index a96b3358c..7a5b56c60 100644
--- a/module-apps/apps-common/options/OptionsModel.cpp
+++ b/module-apps/apps-common/options/OptionsModel.cpp
@@ -1,10 +1,11 @@
 // Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
+#include <ApplicationCommon.hpp>
 #include "ListView.hpp"
 #include "OptionsModel.hpp"
 
-OptionsModel::OptionsModel(app::Application *app) : application(app)
+OptionsModel::OptionsModel(app::ApplicationCommon *app) : application(app)
 {}
 
 auto OptionsModel::requestRecordsCount() -> unsigned int
diff --git a/module-apps/apps-common/options/OptionsModel.hpp b/module-apps/apps-common/options/OptionsModel.hpp
index 146edd141..820292358 100644
--- a/module-apps/apps-common/options/OptionsModel.hpp
+++ b/module-apps/apps-common/options/OptionsModel.hpp
@@ -9,10 +9,10 @@
 
 class OptionsModel : public app::InternalModel<gui::ListItem *>, public gui::ListItemProvider
 {
-    app::Application *application = nullptr;
+    app::ApplicationCommon *application = nullptr;
 
   public:
-    explicit OptionsModel(app::Application *app);
+    explicit OptionsModel(app::ApplicationCommon *app);
 
     void clearData();
     void createData(std::list<gui::Option> &optionList);
diff --git a/module-apps/apps-common/options/type/OptionCall.cpp b/module-apps/apps-common/options/type/OptionCall.cpp
index 3b1bb8049..61d0d25e6 100644
--- a/module-apps/apps-common/options/type/OptionCall.cpp
+++ b/module-apps/apps-common/options/type/OptionCall.cpp
@@ -12,7 +12,7 @@
 
 namespace gui::option
 {
-    Call::Call(app::Application *app, const ContactRecord &contact)
+    Call::Call(app::ApplicationCommon *app, const ContactRecord &contact)
     {
         assert(app != nullptr);
 
diff --git a/module-apps/apps-common/options/type/OptionCall.hpp b/module-apps/apps-common/options/type/OptionCall.hpp
index 09619f490..ef6b7dd8a 100644
--- a/module-apps/apps-common/options/type/OptionCall.hpp
+++ b/module-apps/apps-common/options/type/OptionCall.hpp
@@ -4,7 +4,7 @@
 #pragma once
 
 #include "OptionSimple.hpp"
-#include "Application.hpp"
+#include "ApplicationCommon.hpp"
 
 #include <module-db/Interface/ContactRecord.hpp>
 
@@ -13,6 +13,6 @@ namespace gui::option
     class Call : public Simple
     {
       public:
-        Call(app::Application *app, const ContactRecord &contact);
+        Call(app::ApplicationCommon *app, const ContactRecord &contact);
     };
 }; // namespace gui::option
diff --git a/module-apps/apps-common/options/type/OptionContact.cpp b/module-apps/apps-common/options/type/OptionContact.cpp
index a7c0e48ee..b2482087d 100644
--- a/module-apps/apps-common/options/type/OptionContact.cpp
+++ b/module-apps/apps-common/options/type/OptionContact.cpp
@@ -11,7 +11,7 @@
 
 namespace gui::option
 {
-    Contact::Contact(app::Application *app,
+    Contact::Contact(app::ApplicationCommon *app,
                      ContactOperation contactOperation,
                      const ContactRecord &contactRec,
                      gui::option::Arrow arrow)
@@ -38,7 +38,7 @@ namespace gui::option
         this->arrow       = arrow;
     }
 
-    bool Contact::onContactOptionClick(app::Application *app,
+    bool Contact::onContactOptionClick(app::ApplicationCommon *app,
                                        ContactOperation contactOperation,
                                        const ContactRecord &contactRecord)
     {
diff --git a/module-apps/apps-common/options/type/OptionContact.hpp b/module-apps/apps-common/options/type/OptionContact.hpp
index 03ae77e8c..d3ea885dc 100644
--- a/module-apps/apps-common/options/type/OptionContact.hpp
+++ b/module-apps/apps-common/options/type/OptionContact.hpp
@@ -5,7 +5,7 @@
 
 #include "OptionSimple.hpp"
 #include "OptionStyle.hpp"
-#include "Application.hpp"
+#include "ApplicationCommon.hpp"
 
 #include <module-db/Interface/ContactRecord.hpp>
 
@@ -14,12 +14,12 @@ namespace gui::option
     class Contact : public Simple
     {
       private:
-        bool onContactOptionClick(app::Application *app,
+        bool onContactOptionClick(app::ApplicationCommon *app,
                                   ContactOperation contactOperation,
                                   const ContactRecord &contactRecord);
 
       public:
-        Contact(app::Application *app,
+        Contact(app::ApplicationCommon *app,
                 ContactOperation contactOperation,
                 const ContactRecord &contactRec,
                 gui::option::Arrow arrow = option::Arrow::Disabled);
diff --git a/module-apps/apps-common/options/type/OptionSetting.hpp b/module-apps/apps-common/options/type/OptionSetting.hpp
index d978e9e21..01793e8e8 100644
--- a/module-apps/apps-common/options/type/OptionSetting.hpp
+++ b/module-apps/apps-common/options/type/OptionSetting.hpp
@@ -4,7 +4,7 @@
 #pragma once
 
 #include "OptionWindow.hpp"
-#include "Application.hpp"
+#include "ApplicationCommon.hpp"
 
 namespace gui::option
 {
diff --git a/module-apps/apps-common/options/type/OptionSimple.hpp b/module-apps/apps-common/options/type/OptionSimple.hpp
index 43530640a..f8d87b665 100644
--- a/module-apps/apps-common/options/type/OptionSimple.hpp
+++ b/module-apps/apps-common/options/type/OptionSimple.hpp
@@ -5,7 +5,6 @@
 
 #include "OptionBase.hpp"
 #include "OptionStyle.hpp"
-#include "Application.hpp"
 
 namespace gui::option
 {
diff --git a/module-apps/apps-common/options/type/OptionWithActiveIcons.cpp b/module-apps/apps-common/options/type/OptionWithActiveIcons.cpp
index 2f4caf14b..1cdc0d0c1 100644
--- a/module-apps/apps-common/options/type/OptionWithActiveIcons.cpp
+++ b/module-apps/apps-common/options/type/OptionWithActiveIcons.cpp
@@ -26,7 +26,7 @@ namespace
     }
 } // namespace
 
-OptionWithActiveIcons::OptionWithActiveIcons(app::Application *app,
+OptionWithActiveIcons::OptionWithActiveIcons(app::ApplicationCommon *app,
                                              std::shared_ptr<ContactRecord> contact,
                                              std::vector<BasicIcon> icons)
     : app{app}, contact{std::move(contact)}, icons{std::move(icons)}
diff --git a/module-apps/apps-common/options/type/OptionWithActiveIcons.hpp b/module-apps/apps-common/options/type/OptionWithActiveIcons.hpp
index a8cf6809b..07999e3bc 100644
--- a/module-apps/apps-common/options/type/OptionWithActiveIcons.hpp
+++ b/module-apps/apps-common/options/type/OptionWithActiveIcons.hpp
@@ -8,7 +8,7 @@
 
 namespace app
 {
-    class Application;
+    class ApplicationCommon;
 }
 
 namespace gui::option
@@ -22,12 +22,12 @@ namespace gui::option
             Call,
             AddContact
         };
-        OptionWithActiveIcons(app::Application *app,
+        OptionWithActiveIcons(app::ApplicationCommon *app,
                               std::shared_ptr<ContactRecord> contact,
                               std::vector<BasicIcon> icons);
 
       private:
-        app::Application *app;
+        app::ApplicationCommon *app;
         std::shared_ptr<ContactRecord> contact;
         std::vector<BasicIcon> icons;
         [[nodiscard]] auto build() const -> ListItem * override;
diff --git a/module-apps/apps-common/popups/HomeModesWindow.cpp b/module-apps/apps-common/popups/HomeModesWindow.cpp
index bd6f70037..ae302999d 100644
--- a/module-apps/apps-common/popups/HomeModesWindow.cpp
+++ b/module-apps/apps-common/popups/HomeModesWindow.cpp
@@ -11,7 +11,7 @@
 
 namespace gui
 {
-    HomeModesWindow::HomeModesWindow(app::Application *app, const std::string &name) : WindowWithTimer(app, name)
+    HomeModesWindow::HomeModesWindow(app::ApplicationCommon *app, const std::string &name) : WindowWithTimer(app, name)
     {
         buildInterface();
     }
diff --git a/module-apps/apps-common/popups/HomeModesWindow.hpp b/module-apps/apps-common/popups/HomeModesWindow.hpp
index c6556428a..547e79784 100644
--- a/module-apps/apps-common/popups/HomeModesWindow.hpp
+++ b/module-apps/apps-common/popups/HomeModesWindow.hpp
@@ -14,7 +14,7 @@ namespace gui
         ModesBox *modesBox = nullptr;
 
       public:
-        HomeModesWindow(app::Application *app, const std::string &name);
+        HomeModesWindow(app::ApplicationCommon *app, const std::string &name);
         void onBeforeShow(ShowMode mode, SwitchData *data) override;
         void rebuild() override;
         void buildInterface() override;
diff --git a/module-apps/apps-common/popups/PowerOffWindow.cpp b/module-apps/apps-common/popups/PowerOffWindow.cpp
index 9b63da93b..54a6fd39a 100644
--- a/module-apps/apps-common/popups/PowerOffWindow.cpp
+++ b/module-apps/apps-common/popups/PowerOffWindow.cpp
@@ -2,13 +2,15 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "PowerOffWindow.hpp"
+#include "Popups.hpp"
 
 #include <log.hpp>
 #include <messages/DialogMetadataMessage.hpp>
+#include <i18n/i18n.hpp>
 
 namespace gui
 {
-    PowerOffWindow::PowerOffWindow(app::Application *app, std::unique_ptr<PowerOffPresenter> &&presenter)
+    PowerOffWindow::PowerOffWindow(app::ApplicationCommon *app, std::unique_ptr<PowerOffPresenter> &&presenter)
         : DialogYesNo(app, popup::window::power_off_window), presenter(std::move(presenter))
     {}
 
diff --git a/module-apps/apps-common/popups/PowerOffWindow.hpp b/module-apps/apps-common/popups/PowerOffWindow.hpp
index a28d65905..8ea9bde72 100644
--- a/module-apps/apps-common/popups/PowerOffWindow.hpp
+++ b/module-apps/apps-common/popups/PowerOffWindow.hpp
@@ -13,7 +13,7 @@ namespace gui
         std::unique_ptr<PowerOffPresenter> presenter;
 
       public:
-        PowerOffWindow(app::Application *app, std::unique_ptr<PowerOffPresenter> &&presenter);
+        PowerOffWindow(app::ApplicationCommon *app, std::unique_ptr<PowerOffPresenter> &&presenter);
         void onBeforeShow(ShowMode mode, SwitchData *data) override;
     };
 
diff --git a/module-apps/apps-common/popups/TetheringConfirmationPopup.cpp b/module-apps/apps-common/popups/TetheringConfirmationPopup.cpp
index 120305202..670dc3c38 100644
--- a/module-apps/apps-common/popups/TetheringConfirmationPopup.cpp
+++ b/module-apps/apps-common/popups/TetheringConfirmationPopup.cpp
@@ -3,14 +3,14 @@
 
 #include "TetheringConfirmationPopup.hpp"
 #include "DialogMetadataMessage.hpp"
-#include "Application.hpp"
+#include "ApplicationCommon.hpp"
 
 #include <module-sys/SystemManager/messages/TetheringQuestionRequest.hpp>
 #include <service-appmgr/Controller.hpp>
 
 namespace gui
 {
-    TetheringConfirmationPopup::TetheringConfirmationPopup(app::Application *app, const std::string &name)
+    TetheringConfirmationPopup::TetheringConfirmationPopup(app::ApplicationCommon *app, const std::string &name)
         : DialogYesNo{app, name}
     {}
 
diff --git a/module-apps/apps-common/popups/TetheringConfirmationPopup.hpp b/module-apps/apps-common/popups/TetheringConfirmationPopup.hpp
index 68afc1915..0aff375cf 100644
--- a/module-apps/apps-common/popups/TetheringConfirmationPopup.hpp
+++ b/module-apps/apps-common/popups/TetheringConfirmationPopup.hpp
@@ -12,7 +12,7 @@ namespace gui
     class TetheringConfirmationPopup : public DialogYesNo
     {
       public:
-        TetheringConfirmationPopup(app::Application *app, const std::string &name);
+        TetheringConfirmationPopup(app::ApplicationCommon *app, const std::string &name);
 
         void onBeforeShow(ShowMode mode, SwitchData *data) override;
     };
diff --git a/module-apps/apps-common/popups/TetheringNotificationPopup.cpp b/module-apps/apps-common/popups/TetheringNotificationPopup.cpp
index 09569f876..5824948d1 100644
--- a/module-apps/apps-common/popups/TetheringNotificationPopup.cpp
+++ b/module-apps/apps-common/popups/TetheringNotificationPopup.cpp
@@ -3,11 +3,11 @@
 
 #include "TetheringNotificationPopup.hpp"
 
-#include <Application.hpp>
+#include <ApplicationCommon.hpp>
 
 namespace gui
 {
-    TetheringNotificationPopup::TetheringNotificationPopup(app::Application *app, const std::string &name)
+    TetheringNotificationPopup::TetheringNotificationPopup(app::ApplicationCommon *app, const std::string &name)
         : gui::DialogConfirm(app, name)
     {
         statusBar->configure(configureStatusBar(application->getStatusBarConfiguration()));
diff --git a/module-apps/apps-common/popups/TetheringNotificationPopup.hpp b/module-apps/apps-common/popups/TetheringNotificationPopup.hpp
index 5d2214543..0bc9c7e03 100644
--- a/module-apps/apps-common/popups/TetheringNotificationPopup.hpp
+++ b/module-apps/apps-common/popups/TetheringNotificationPopup.hpp
@@ -10,7 +10,7 @@ namespace gui
     class TetheringNotificationPopup : public gui::DialogConfirm
     {
       public:
-        TetheringNotificationPopup(app::Application *app, const std::string &name);
+        TetheringNotificationPopup(app::ApplicationCommon *app, const std::string &name);
 
         gui::status_bar::Configuration configureStatusBar(gui::status_bar::Configuration appConfiguration) override;
     };
diff --git a/module-apps/apps-common/popups/TetheringOffPopup.cpp b/module-apps/apps-common/popups/TetheringOffPopup.cpp
index 30e07f363..c57abaef6 100644
--- a/module-apps/apps-common/popups/TetheringOffPopup.cpp
+++ b/module-apps/apps-common/popups/TetheringOffPopup.cpp
@@ -5,13 +5,13 @@
 
 #include <log/log.hpp>
 #include <messages/DialogMetadataMessage.hpp>
-#include <apps-common/Application.hpp>
+#include <apps-common/ApplicationCommon.hpp>
 #include <SystemManager/messages/TetheringStateRequest.hpp>
 #include <service-appmgr/Controller.hpp>
 
 namespace gui
 {
-    TetheringOffPopup::TetheringOffPopup(app::Application *app, const std::string &name) : DialogYesNo{app, name}
+    TetheringOffPopup::TetheringOffPopup(app::ApplicationCommon *app, const std::string &name) : DialogYesNo{app, name}
     {
         statusBar->configure(configureStatusBar(application->getStatusBarConfiguration()));
     }
diff --git a/module-apps/apps-common/popups/TetheringOffPopup.hpp b/module-apps/apps-common/popups/TetheringOffPopup.hpp
index ac43a2e63..a9bd73e2c 100644
--- a/module-apps/apps-common/popups/TetheringOffPopup.hpp
+++ b/module-apps/apps-common/popups/TetheringOffPopup.hpp
@@ -10,7 +10,7 @@ namespace gui
     class TetheringOffPopup : public DialogYesNo
     {
       public:
-        TetheringOffPopup(app::Application *app, const std::string &name);
+        TetheringOffPopup(app::ApplicationCommon *app, const std::string &name);
         status_bar::Configuration configureStatusBar(status_bar::Configuration appConfiguration) override;
         void onBeforeShow(ShowMode mode, SwitchData *data) override;
     };
diff --git a/module-apps/apps-common/popups/TetheringPhoneModePopup.cpp b/module-apps/apps-common/popups/TetheringPhoneModePopup.cpp
index 85e41bd8e..829b475c1 100644
--- a/module-apps/apps-common/popups/TetheringPhoneModePopup.cpp
+++ b/module-apps/apps-common/popups/TetheringPhoneModePopup.cpp
@@ -3,13 +3,13 @@
 
 #include "TetheringPhoneModePopup.hpp"
 #include "DialogMetadataMessage.hpp"
-#include "Application.hpp"
+#include "ApplicationCommon.hpp"
 #include "data/PopupRequestParams.hpp"
 #include <service-appmgr/Controller.hpp>
 
 namespace gui
 {
-    TetheringPhoneModePopup::TetheringPhoneModePopup(app::Application *app, const std::string &name)
+    TetheringPhoneModePopup::TetheringPhoneModePopup(app::ApplicationCommon *app, const std::string &name)
         : TetheringNotificationPopup{app, name}
     {}
 
diff --git a/module-apps/apps-common/popups/TetheringPhoneModePopup.hpp b/module-apps/apps-common/popups/TetheringPhoneModePopup.hpp
index 04477a051..727ab9447 100644
--- a/module-apps/apps-common/popups/TetheringPhoneModePopup.hpp
+++ b/module-apps/apps-common/popups/TetheringPhoneModePopup.hpp
@@ -12,7 +12,7 @@ namespace gui
     class TetheringPhoneModePopup : public TetheringNotificationPopup
     {
       public:
-        TetheringPhoneModePopup(app::Application *app, const std::string &name);
+        TetheringPhoneModePopup(app::ApplicationCommon *app, const std::string &name);
 
         void onBeforeShow(ShowMode mode, SwitchData *data) override;
     };
diff --git a/module-apps/apps-common/popups/VolumeWindow.cpp b/module-apps/apps-common/popups/VolumeWindow.cpp
index c96683ded..b6984905c 100644
--- a/module-apps/apps-common/popups/VolumeWindow.cpp
+++ b/module-apps/apps-common/popups/VolumeWindow.cpp
@@ -3,13 +3,13 @@
 
 #include <module-gui/gui/input/InputEvent.hpp>
 #include <i18n/i18n.hpp>
-#include "Application.hpp"
+#include "ApplicationCommon.hpp"
 #include "VolumeWindow.hpp"
 #include "popups/data/PopupData.hpp"
 
 namespace gui
 {
-    VolumeWindow::VolumeWindow(app::Application *app, const std::string &name) : WindowWithTimer(app, name)
+    VolumeWindow::VolumeWindow(app::ApplicationCommon *app, const std::string &name) : WindowWithTimer(app, name)
     {
         buildInterface();
     }
diff --git a/module-apps/apps-common/popups/VolumeWindow.hpp b/module-apps/apps-common/popups/VolumeWindow.hpp
index caf101dfe..98946c48a 100644
--- a/module-apps/apps-common/popups/VolumeWindow.hpp
+++ b/module-apps/apps-common/popups/VolumeWindow.hpp
@@ -29,7 +29,7 @@ namespace style::window::volume
 
 namespace app
 {
-    class Application;
+    class ApplicationCommon;
 } // namespace app
 
 namespace gui
@@ -50,7 +50,7 @@ namespace gui
         VBarGraph *volumeBar = nullptr;
 
       public:
-        VolumeWindow(app::Application *app, const std::string &name);
+        VolumeWindow(app::ApplicationCommon *app, const std::string &name);
 
         void addVolumeText();
         void addVolumeBar();
diff --git a/module-apps/apps-common/popups/WindowWithTimer.cpp b/module-apps/apps-common/popups/WindowWithTimer.cpp
index ed52bdda2..44a66fa5e 100644
--- a/module-apps/apps-common/popups/WindowWithTimer.cpp
+++ b/module-apps/apps-common/popups/WindowWithTimer.cpp
@@ -2,7 +2,7 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "WindowWithTimer.hpp"
-#include "Application.hpp"
+#include "ApplicationCommon.hpp"
 #include "GuiTimer.hpp"
 
 namespace gui
@@ -12,7 +12,7 @@ namespace gui
         constexpr auto timerName = "PopupTimer";
     } // namespace popup
 
-    WindowWithTimer::WindowWithTimer(app::Application *app,
+    WindowWithTimer::WindowWithTimer(app::ApplicationCommon *app,
                                      const std::string &name,
                                      const std::chrono::milliseconds timeout)
         : AppWindow{app, name}, timeout{timeout}
diff --git a/module-apps/apps-common/popups/WindowWithTimer.hpp b/module-apps/apps-common/popups/WindowWithTimer.hpp
index 679fc4f03..244d356b6 100644
--- a/module-apps/apps-common/popups/WindowWithTimer.hpp
+++ b/module-apps/apps-common/popups/WindowWithTimer.hpp
@@ -16,7 +16,7 @@ namespace gui
         const std::chrono::milliseconds timeout;
 
       public:
-        explicit WindowWithTimer(app::Application *app,
+        explicit WindowWithTimer(app::ApplicationCommon *app,
                                  const std::string &name,
                                  const std::chrono::milliseconds timeout = defautTimeout);
         void destroyInterface() override;
diff --git a/module-apps/apps-common/popups/lock-popups/PhoneLockChangeInfoWindow.cpp b/module-apps/apps-common/popups/lock-popups/PhoneLockChangeInfoWindow.cpp
index 065ecbe2c..b4bb4afe1 100644
--- a/module-apps/apps-common/popups/lock-popups/PhoneLockChangeInfoWindow.cpp
+++ b/module-apps/apps-common/popups/lock-popups/PhoneLockChangeInfoWindow.cpp
@@ -8,7 +8,7 @@
 
 using namespace gui;
 
-PhoneLockChangeInfoWindow::PhoneLockChangeInfoWindow(app::Application *app, const std::string &name)
+PhoneLockChangeInfoWindow::PhoneLockChangeInfoWindow(app::ApplicationCommon *app, const std::string &name)
     : WindowWithTimer(app, name)
 {
     buildInterface();
diff --git a/module-apps/apps-common/popups/lock-popups/PhoneLockChangeInfoWindow.hpp b/module-apps/apps-common/popups/lock-popups/PhoneLockChangeInfoWindow.hpp
index c7387c97d..2d004daab 100644
--- a/module-apps/apps-common/popups/lock-popups/PhoneLockChangeInfoWindow.hpp
+++ b/module-apps/apps-common/popups/lock-popups/PhoneLockChangeInfoWindow.hpp
@@ -14,7 +14,7 @@ namespace gui
         Icon *infoIcon = nullptr;
 
       public:
-        PhoneLockChangeInfoWindow(app::Application *app, const std::string &name);
+        PhoneLockChangeInfoWindow(app::ApplicationCommon *app, const std::string &name);
 
         void buildInterface() override;
         void onBeforeShow(ShowMode mode, SwitchData *data) override;
diff --git a/module-apps/apps-common/popups/lock-popups/PhoneLockInputWindow.cpp b/module-apps/apps-common/popups/lock-popups/PhoneLockInputWindow.cpp
index 32137727b..2dd32e58a 100644
--- a/module-apps/apps-common/popups/lock-popups/PhoneLockInputWindow.cpp
+++ b/module-apps/apps-common/popups/lock-popups/PhoneLockInputWindow.cpp
@@ -11,7 +11,7 @@
 
 namespace gui
 {
-    PhoneLockInputWindow::PhoneLockInputWindow(app::Application *app, const std::string &window_name)
+    PhoneLockInputWindow::PhoneLockInputWindow(app::ApplicationCommon *app, const std::string &window_name)
         : LockInputWindow(app, window_name)
     {
         buildInterface();
diff --git a/module-apps/apps-common/popups/lock-popups/PhoneLockInputWindow.hpp b/module-apps/apps-common/popups/lock-popups/PhoneLockInputWindow.hpp
index 785ffff59..66311591c 100644
--- a/module-apps/apps-common/popups/lock-popups/PhoneLockInputWindow.hpp
+++ b/module-apps/apps-common/popups/lock-popups/PhoneLockInputWindow.hpp
@@ -15,7 +15,7 @@ namespace gui
         locks::PhoneLockInputTypeAction phoneLockInputTypeAction = locks::PhoneLockInputTypeAction::Unlock;
 
       public:
-        PhoneLockInputWindow(app::Application *app, const std::string &window_name);
+        PhoneLockInputWindow(app::ApplicationCommon *app, const std::string &window_name);
         void onBeforeShow(ShowMode mode, SwitchData *data) override;
         bool onInput(const InputEvent &inputEvent) override;
 
diff --git a/module-apps/apps-common/popups/lock-popups/PhoneLockedInfoWindow.cpp b/module-apps/apps-common/popups/lock-popups/PhoneLockedInfoWindow.cpp
index 4226f36ff..fe9d32055 100644
--- a/module-apps/apps-common/popups/lock-popups/PhoneLockedInfoWindow.cpp
+++ b/module-apps/apps-common/popups/lock-popups/PhoneLockedInfoWindow.cpp
@@ -10,7 +10,7 @@
 
 using namespace gui;
 
-PhoneLockedInfoWindow::PhoneLockedInfoWindow(app::Application *app, const std::string &name)
+PhoneLockedInfoWindow::PhoneLockedInfoWindow(app::ApplicationCommon *app, const std::string &name)
     : WindowWithTimer(app, name, std::chrono::seconds(2))
 {
     buildInterface();
diff --git a/module-apps/apps-common/popups/lock-popups/PhoneLockedInfoWindow.hpp b/module-apps/apps-common/popups/lock-popups/PhoneLockedInfoWindow.hpp
index 7fb59b3c8..ef89e3185 100644
--- a/module-apps/apps-common/popups/lock-popups/PhoneLockedInfoWindow.hpp
+++ b/module-apps/apps-common/popups/lock-popups/PhoneLockedInfoWindow.hpp
@@ -14,7 +14,7 @@ namespace gui
     class PhoneLockedInfoWindow : public WindowWithTimer
     {
       public:
-        PhoneLockedInfoWindow(app::Application *app, const std::string &name);
+        PhoneLockedInfoWindow(app::ApplicationCommon *app, const std::string &name);
         void onBeforeShow(ShowMode mode, SwitchData *data) override;
         bool onInput(const InputEvent &inputEvent) override;
         void buildInterface() override;
diff --git a/module-apps/apps-common/popups/lock-popups/PhoneLockedWindow.cpp b/module-apps/apps-common/popups/lock-popups/PhoneLockedWindow.cpp
index 0902e35ce..90ab7f502 100644
--- a/module-apps/apps-common/popups/lock-popups/PhoneLockedWindow.cpp
+++ b/module-apps/apps-common/popups/lock-popups/PhoneLockedWindow.cpp
@@ -12,7 +12,7 @@
 
 namespace gui
 {
-    PhoneLockedWindow::PhoneLockedWindow(app::Application *app, const std::string &name)
+    PhoneLockedWindow::PhoneLockedWindow(app::ApplicationCommon *app, const std::string &name)
         : AppWindow(app, name),
           notificationsModel(std::make_shared<NotificationsModel>(NotificationsListPlacement::LockedScreen))
     {
diff --git a/module-apps/apps-common/popups/lock-popups/PhoneLockedWindow.hpp b/module-apps/apps-common/popups/lock-popups/PhoneLockedWindow.hpp
index 791859d25..e48d14e63 100644
--- a/module-apps/apps-common/popups/lock-popups/PhoneLockedWindow.hpp
+++ b/module-apps/apps-common/popups/lock-popups/PhoneLockedWindow.hpp
@@ -27,7 +27,7 @@ namespace gui
         bool processLongReleaseEvent(const InputEvent &inputEvent);
 
       public:
-        PhoneLockedWindow(app::Application *app, const std::string &name);
+        PhoneLockedWindow(app::ApplicationCommon *app, const std::string &name);
 
         bool onInput(const InputEvent &inputEvent) override;
         void onBeforeShow(ShowMode mode, SwitchData *data) override;
diff --git a/module-apps/apps-common/popups/lock-popups/SimInfoWindow.cpp b/module-apps/apps-common/popups/lock-popups/SimInfoWindow.cpp
index e9ae4f832..23e1a2e06 100644
--- a/module-apps/apps-common/popups/lock-popups/SimInfoWindow.cpp
+++ b/module-apps/apps-common/popups/lock-popups/SimInfoWindow.cpp
@@ -8,7 +8,7 @@
 
 using namespace gui;
 
-SimInfoWindow::SimInfoWindow(app::Application *app, const std::string &name) : WindowWithTimer(app, name)
+SimInfoWindow::SimInfoWindow(app::ApplicationCommon *app, const std::string &name) : WindowWithTimer(app, name)
 {
     buildInterface();
 }
diff --git a/module-apps/apps-common/popups/lock-popups/SimInfoWindow.hpp b/module-apps/apps-common/popups/lock-popups/SimInfoWindow.hpp
index 0b71e4a8b..ad7dc2737 100644
--- a/module-apps/apps-common/popups/lock-popups/SimInfoWindow.hpp
+++ b/module-apps/apps-common/popups/lock-popups/SimInfoWindow.hpp
@@ -14,7 +14,7 @@ namespace gui
         Icon *infoIcon = nullptr;
 
       public:
-        SimInfoWindow(app::Application *app, const std::string &name);
+        SimInfoWindow(app::ApplicationCommon *app, const std::string &name);
 
         void buildInterface() override;
         void onBeforeShow(ShowMode mode, SwitchData *data) override;
diff --git a/module-apps/apps-common/popups/lock-popups/SimLockInputWindow.cpp b/module-apps/apps-common/popups/lock-popups/SimLockInputWindow.cpp
index 492f33a0f..6bca0daa4 100644
--- a/module-apps/apps-common/popups/lock-popups/SimLockInputWindow.cpp
+++ b/module-apps/apps-common/popups/lock-popups/SimLockInputWindow.cpp
@@ -12,7 +12,7 @@
 
 namespace gui
 {
-    SimLockInputWindow::SimLockInputWindow(app::Application *app, const std::string &window_name)
+    SimLockInputWindow::SimLockInputWindow(app::ApplicationCommon *app, const std::string &window_name)
         : LockInputWindow(app, window_name)
     {
         buildInterface();
diff --git a/module-apps/apps-common/popups/lock-popups/SimLockInputWindow.hpp b/module-apps/apps-common/popups/lock-popups/SimLockInputWindow.hpp
index 85859df41..06c6cffaa 100644
--- a/module-apps/apps-common/popups/lock-popups/SimLockInputWindow.hpp
+++ b/module-apps/apps-common/popups/lock-popups/SimLockInputWindow.hpp
@@ -19,7 +19,7 @@ namespace gui
         void setVisibleState() override;
 
       public:
-        SimLockInputWindow(app::Application *app, const std::string &window_name);
+        SimLockInputWindow(app::ApplicationCommon *app, const std::string &window_name);
         void onBeforeShow(ShowMode mode, SwitchData *data) override;
         bool onInput(const InputEvent &inputEvent) override;
 
diff --git a/module-apps/apps-common/popups/lock-popups/SimNotReadyWindow.cpp b/module-apps/apps-common/popups/lock-popups/SimNotReadyWindow.cpp
index c4fdbb8d8..5d660aee1 100644
--- a/module-apps/apps-common/popups/lock-popups/SimNotReadyWindow.cpp
+++ b/module-apps/apps-common/popups/lock-popups/SimNotReadyWindow.cpp
@@ -9,7 +9,7 @@
 
 using namespace gui;
 
-SimNotReadyWindow::SimNotReadyWindow(app::Application *app, const std::string &name) : AppWindow(app, name)
+SimNotReadyWindow::SimNotReadyWindow(app::ApplicationCommon *app, const std::string &name) : AppWindow(app, name)
 {
     buildInterface();
 }
diff --git a/module-apps/apps-common/popups/lock-popups/SimNotReadyWindow.hpp b/module-apps/apps-common/popups/lock-popups/SimNotReadyWindow.hpp
index 678905bbe..e2929b713 100644
--- a/module-apps/apps-common/popups/lock-popups/SimNotReadyWindow.hpp
+++ b/module-apps/apps-common/popups/lock-popups/SimNotReadyWindow.hpp
@@ -14,7 +14,7 @@ namespace gui
         Icon *infoIcon = nullptr;
 
       public:
-        SimNotReadyWindow(app::Application *app, const std::string &name);
+        SimNotReadyWindow(app::ApplicationCommon *app, const std::string &name);
 
         void buildInterface() override;
         status_bar::Configuration configureStatusBar(status_bar::Configuration appConfiguration) override;
diff --git a/module-apps/apps-common/popups/presenter/PowerOffPresenter.cpp b/module-apps/apps-common/popups/presenter/PowerOffPresenter.cpp
index 554b6ff6c..80c8463b5 100644
--- a/module-apps/apps-common/popups/presenter/PowerOffPresenter.cpp
+++ b/module-apps/apps-common/popups/presenter/PowerOffPresenter.cpp
@@ -7,7 +7,7 @@
 
 namespace gui
 {
-    PowerOffPresenter::PowerOffPresenter(app::Application *app) : application(app)
+    PowerOffPresenter::PowerOffPresenter(app::ApplicationCommon *app) : application(app)
     {}
 
     void PowerOffPresenter::powerOff()
diff --git a/module-apps/apps-common/popups/presenter/PowerOffPresenter.hpp b/module-apps/apps-common/popups/presenter/PowerOffPresenter.hpp
index 96ec0e481..ca76b8285 100644
--- a/module-apps/apps-common/popups/presenter/PowerOffPresenter.hpp
+++ b/module-apps/apps-common/popups/presenter/PowerOffPresenter.hpp
@@ -3,18 +3,21 @@
 
 #pragma once
 
-#include <apps-common/Application.hpp>
+namespace app
+{
+    class ApplicationCommon;
+}
 
 namespace gui
 {
     class PowerOffPresenter
     {
       public:
-        PowerOffPresenter(app::Application *app);
+        PowerOffPresenter(app::ApplicationCommon *app);
         void powerOff();
 
       private:
-        app::Application *application;
+        app::ApplicationCommon *application;
     };
 
 } // namespace gui
diff --git a/module-apps/apps-common/widgets/ActiveIconFactory.cpp b/module-apps/apps-common/widgets/ActiveIconFactory.cpp
index ab5dbf98b..c49a98556 100644
--- a/module-apps/apps-common/widgets/ActiveIconFactory.cpp
+++ b/module-apps/apps-common/widgets/ActiveIconFactory.cpp
@@ -12,7 +12,7 @@
 
 using namespace gui;
 
-ActiveIconFactory::ActiveIconFactory(app::Application *app) : app{app}
+ActiveIconFactory::ActiveIconFactory(app::ApplicationCommon *app) : app{app}
 {
     assert(app);
 }
diff --git a/module-apps/apps-common/widgets/ActiveIconFactory.hpp b/module-apps/apps-common/widgets/ActiveIconFactory.hpp
index 1bb84ede7..04ec9cf22 100644
--- a/module-apps/apps-common/widgets/ActiveIconFactory.hpp
+++ b/module-apps/apps-common/widgets/ActiveIconFactory.hpp
@@ -4,17 +4,17 @@
 #pragma once
 
 #include "ImageBox.hpp"
-#include <Application.hpp>
+#include <ApplicationCommon.hpp>
 #include <module-db/Interface/ContactRecord.hpp>
 
 namespace gui
 {
     class ActiveIconFactory
     {
-        app::Application *app;
+        app::ApplicationCommon *app;
 
       public:
-        explicit ActiveIconFactory(app::Application *app);
+        explicit ActiveIconFactory(app::ApplicationCommon *app);
 
         [[nodiscard]] auto makeCustomIcon(const UTF8 &image,
                                           std::function<bool(Item &)> onActivated,
diff --git a/module-apps/apps-common/widgets/ProgressTimerImpl.cpp b/module-apps/apps-common/widgets/ProgressTimerImpl.cpp
index 03ee3bdb9..52c7975ce 100644
--- a/module-apps/apps-common/widgets/ProgressTimerImpl.cpp
+++ b/module-apps/apps-common/widgets/ProgressTimerImpl.cpp
@@ -4,14 +4,14 @@
 #include "ProgressTimerImpl.hpp"
 #include <Text.hpp>
 #include <ProgressBar.hpp>
-#include <Application.hpp>
+#include <ApplicationCommon.hpp>
 #include <time/time_conversion.hpp>
 #include <gsl/assert>
 
 namespace app
 {
 
-    ProgressTimerImpl::ProgressTimerImpl(app::Application *app,
+    ProgressTimerImpl::ProgressTimerImpl(app::ApplicationCommon *app,
                                          gui::Item *parent,
                                          std::string timerName,
                                          std::chrono::milliseconds baseTick)
diff --git a/module-apps/apps-common/widgets/ProgressTimerImpl.hpp b/module-apps/apps-common/widgets/ProgressTimerImpl.hpp
index 5c5c0a358..eba274ca0 100644
--- a/module-apps/apps-common/widgets/ProgressTimerImpl.hpp
+++ b/module-apps/apps-common/widgets/ProgressTimerImpl.hpp
@@ -24,7 +24,7 @@ namespace app
 
     class ProgressTimerImpl : public ProgressTimer
     {
-        app::Application *app   = nullptr;
+        app::ApplicationCommon *app = nullptr;
         gui::Item *parent       = nullptr;
         gui::Text *text         = nullptr;
         gui::Progress *progress = nullptr;
@@ -52,7 +52,7 @@ namespace app
         [[nodiscard]] auto intervalReached() const noexcept -> bool;
 
       public:
-        ProgressTimerImpl(app::Application *app,
+        ProgressTimerImpl(app::ApplicationCommon *app,
                           gui::Item *parent,
                           std::string timerName,
                           std::chrono::milliseconds baseTick);
diff --git a/module-apps/apps-common/widgets/TextWithIconsWidget.cpp b/module-apps/apps-common/widgets/TextWithIconsWidget.cpp
index d5b88d1a5..66f1dad24 100644
--- a/module-apps/apps-common/widgets/TextWithIconsWidget.cpp
+++ b/module-apps/apps-common/widgets/TextWithIconsWidget.cpp
@@ -5,7 +5,7 @@
 #include <Style.hpp>
 #include <TextFixedSize.hpp>
 #include <Image.hpp>
-#include <Application.hpp>
+#include <ApplicationCommon.hpp>
 
 using namespace gui;
 
diff --git a/module-apps/apps-common/widgets/TextWithIconsWidget.hpp b/module-apps/apps-common/widgets/TextWithIconsWidget.hpp
index d88699490..afb248545 100644
--- a/module-apps/apps-common/widgets/TextWithIconsWidget.hpp
+++ b/module-apps/apps-common/widgets/TextWithIconsWidget.hpp
@@ -7,7 +7,7 @@
 #include <ImageBox.hpp>
 namespace app
 {
-    class Application;
+    class ApplicationCommon;
 }
 
 namespace gui
@@ -15,7 +15,7 @@ namespace gui
 
     class TextWithIconsWidget : public HBox
     {
-        app::Application *app = nullptr;
+        app::ApplicationCommon *app = nullptr;
 
       public:
         explicit TextWithIconsWidget(gui::Item *parent);
diff --git a/module-apps/apps-common/windows/AppWindow.cpp b/module-apps/apps-common/windows/AppWindow.cpp
index c2bceb063..8b1d98d81 100644
--- a/module-apps/apps-common/windows/AppWindow.cpp
+++ b/module-apps/apps-common/windows/AppWindow.cpp
@@ -2,7 +2,7 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "AppWindow.hpp"
-#include "Application.hpp"
+#include "ApplicationCommon.hpp"
 #include "InputEvent.hpp"
 #include "StatusBar.hpp"
 #include "status-bar/Time.hpp"
@@ -16,7 +16,7 @@ using namespace style::header;
 namespace gui
 {
 
-    AppWindow::AppWindow(app::Application *app, std::string name) : Window(name), application{app}
+    AppWindow::AppWindow(app::ApplicationCommon *app, std::string name) : Window(name), application{app}
     {
         setSize(style::window_width, style::window_height);
     }
diff --git a/module-apps/apps-common/windows/AppWindow.hpp b/module-apps/apps-common/windows/AppWindow.hpp
index 5f857ed62..f4de3d7b0 100644
--- a/module-apps/apps-common/windows/AppWindow.hpp
+++ b/module-apps/apps-common/windows/AppWindow.hpp
@@ -12,7 +12,7 @@
 
 namespace app
 {
-    class Application;
+    class ApplicationCommon;
 };
 
 namespace gui
@@ -47,7 +47,7 @@ namespace gui
         /**
          * Pointer to the application object that owns the window.
          */
-        app::Application *application = nullptr;
+        app::ApplicationCommon *application = nullptr;
 
         /**
          * A function that applies configuration changes to the current status bar configuration.
@@ -62,9 +62,9 @@ namespace gui
 
       public:
         AppWindow() = delete;
-        AppWindow(app::Application *app, std::string name);
+        AppWindow(app::ApplicationCommon *app, std::string name);
 
-        app::Application *getApplication()
+        app::ApplicationCommon *getApplication()
         {
             return application;
         };
diff --git a/module-apps/apps-common/windows/BrightnessWindow.cpp b/module-apps/apps-common/windows/BrightnessWindow.cpp
index c8fba2372..4d620da7a 100644
--- a/module-apps/apps-common/windows/BrightnessWindow.cpp
+++ b/module-apps/apps-common/windows/BrightnessWindow.cpp
@@ -7,7 +7,7 @@
 
 namespace gui
 {
-    BrightnessWindow::BrightnessWindow(app::Application *app, const std::string &name) : AppWindow(app, name)
+    BrightnessWindow::BrightnessWindow(app::ApplicationCommon *app, const std::string &name) : AppWindow(app, name)
     {
         buildInterface();
     }
diff --git a/module-apps/apps-common/windows/BrightnessWindow.hpp b/module-apps/apps-common/windows/BrightnessWindow.hpp
index 822f3e6be..a6b8dc402 100644
--- a/module-apps/apps-common/windows/BrightnessWindow.hpp
+++ b/module-apps/apps-common/windows/BrightnessWindow.hpp
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <apps-common/Application.hpp>
+#include <apps-common/ApplicationCommon.hpp>
 #include "AppWindow.hpp"
 #include "apps-common/widgets/BarGraph.hpp"
 #include "apps-common/widgets/BightnessBox.hpp"
@@ -20,7 +20,7 @@ namespace gui
         HBarGraph *brightnessBar      = nullptr;
 
       public:
-        BrightnessWindow(app::Application *app, const std::string &name);
+        BrightnessWindow(app::ApplicationCommon *app, const std::string &name);
 
         ~BrightnessWindow() override;
 
diff --git a/module-apps/apps-common/windows/Dialog.cpp b/module-apps/apps-common/windows/Dialog.cpp
index 0e7e4a827..a46f07025 100644
--- a/module-apps/apps-common/windows/Dialog.cpp
+++ b/module-apps/apps-common/windows/Dialog.cpp
@@ -5,11 +5,11 @@
 #include "DialogMetadataMessage.hpp"
 #include <i18n/i18n.hpp>
 #include <Image.hpp>
-#include <apps-common/Application.hpp>
+#include <apps-common/ApplicationCommon.hpp>
 
 using namespace gui;
 
-Dialog::Dialog(app::Application *app, const std::string &name) : gui::AppWindow(app, name)
+Dialog::Dialog(app::ApplicationCommon *app, const std::string &name) : gui::AppWindow(app, name)
 {
     AppWindow::buildInterface();
     bottomBar->setText(BottomBar::Side::RIGHT, utils::translate(style::strings::common::back));
@@ -37,7 +37,7 @@ void Dialog::onBeforeShow(ShowMode mode, SwitchData *data)
     }
 }
 
-DialogConfirm::DialogConfirm(app::Application *app, const std::string &name) : Dialog(app, name)
+DialogConfirm::DialogConfirm(app::ApplicationCommon *app, const std::string &name) : Dialog(app, name)
 {
     bottomBar->setActive(BottomBar::Side::RIGHT, false);
     bottomBar->setText(BottomBar::Side::CENTER, utils::translate(style::strings::common::ok));
@@ -60,7 +60,7 @@ void DialogConfirm::onBeforeShow(ShowMode mode, SwitchData *data)
     }
 }
 
-DialogYesNo::DialogYesNo(app::Application *app, const std::string &name) : Dialog(app, name)
+DialogYesNo::DialogYesNo(app::ApplicationCommon *app, const std::string &name) : Dialog(app, name)
 {
     icon->text->setMinimumSize(style::window::default_body_width, dialog::style::option::iconTextH);
     icon->text->setMaximumSize(style::window::default_body_width, dialog::style::option::iconTextH);
@@ -119,7 +119,7 @@ void DialogYesNo::onBeforeShow(ShowMode mode, SwitchData *data)
     }
 }
 
-DialogYesNoIconTxt::DialogYesNoIconTxt(app::Application *app, const std::string &name) : DialogYesNo(app, name)
+DialogYesNoIconTxt::DialogYesNoIconTxt(app::ApplicationCommon *app, const std::string &name) : DialogYesNo(app, name)
 {
     iconText = new Label(this,
                          style::window::default_left_margin,
@@ -143,7 +143,7 @@ void DialogYesNoIconTxt::onBeforeShow(ShowMode mode, SwitchData *data)
     }
 }
 
-DialogRetry::DialogRetry(app::Application *app, const std::string &name) : Dialog(app, name)
+DialogRetry::DialogRetry(app::ApplicationCommon *app, const std::string &name) : Dialog(app, name)
 {
     bottomBar->setText(BottomBar::Side::CENTER, utils::translate(style::strings::common::retry));
     setFocusItem(bottomBar);
diff --git a/module-apps/apps-common/windows/Dialog.hpp b/module-apps/apps-common/windows/Dialog.hpp
index fa961bb00..9b2badf84 100644
--- a/module-apps/apps-common/windows/Dialog.hpp
+++ b/module-apps/apps-common/windows/Dialog.hpp
@@ -52,7 +52,7 @@ namespace gui
         Icon *icon = nullptr;
 
       public:
-        Dialog(app::Application *app, const std::string &name);
+        Dialog(app::ApplicationCommon *app, const std::string &name);
 
         void onBeforeShow(ShowMode mode, SwitchData *data) override;
     };
@@ -64,7 +64,7 @@ namespace gui
     class DialogConfirm : public Dialog
     {
       public:
-        DialogConfirm(app::Application *app, const std::string &name);
+        DialogConfirm(app::ApplicationCommon *app, const std::string &name);
 
         void onBeforeShow(ShowMode mode, SwitchData *data) override;
     };
@@ -80,7 +80,7 @@ namespace gui
         HBox *hBox = nullptr;
 
       public:
-        DialogYesNo(app::Application *app, const std::string &name);
+        DialogYesNo(app::ApplicationCommon *app, const std::string &name);
 
         void onBeforeShow(ShowMode mode, SwitchData *data) override;
 
@@ -97,7 +97,7 @@ namespace gui
         Label *iconText = nullptr;
 
       public:
-        DialogYesNoIconTxt(app::Application *app, const std::string &name);
+        DialogYesNoIconTxt(app::ApplicationCommon *app, const std::string &name);
 
         void onBeforeShow(ShowMode mode, SwitchData *data) override;
     };
@@ -108,7 +108,7 @@ namespace gui
     class DialogRetry : public Dialog
     {
       public:
-        DialogRetry(app::Application *app, const std::string &name);
+        DialogRetry(app::ApplicationCommon *app, const std::string &name);
 
         void onBeforeShow(ShowMode mode, SwitchData *data) override;
     };
diff --git a/module-apps/apps-common/windows/OptionWindow.cpp b/module-apps/apps-common/windows/OptionWindow.cpp
index 2fdd6fad9..3639e2244 100644
--- a/module-apps/apps-common/windows/OptionWindow.cpp
+++ b/module-apps/apps-common/windows/OptionWindow.cpp
@@ -12,13 +12,13 @@
 
 namespace gui
 {
-    OptionWindow::OptionWindow(app::Application *app, const std::string &name)
+    OptionWindow::OptionWindow(app::ApplicationCommon *app, const std::string &name)
         : AppWindow(app, name), optionsModel{std::make_shared<OptionsModel>(app)}
     {
         buildInterface();
     }
 
-    OptionWindow::OptionWindow(app::Application *app, const std::string &name, std::list<Option> options)
+    OptionWindow::OptionWindow(app::ApplicationCommon *app, const std::string &name, std::list<Option> options)
         : AppWindow(app, name), optionsModel{std::make_shared<OptionsModel>(app)}, options(std::move(options))
     {
         buildInterface();
diff --git a/module-apps/apps-common/windows/OptionWindow.hpp b/module-apps/apps-common/windows/OptionWindow.hpp
index ecbca952c..fa6217065 100644
--- a/module-apps/apps-common/windows/OptionWindow.hpp
+++ b/module-apps/apps-common/windows/OptionWindow.hpp
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "Application.hpp"
+#include "ApplicationCommon.hpp"
 #include "AppWindow.hpp"
 #include "ListView.hpp"
 #include <functional>
@@ -33,8 +33,8 @@ namespace gui
         void refreshOptions(std::list<Option> &&optionList, unsigned int pageIndex);
 
       public:
-        OptionWindow(app::Application *app, const std::string &name);
-        OptionWindow(app::Application *app, const std::string &name, std::list<Option> options);
+        OptionWindow(app::ApplicationCommon *app, const std::string &name);
+        OptionWindow(app::ApplicationCommon *app, const std::string &name, std::list<Option> options);
 
         void onBeforeShow(ShowMode mode, SwitchData *data) override;
         void onClose(CloseReason reason) override;
diff --git a/module-services/service-appmgr/CMakeLists.txt b/module-services/service-appmgr/CMakeLists.txt
index cde6c3cca..8e174aa01 100644
--- a/module-services/service-appmgr/CMakeLists.txt
+++ b/module-services/service-appmgr/CMakeLists.txt
@@ -72,6 +72,7 @@ target_sources(service-appmgr
 
 target_link_libraries(service-appmgr
     PRIVATE
+        apps-common
         application-special-input
         json::json
         module-audio
@@ -79,7 +80,6 @@ target_link_libraries(service-appmgr
         service-db
         service-gui
     PUBLIC
-        apps-common
         time
 )
 
diff --git a/module-services/service-appmgr/include/service-appmgr/messages/BaseMessage.hpp b/module-services/service-appmgr/include/service-appmgr/messages/BaseMessage.hpp
index 659e55ce7..5341206ba 100644
--- a/module-services/service-appmgr/include/service-appmgr/messages/BaseMessage.hpp
+++ b/module-services/service-appmgr/include/service-appmgr/messages/BaseMessage.hpp
@@ -3,9 +3,9 @@
 
 #pragma once
 
+#include <apps-common/ApplicationCommon.hpp>
 #include <Service/Message.hpp>
 #include <MessageType.hpp>
-#include <apps-common/Application.hpp>
 
 namespace app::manager
 {
diff --git a/module-services/service-appmgr/include/service-appmgr/model/ApplicationHandle.hpp b/module-services/service-appmgr/include/service-appmgr/model/ApplicationHandle.hpp
index 5d6f1b9ec..18bd1a0f1 100644
--- a/module-services/service-appmgr/include/service-appmgr/model/ApplicationHandle.hpp
+++ b/module-services/service-appmgr/include/service-appmgr/model/ApplicationHandle.hpp
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <apps-common/Application.hpp>
+#include <apps-common/ApplicationCommon.hpp>
 
 #include <memory>
 #include <string>
@@ -18,7 +18,7 @@ namespace app::manager
     class ApplicationHandle
     {
       public:
-        using State = app::Application::State;
+        using State = app::ApplicationCommon::State;
 
         explicit ApplicationHandle(std::unique_ptr<app::ApplicationLauncher> &&_launcher);
 
diff --git a/module-services/service-appmgr/include/service-appmgr/model/ApplicationManagerCommon.hpp b/module-services/service-appmgr/include/service-appmgr/model/ApplicationManagerCommon.hpp
index ef06f3e99..9e99d6ec7 100644
--- a/module-services/service-appmgr/include/service-appmgr/model/ApplicationManagerCommon.hpp
+++ b/module-services/service-appmgr/include/service-appmgr/model/ApplicationManagerCommon.hpp
@@ -10,7 +10,6 @@
 #include "OnActionPolicy.hpp"
 #include <service-appmgr/messages/Message.hpp>
 
-#include <apps-common/Application.hpp>
 #include <apps-common/ApplicationLauncher.hpp>
 
 #include <Service/Common.hpp>
diff --git a/module-services/service-appmgr/model/ApplicationHandle.cpp b/module-services/service-appmgr/model/ApplicationHandle.cpp
index e998aa18c..a40d8f3a6 100644
--- a/module-services/service-appmgr/model/ApplicationHandle.cpp
+++ b/module-services/service-appmgr/model/ApplicationHandle.cpp
@@ -44,7 +44,7 @@ namespace app::manager
 
     auto ApplicationHandle::checkBlockClosing() const noexcept -> bool
     {
-        return launcher->handle->getState() == Application::State::FINALIZING_CLOSE;
+        return launcher->handle->getState() == ApplicationCommon::State::FINALIZING_CLOSE;
     }
 
     auto ApplicationHandle::closeable() const noexcept -> bool
diff --git a/module-services/service-appmgr/model/ApplicationManagerCommon.cpp b/module-services/service-appmgr/model/ApplicationManagerCommon.cpp
index ffa1818ce..1c9acf5e9 100644
--- a/module-services/service-appmgr/model/ApplicationManagerCommon.cpp
+++ b/module-services/service-appmgr/model/ApplicationManagerCommon.cpp
@@ -48,7 +48,7 @@ namespace app::manager
     {
         for (const auto &item : stack) {
             if (auto app = getApplication(item.appName);
-                app != nullptr && app->state() == app::Application::State::ACTIVE_FORGROUND) {
+                app != nullptr && app->state() == app::ApplicationCommon::State::ACTIVE_FORGROUND) {
                 return app;
             }
         }
@@ -61,7 +61,7 @@ namespace app::manager
             return nullptr;
         }
         auto app = getApplication(stack.front().appName);
-        return app->state() != app::Application::State::ACTIVE_FORGROUND ? app : nullptr;
+        return app->state() != app::ApplicationCommon::State::ACTIVE_FORGROUND ? app : nullptr;
     }
 
     auto ApplicationManagerBase::getPreviousApplication() const noexcept -> ApplicationHandle *
@@ -299,7 +299,7 @@ namespace app::manager
         if (app.state() == ApplicationHandle::State::ACTIVE_BACKGROUND) {
             LOG_INFO("Switching focus to application [%s] (window [%s])", app.name().c_str(), app.switchWindow.c_str());
             setState(State::AwaitingFocusConfirmation);
-            app::Application::messageSwitchApplication(
+            app::ApplicationCommon::messageSwitchApplication(
                 this, app.name(), app.switchWindow, std::move(app.switchData), StartupReason::Launch);
             return true;
         }
@@ -376,16 +376,16 @@ namespace app::manager
         LOG_DEBUG("Switch applications: [%s][%s](%s) -> [%s][%s](%s)",
                   currentlyFocusedApp->name().c_str(),
                   currentlyFocusedApp->switchWindow.c_str(),
-                  app::Application::stateStr(currentlyFocusedApp->state()),
+                  app::ApplicationCommon::stateStr(currentlyFocusedApp->state()),
                   app->name().c_str(),
                   app->switchWindow.c_str(),
-                  app::Application::stateStr(app->state()));
+                  app::ApplicationCommon::stateStr(app->state()));
 
         stack.front().isCloseable = closeCurrentlyFocusedApp;
         onApplicationSwitch(*app, std::move(msg->getData()), msg->getWindow());
         if (app->name() == currentlyFocusedApp->name()) {
             // Switch window only.
-            app::Application::messageSwitchApplication(
+            app::ApplicationCommon::messageSwitchApplication(
                 this, app->name(), app->switchWindow, std::move(app->switchData), StartupReason::Launch);
             return false;
         }
@@ -412,12 +412,12 @@ namespace app::manager
         if (isCloseable) {
             LOG_INFO("Closing application %s", app.name().c_str());
             setState(State::AwaitingCloseConfirmation);
-            app::Application::messageCloseApplication(this, app.name());
+            app::ApplicationCommon::messageCloseApplication(this, app.name());
         }
         else {
             LOG_INFO("Application %s is about to lose focus.", app.name().c_str());
             setState(State::AwaitingLostFocusConfirmation);
-            app::Application::messageApplicationLostFocus(this, app.name());
+            app::ApplicationCommon::messageApplicationLostFocus(this, app.name());
         }
     }
 
@@ -494,7 +494,7 @@ namespace app::manager
 
         if (targetApp->state() == ApplicationHandle::State::ACTIVE_FORGROUND ||
             targetApp->state() == ApplicationHandle::State::ACTIVE_BACKGROUND) {
-            app::Application::requestAction(this, targetName, action.actionId, std::move(action.params));
+            app::ApplicationCommon::requestAction(this, targetName, action.actionId, std::move(action.params));
             return ActionProcessStatus::Accepted;
         }
         return ActionProcessStatus::Skipped;
@@ -508,7 +508,7 @@ namespace app::manager
         }
         action.setTargetApplication(targetApp->name());
         auto &params = action.params;
-        app::Application::requestAction(this, targetApp->name(), action.actionId, std::move(params));
+        app::ApplicationCommon::requestAction(this, targetApp->name(), action.actionId, std::move(params));
         return ActionProcessStatus::Accepted;
     }
 
@@ -528,7 +528,7 @@ namespace app::manager
         action.setTargetApplication(targetApp->name());
         auto &actionParams = action.params;
         if (const auto state = targetApp->state(); state == ApplicationHandle::State::ACTIVE_FORGROUND) {
-            app::Application::requestAction(this, targetApp->name(), action.actionId, std::move(actionParams));
+            app::ApplicationCommon::requestAction(this, targetApp->name(), action.actionId, std::move(actionParams));
             return ActionProcessStatus::Accepted;
         }
         else if (state == ApplicationHandle::State::ACTIVE_BACKGROUND) {
@@ -554,7 +554,7 @@ namespace app::manager
     {
         if (const auto actionFlag = app->actionFlag(action.actionId);
             actionFlag == actions::ActionFlag::AcceptWhenInBackground) {
-            app::Application::requestAction(this, app->name(), action.actionId, std::move(action.params));
+            app::ApplicationCommon::requestAction(this, app->name(), action.actionId, std::move(action.params));
             return ActionProcessStatus::Accepted;
         }
         return ActionProcessStatus::Dropped;
@@ -579,17 +579,17 @@ namespace app::manager
         if (previousApp->name() == currentlyFocusedApp->name()) {
             // Switch window only.
             onApplicationSwitchToPrev(*previousApp, std::move(msg->getData()));
-            app::Application::messageSwitchBack(this, currentlyFocusedApp->name());
+            app::ApplicationCommon::messageSwitchBack(this, currentlyFocusedApp->name());
             return true;
         }
 
         LOG_DEBUG("Switch applications: [%s][%s](%s) -> [%s][%s](%s)",
                   currentlyFocusedApp->name().c_str(),
                   currentlyFocusedApp->switchWindow.c_str(),
-                  app::Application::stateStr(currentlyFocusedApp->state()),
+                  app::ApplicationCommon::stateStr(currentlyFocusedApp->state()),
                   previousApp->name().c_str(),
                   previousApp->switchWindow.c_str(),
-                  app::Application::stateStr(previousApp->state()));
+                  app::ApplicationCommon::stateStr(previousApp->state()));
 
         onApplicationSwitchToPrev(*previousApp, std::move(msg->getData()));
         requestApplicationClose(*currentlyFocusedApp, isApplicationCloseable(currentlyFocusedApp));
@@ -642,7 +642,7 @@ namespace app::manager
             app.setState(ApplicationHandle::State::ACTIVATING);
             setState(State::AwaitingFocusConfirmation);
 
-            app::Application::messageSwitchApplication(
+            app::ApplicationCommon::messageSwitchApplication(
                 this, app.name(), app.switchWindow, std::move(app.switchData), launchingApp->startupReason);
         }
     }
@@ -686,7 +686,7 @@ namespace app::manager
             if (app && app->valid()) {
                 if (const auto appState = app->state(); appState == ApplicationHandle::State::ACTIVE_FORGROUND ||
                                                         appState == ApplicationHandle::State::ACTIVE_BACKGROUND) {
-                    app::Application::messageRebuildApplication(this, app->name());
+                    app::ApplicationCommon::messageRebuildApplication(this, app->name());
                 }
             }
         }
@@ -699,8 +699,9 @@ namespace app::manager
             LOG_ERROR("Failed to switch to %s. No such application.", msg->getSenderName().c_str());
             return false;
         }
-        LOG_INFO(
-            "Switch confirmed by %s (%s).", senderApp->name().c_str(), app::Application::stateStr(senderApp->state()));
+        LOG_INFO("Switch confirmed by %s (%s).",
+                 senderApp->name().c_str(),
+                 app::ApplicationCommon::stateStr(senderApp->state()));
         return onSwitchConfirmed(*senderApp);
     }
 
@@ -749,7 +750,7 @@ namespace app::manager
             break;
         default: {
             auto &params = action->params;
-            app::Application::requestAction(this, app.name(), action->actionId, std::move(params));
+            app::ApplicationCommon::requestAction(this, app.name(), action->actionId, std::move(params));
             break;
         }
         }
diff --git a/module-services/service-bluetooth/service-bluetooth/BluetoothDevicesModel.cpp b/module-services/service-bluetooth/service-bluetooth/BluetoothDevicesModel.cpp
index 98c08e0e4..1aef31d07 100644
--- a/module-services/service-bluetooth/service-bluetooth/BluetoothDevicesModel.cpp
+++ b/module-services/service-bluetooth/service-bluetooth/BluetoothDevicesModel.cpp
@@ -2,6 +2,7 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "BluetoothDevicesModel.hpp"
+#include <module-sys/Service/Service.hpp>
 #include <service-bluetooth/messages/BondedDevices.hpp>
 
 BluetoothDevicesModel::BluetoothDevicesModel(sys::Service *service) : service{service}
diff --git a/module-services/service-bluetooth/service-bluetooth/BluetoothDevicesModel.hpp b/module-services/service-bluetooth/service-bluetooth/BluetoothDevicesModel.hpp
index 30273678d..2b7a34c84 100644
--- a/module-services/service-bluetooth/service-bluetooth/BluetoothDevicesModel.hpp
+++ b/module-services/service-bluetooth/service-bluetooth/BluetoothDevicesModel.hpp
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include "Application.hpp"
 #include <Device.hpp>
 #include "service-bluetooth/messages/SyncDevices.hpp"
 extern "C"
diff --git a/module-services/service-db/ServiceDBCommon.cpp b/module-services/service-db/ServiceDBCommon.cpp
index c5bad8999..f83a18097 100644
--- a/module-services/service-db/ServiceDBCommon.cpp
+++ b/module-services/service-db/ServiceDBCommon.cpp
@@ -3,8 +3,8 @@
 
 #include <service-db/DBNotificationMessage.hpp>
 #include <service-db/DBServiceName.hpp>
+#include <service-db/QueryMessage.hpp>
 #include <service-db/ServiceDBCommon.hpp>
-#include <service-db/agents/quotes/QuotesAgent.cpp>
 
 #include <purefs/filesystem_paths.hpp>
 
diff --git a/module-services/service-db/agents/quotes/QuotesAgent.cpp b/module-services/service-db/agents/quotes/QuotesAgent.cpp
index 14d5aa628..2d1e73f47 100644
--- a/module-services/service-db/agents/quotes/QuotesAgent.cpp
+++ b/module-services/service-db/agents/quotes/QuotesAgent.cpp
@@ -4,7 +4,7 @@
 #include "QuotesAgent.hpp"
 #include "QuotesQueries.hpp"
 
-#include <Application.hpp>
+//#include <Application.hpp>
 #include <Common/Query.hpp>
 
 namespace Quotes
diff --git a/module-sys/SystemManager/SystemManagerCommon.cpp b/module-sys/SystemManager/SystemManagerCommon.cpp
index 9d9c02ebb..50a52e053 100644
--- a/module-sys/SystemManager/SystemManagerCommon.cpp
+++ b/module-sys/SystemManager/SystemManagerCommon.cpp
@@ -3,6 +3,7 @@
 
 #include "SystemManagerCommon.hpp"
 
+#include <apps-common/ApplicationCommon.hpp>
 #include "DependencyGraph.hpp"
 #include "graph/TopologicalSort.hpp"
 
@@ -301,7 +302,9 @@ namespace sys
         return RunService(std::move(service), caller, timeout);
     }
 
-    bool SystemManagerCommon::RunApplication(std::shared_ptr<app::Application> app, Service *caller, TickType_t timeout)
+    bool SystemManagerCommon::RunApplication(std::shared_ptr<app::ApplicationCommon> app,
+                                             Service *caller,
+                                             TickType_t timeout)
     {
         CriticalSection::Enter();
         applicationsList.push_back(app);
@@ -366,10 +369,10 @@ namespace sys
     {
         cpp_freertos::LockGuard lck(appDestroyMutex);
         if (RequestServiceClose(name, caller)) {
-            auto app =
-                std::find_if(applicationsList.begin(),
-                             applicationsList.end(),
-                             [&name](std::shared_ptr<app::Application> const &s) { return s->GetName() == name; });
+            auto app = std::find_if(
+                applicationsList.begin(),
+                applicationsList.end(),
+                [&name](std::shared_ptr<app::ApplicationCommon> const &s) { return s->GetName() == name; });
             if (app == applicationsList.end()) {
                 LOG_ERROR("No such application to destroy in the list: %s", name.c_str());
                 return false;
@@ -677,7 +680,7 @@ namespace sys
     }
 
     std::vector<std::shared_ptr<Service>> SystemManagerCommon::servicesList;
-    std::vector<std::shared_ptr<app::Application>> SystemManagerCommon::applicationsList;
+    std::vector<std::shared_ptr<app::ApplicationCommon>> SystemManagerCommon::applicationsList;
     cpp_freertos::MutexStandard SystemManagerCommon::serviceDestroyMutex;
     cpp_freertos::MutexStandard SystemManagerCommon::appDestroyMutex;
     std::unique_ptr<PowerManager> SystemManagerCommon::powerManager;
diff --git a/module-sys/SystemManager/SystemManagerCommon.hpp b/module-sys/SystemManager/SystemManagerCommon.hpp
index 207b1861f..c562abd25 100644
--- a/module-sys/SystemManager/SystemManagerCommon.hpp
+++ b/module-sys/SystemManager/SystemManagerCommon.hpp
@@ -19,7 +19,11 @@
 #include "DeviceManager.hpp"
 #include <chrono>
 #include <vector>
-#include <apps-common/Application.hpp>
+
+namespace app
+{
+    class ApplicationCommon;
+}
 
 namespace sys
 {
@@ -106,7 +110,9 @@ namespace sys
         /// Runs a service
         static bool RunSystemService(std::shared_ptr<Service> service, Service *caller, TickType_t timeout = 5000);
         /// Runs an application
-        static bool RunApplication(std::shared_ptr<app::Application> app, Service *caller, TickType_t timeout = 5000);
+        static bool RunApplication(std::shared_ptr<app::ApplicationCommon> app,
+                                   Service *caller,
+                                   TickType_t timeout = 5000);
 
         /// Destroy existing service
         /// @note there is no fallback
@@ -193,7 +199,7 @@ namespace sys
         std::shared_ptr<sys::CpuSentinel> cpuSentinel;
 
         static std::vector<std::shared_ptr<Service>> servicesList;
-        static std::vector<std::shared_ptr<app::Application>> applicationsList;
+        static std::vector<std::shared_ptr<app::ApplicationCommon>> applicationsList;
         static cpp_freertos::MutexStandard serviceDestroyMutex;
         static cpp_freertos::MutexStandard appDestroyMutex;
         static std::unique_ptr<PowerManager> powerManager;
diff --git a/products/BellHybrid/apps/common/src/ApplicationBell.cpp b/products/BellHybrid/apps/Application.cpp
similarity index 77%
rename from products/BellHybrid/apps/common/src/ApplicationBell.cpp
rename to products/BellHybrid/apps/Application.cpp
index 9a24e5310..5c6f1dbc5 100644
--- a/products/BellHybrid/apps/common/src/ApplicationBell.cpp
+++ b/products/BellHybrid/apps/Application.cpp
@@ -1,12 +1,12 @@
 // Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include <common/ApplicationBell.hpp>
+#include <Application.hpp>
 #include <common/popups/AlarmActivatedWindow.hpp>
 
 namespace app
 {
-    void ApplicationBell::attachPopups(const std::vector<gui::popup::ID> &popupsList)
+    void Application::attachPopups(const std::vector<gui::popup::ID> &popupsList)
     {
         using namespace gui::popup;
         app::Application::attachPopups(popupsList);
@@ -14,7 +14,7 @@ namespace app
             switch (popup) {
             case ID::AlarmActivated:
                 windowsFactory.attach(window::alarm_activated_window,
-                                      [](app::Application *app, const std::string &name) {
+                                      [](app::ApplicationCommon *app, const std::string &name) {
                                           return std::make_unique<gui::AlarmActivatedWindow>(app);
                                       });
                 break;
diff --git a/products/BellHybrid/apps/CMakeLists.txt b/products/BellHybrid/apps/CMakeLists.txt
index ee61d1e0b..81a0c579a 100644
--- a/products/BellHybrid/apps/CMakeLists.txt
+++ b/products/BellHybrid/apps/CMakeLists.txt
@@ -1,3 +1,23 @@
+add_library(app STATIC)
+
+target_sources(app
+    PRIVATE
+        Application.cpp
+    PUBLIC
+        include/Application.hpp
+)
+
+target_include_directories(app
+    PUBLIC
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+)
+
+target_link_libraries(app
+    PRIVATE
+        apps-common
+        bell::app-common
+)
+
 add_subdirectory(application-bell-main)
 add_subdirectory(application-bell-alarm)
 add_subdirectory(application-bell-settings)
diff --git a/products/BellHybrid/apps/application-bell-alarm/ApplicationBellAlarm.cpp b/products/BellHybrid/apps/application-bell-alarm/ApplicationBellAlarm.cpp
index 3a032855b..ea1d264bc 100644
--- a/products/BellHybrid/apps/application-bell-alarm/ApplicationBellAlarm.cpp
+++ b/products/BellHybrid/apps/application-bell-alarm/ApplicationBellAlarm.cpp
@@ -12,7 +12,7 @@ namespace app
                                                sys::phone_modes::PhoneMode mode,
                                                sys::bluetooth::BluetoothMode bluetoothMode,
                                                StartInBackground startInBackground)
-        : ApplicationBell(std::move(name), std::move(parent), mode, bluetoothMode, startInBackground)
+        : Application(std::move(name), std::move(parent), mode, bluetoothMode, startInBackground)
     {}
 
     sys::ReturnCodes ApplicationBellAlarm::InitHandler()
@@ -29,7 +29,7 @@ namespace app
 
     void ApplicationBellAlarm::createUserInterface()
     {
-        windowsFactory.attach(gui::name::window::main_window, [](Application *app, const std::string &name) {
+        windowsFactory.attach(gui::name::window::main_window, [](ApplicationCommon *app, const std::string &name) {
             auto presenter = std::make_unique<bell_alarm::BellAlarmWindowPresenter>();
             return std::make_unique<gui::BellAlarmWindow>(app, std::move(presenter));
         });
diff --git a/products/BellHybrid/apps/application-bell-alarm/CMakeLists.txt b/products/BellHybrid/apps/application-bell-alarm/CMakeLists.txt
index f0c0c6843..c5a4c6dc9 100644
--- a/products/BellHybrid/apps/application-bell-alarm/CMakeLists.txt
+++ b/products/BellHybrid/apps/application-bell-alarm/CMakeLists.txt
@@ -24,6 +24,7 @@ target_include_directories(application-bell-alarm
 
 target_link_libraries(application-bell-alarm
     PRIVATE
+        app
         bell::app-common
         module-gui
 )
diff --git a/products/BellHybrid/apps/application-bell-alarm/include/application-bell-alarm/ApplicationBellAlarm.hpp b/products/BellHybrid/apps/application-bell-alarm/include/application-bell-alarm/ApplicationBellAlarm.hpp
index 88ab5cdb9..3e13903c0 100644
--- a/products/BellHybrid/apps/application-bell-alarm/include/application-bell-alarm/ApplicationBellAlarm.hpp
+++ b/products/BellHybrid/apps/application-bell-alarm/include/application-bell-alarm/ApplicationBellAlarm.hpp
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <common/ApplicationBell.hpp>
+#include <Application.hpp>
 
 namespace gui::window::name
 {
@@ -14,7 +14,7 @@ namespace app
 {
     inline constexpr auto applicationBellAlarmName = "ApplicationBellAlarm";
 
-    class ApplicationBellAlarm : public ApplicationBell
+    class ApplicationBellAlarm : public Application
     {
       public:
         explicit ApplicationBellAlarm(
diff --git a/products/BellHybrid/apps/application-bell-alarm/windows/BellAlarmWindow.cpp b/products/BellHybrid/apps/application-bell-alarm/windows/BellAlarmWindow.cpp
index 8bba11698..93b473540 100644
--- a/products/BellHybrid/apps/application-bell-alarm/windows/BellAlarmWindow.cpp
+++ b/products/BellHybrid/apps/application-bell-alarm/windows/BellAlarmWindow.cpp
@@ -16,7 +16,7 @@
 namespace gui
 {
     BellAlarmWindow::BellAlarmWindow(
-        app::Application *app,
+        app::ApplicationCommon *app,
         std::unique_ptr<app::bell_alarm::BellAlarmWindowContract::Presenter> &&windowPresenter,
         std::string name)
         : AppWindow(app, std::move(name)), presenter{std::move(windowPresenter)}
diff --git a/products/BellHybrid/apps/application-bell-alarm/windows/BellAlarmWindow.hpp b/products/BellHybrid/apps/application-bell-alarm/windows/BellAlarmWindow.hpp
index 9f902132b..4a0709b17 100644
--- a/products/BellHybrid/apps/application-bell-alarm/windows/BellAlarmWindow.hpp
+++ b/products/BellHybrid/apps/application-bell-alarm/windows/BellAlarmWindow.hpp
@@ -16,7 +16,7 @@ namespace gui
     class BellAlarmWindow : public AppWindow, public app::bell_alarm::BellAlarmWindowContract::View
     {
       public:
-        explicit BellAlarmWindow(app::Application *app,
+        explicit BellAlarmWindow(app::ApplicationCommon *app,
                                  std::unique_ptr<app::bell_alarm::BellAlarmWindowContract::Presenter> &&windowPresenter,
                                  std::string name = window::name::bellAlarm);
 
diff --git a/products/BellHybrid/apps/application-bell-main/ApplicationBellMain.cpp b/products/BellHybrid/apps/application-bell-main/ApplicationBellMain.cpp
index 236123842..fa506f88c 100644
--- a/products/BellHybrid/apps/application-bell-main/ApplicationBellMain.cpp
+++ b/products/BellHybrid/apps/application-bell-main/ApplicationBellMain.cpp
@@ -20,7 +20,7 @@ namespace app
                                              sys::phone_modes::PhoneMode mode,
                                              sys::bluetooth::BluetoothMode bluetoothMode,
                                              StartInBackground startInBackground)
-        : ApplicationBell(name, parent, mode, bluetoothMode, startInBackground)
+        : Application(name, parent, mode, bluetoothMode, startInBackground)
     {
         bus.channels.push_back(sys::BusChannel::ServiceDBNotifications);
         addActionReceiver(manager::actions::ShowAlarm, [this](auto &&data) {
@@ -43,7 +43,7 @@ namespace app
 
     void ApplicationBellMain::createUserInterface()
     {
-        windowsFactory.attach(gui::name::window::main_window, [](Application *app, const std::string &name) {
+        windowsFactory.attach(gui::name::window::main_window, [](ApplicationCommon *app, const std::string &name) {
             auto timeModel        = std::make_unique<app::home_screen::TimeModel>();
             auto temperatureModel = std::make_unique<app::home_screen::TemperatureModel>(app);
             auto alarmModel       = std::make_unique<app::AlarmModel>(app);
@@ -52,14 +52,14 @@ namespace app
             return std::make_unique<gui::BellHomeScreenWindow>(app, std::move(presenter));
         });
 
-        windowsFactory.attach(gui::window::name::bell_main_menu, [](Application *app, const std::string &name) {
+        windowsFactory.attach(gui::window::name::bell_main_menu, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::BellMainMenuWindow>(app);
         });
 
         // for demo only - to be removed
-        windowsFactory.attach(gui::window::name::bell_main_menu_dialog, [](Application *app, const std::string &name) {
-            return std::make_unique<gui::Dialog>(app, name);
-        });
+        windowsFactory.attach(
+            gui::window::name::bell_main_menu_dialog,
+            [](ApplicationCommon *app, const std::string &name) { return std::make_unique<gui::Dialog>(app, name); });
 
         attachPopups({gui::popup::ID::AlarmActivated});
     }
diff --git a/products/BellHybrid/apps/application-bell-main/CMakeLists.txt b/products/BellHybrid/apps/application-bell-main/CMakeLists.txt
index 483eb4c37..f8d3fc006 100644
--- a/products/BellHybrid/apps/application-bell-main/CMakeLists.txt
+++ b/products/BellHybrid/apps/application-bell-main/CMakeLists.txt
@@ -36,6 +36,7 @@ target_include_directories(application-bell-main
 
 target_link_libraries(application-bell-main
     PRIVATE
+        app
         apps-common
         bellgui
         i18n
diff --git a/products/BellHybrid/apps/application-bell-main/include/application-bell-main/ApplicationBellMain.hpp b/products/BellHybrid/apps/application-bell-main/include/application-bell-main/ApplicationBellMain.hpp
index 95bca1f06..5e83027f4 100644
--- a/products/BellHybrid/apps/application-bell-main/include/application-bell-main/ApplicationBellMain.hpp
+++ b/products/BellHybrid/apps/application-bell-main/include/application-bell-main/ApplicationBellMain.hpp
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <common/ApplicationBell.hpp>
+#include <Application.hpp>
 
 namespace gui::window::name
 {
@@ -16,7 +16,7 @@ namespace app
 {
     inline constexpr auto applicationBellName = "ApplicationBell";
 
-    class ApplicationBellMain : public ApplicationBell
+    class ApplicationBellMain : public Application
     {
       public:
         explicit ApplicationBellMain(
diff --git a/products/BellHybrid/apps/application-bell-main/models/TemperatureModel.cpp b/products/BellHybrid/apps/application-bell-main/models/TemperatureModel.cpp
index 6dd84c531..196767492 100644
--- a/products/BellHybrid/apps/application-bell-main/models/TemperatureModel.cpp
+++ b/products/BellHybrid/apps/application-bell-main/models/TemperatureModel.cpp
@@ -3,14 +3,14 @@
 
 #include "TemperatureModel.hpp"
 
-#include <apps-common/Application.hpp>
+#include <apps-common/ApplicationCommon.hpp>
 #include <service-db/Settings.hpp>
 #include <db/SystemSettings.hpp>
 #include <evtmgr/api/TemperatureApi.hpp>
 
 namespace app::home_screen
 {
-    TemperatureModel::TemperatureModel(app::Application *app)
+    TemperatureModel::TemperatureModel(app::ApplicationCommon *app)
     {
         settings.init(service::ServiceProxy{app->weak_from_this()});
     }
diff --git a/products/BellHybrid/apps/application-bell-main/models/TemperatureModel.hpp b/products/BellHybrid/apps/application-bell-main/models/TemperatureModel.hpp
index ee3918d9b..7ebd56fd9 100644
--- a/products/BellHybrid/apps/application-bell-main/models/TemperatureModel.hpp
+++ b/products/BellHybrid/apps/application-bell-main/models/TemperatureModel.hpp
@@ -12,7 +12,7 @@
 
 namespace app
 {
-    class Application;
+    class ApplicationCommon;
 }
 
 namespace app::home_screen
@@ -28,7 +28,7 @@ namespace app::home_screen
     class TemperatureModel : public AbstractTemperatureModel
     {
       public:
-        explicit TemperatureModel(app::Application *app);
+        explicit TemperatureModel(app::ApplicationCommon *app);
         utils::temperature::Temperature getTemperature() const override;
 
       private:
diff --git a/products/BellHybrid/apps/application-bell-main/presenters/HomeScreenPresenter.cpp b/products/BellHybrid/apps/application-bell-main/presenters/HomeScreenPresenter.cpp
index d68ca7773..9014a2dc1 100644
--- a/products/BellHybrid/apps/application-bell-main/presenters/HomeScreenPresenter.cpp
+++ b/products/BellHybrid/apps/application-bell-main/presenters/HomeScreenPresenter.cpp
@@ -6,7 +6,7 @@
 #include "models/TemperatureModel.hpp"
 #include "models/TimeModel.hpp"
 
-#include <apps-common/Application.hpp>
+#include <apps-common/ApplicationCommon.hpp>
 #include <module-sys/Timers/SystemTimer.hpp>
 #include <module-sys/Timers/TimerFactory.hpp>
 #include <time/time_constants.hpp>
@@ -14,7 +14,7 @@
 
 namespace app::home_screen
 {
-    HomeScreenPresenter::HomeScreenPresenter(Application *app,
+    HomeScreenPresenter::HomeScreenPresenter(ApplicationCommon *app,
                                              std::unique_ptr<AbstractAlarmModel> alarmModel,
                                              std::unique_ptr<AbstractTemperatureModel> temperatureModel,
                                              std::unique_ptr<AbstractTimeModel> timeModel)
diff --git a/products/BellHybrid/apps/application-bell-main/presenters/HomeScreenPresenter.hpp b/products/BellHybrid/apps/application-bell-main/presenters/HomeScreenPresenter.hpp
index 81d9a154f..7aa587b1a 100644
--- a/products/BellHybrid/apps/application-bell-main/presenters/HomeScreenPresenter.hpp
+++ b/products/BellHybrid/apps/application-bell-main/presenters/HomeScreenPresenter.hpp
@@ -18,7 +18,7 @@
 
 namespace app
 {
-    class Application;
+    class ApplicationCommon;
 }
 
 namespace gui
@@ -88,7 +88,7 @@ namespace app::home_screen
     class HomeScreenPresenter : public AbstractPresenter
     {
       public:
-        HomeScreenPresenter(Application *app,
+        HomeScreenPresenter(ApplicationCommon *app,
                             std::unique_ptr<AbstractAlarmModel> alarmModel,
                             std::unique_ptr<AbstractTemperatureModel> temperatureModel,
                             std::unique_ptr<AbstractTimeModel> timeModel);
@@ -112,7 +112,7 @@ namespace app::home_screen
         void handleAlarmModelReady() override;
 
       private:
-        Application *app;
+        ApplicationCommon *app;
         sys::TimerHandle timer;
         std::unique_ptr<AbstractAlarmModel> alarmModel;
         std::unique_ptr<AbstractTemperatureModel> temperatureModel;
diff --git a/products/BellHybrid/apps/application-bell-main/windows/BellHomeScreenWindow.cpp b/products/BellHybrid/apps/application-bell-main/windows/BellHomeScreenWindow.cpp
index 16e5694a6..7ba37f6bc 100644
--- a/products/BellHybrid/apps/application-bell-main/windows/BellHomeScreenWindow.cpp
+++ b/products/BellHybrid/apps/application-bell-main/windows/BellHomeScreenWindow.cpp
@@ -70,7 +70,7 @@ namespace
 
 namespace gui
 {
-    BellHomeScreenWindow::BellHomeScreenWindow(app::Application *app,
+    BellHomeScreenWindow::BellHomeScreenWindow(app::ApplicationCommon *app,
                                                std::unique_ptr<app::home_screen::AbstractPresenter> presenter)
         : AppWindow(app, name::window::main_window), presenter{std::move(presenter)}
     {
diff --git a/products/BellHybrid/apps/application-bell-main/windows/BellHomeScreenWindow.hpp b/products/BellHybrid/apps/application-bell-main/windows/BellHomeScreenWindow.hpp
index 6e977dea9..fc486d669 100644
--- a/products/BellHybrid/apps/application-bell-main/windows/BellHomeScreenWindow.hpp
+++ b/products/BellHybrid/apps/application-bell-main/windows/BellHomeScreenWindow.hpp
@@ -19,7 +19,8 @@ namespace gui
     class BellHomeScreenWindow : public AppWindow, public app::home_screen::AbstractView
     {
       public:
-        BellHomeScreenWindow(app::Application *app, std::unique_ptr<app::home_screen::AbstractPresenter> presenter);
+        BellHomeScreenWindow(app::ApplicationCommon *app,
+                             std::unique_ptr<app::home_screen::AbstractPresenter> presenter);
 
       private:
         void buildInterface() override;
diff --git a/products/BellHybrid/apps/application-bell-main/windows/BellMainMenuWindow.cpp b/products/BellHybrid/apps/application-bell-main/windows/BellMainMenuWindow.cpp
index 328f35f0e..8b43df418 100644
--- a/products/BellHybrid/apps/application-bell-main/windows/BellMainMenuWindow.cpp
+++ b/products/BellHybrid/apps/application-bell-main/windows/BellMainMenuWindow.cpp
@@ -17,7 +17,8 @@
 namespace gui
 {
 
-    BellMainMenuWindow::BellMainMenuWindow(app::Application *app) : OptionWindow(app, gui::window::name::bell_main_menu)
+    BellMainMenuWindow::BellMainMenuWindow(app::ApplicationCommon *app)
+        : OptionWindow(app, gui::window::name::bell_main_menu)
     {
         addOptions(mainMenuOptionsList());
         buildInterface();
diff --git a/products/BellHybrid/apps/application-bell-main/windows/BellMainMenuWindow.hpp b/products/BellHybrid/apps/application-bell-main/windows/BellMainMenuWindow.hpp
index b31368874..ea80db265 100644
--- a/products/BellHybrid/apps/application-bell-main/windows/BellMainMenuWindow.hpp
+++ b/products/BellHybrid/apps/application-bell-main/windows/BellMainMenuWindow.hpp
@@ -11,7 +11,7 @@ namespace gui
     class BellMainMenuWindow : public OptionWindow
     {
       public:
-        BellMainMenuWindow(app::Application *app);
+        BellMainMenuWindow(app::ApplicationCommon *app);
 
       private:
         std::list<Option> mainMenuOptionsList();
diff --git a/products/BellHybrid/apps/application-bell-main/windows/BellMainSetHour.cpp b/products/BellHybrid/apps/application-bell-main/windows/BellMainSetHour.cpp
index 73ddd8334..54de8dbe9 100644
--- a/products/BellHybrid/apps/application-bell-main/windows/BellMainSetHour.cpp
+++ b/products/BellHybrid/apps/application-bell-main/windows/BellMainSetHour.cpp
@@ -11,7 +11,8 @@
 
 namespace gui
 {
-    BellMainSetHour::BellMainSetHour(app::Application *app) : AppWindow(app, gui::window::name::bell_main_set_hour)
+    BellMainSetHour::BellMainSetHour(app::ApplicationCommon *app)
+        : AppWindow(app, gui::window::name::bell_main_set_hour)
     {
         buildInterface();
     }
diff --git a/products/BellHybrid/apps/application-bell-main/windows/BellMainSetHour.hpp b/products/BellHybrid/apps/application-bell-main/windows/BellMainSetHour.hpp
index f41e5f369..b11a9c2e4 100644
--- a/products/BellHybrid/apps/application-bell-main/windows/BellMainSetHour.hpp
+++ b/products/BellHybrid/apps/application-bell-main/windows/BellMainSetHour.hpp
@@ -12,7 +12,7 @@ namespace gui
     class BellMainSetHour : public AppWindow
     {
       public:
-        explicit BellMainSetHour(app::Application *app);
+        explicit BellMainSetHour(app::ApplicationCommon *app);
 
         void buildInterface() override;
         bool onInput(const InputEvent &inputEvent) override;
diff --git a/products/BellHybrid/apps/application-bell-powernap/ApplicationBellPowerNap.cpp b/products/BellHybrid/apps/application-bell-powernap/ApplicationBellPowerNap.cpp
index 7fc1962bb..bee9ad51e 100644
--- a/products/BellHybrid/apps/application-bell-powernap/ApplicationBellPowerNap.cpp
+++ b/products/BellHybrid/apps/application-bell-powernap/ApplicationBellPowerNap.cpp
@@ -18,7 +18,7 @@ namespace app
                                                      sys::phone_modes::PhoneMode mode,
                                                      sys::bluetooth::BluetoothMode bluetoothMode,
                                                      StartInBackground startInBackground)
-        : ApplicationBell(std::move(name), std::move(parent), mode, bluetoothMode, startInBackground),
+        : Application(std::move(name), std::move(parent), mode, bluetoothMode, startInBackground),
           alarm{std::make_unique<powernap::PowerNapAlarmImpl>(this)}
     {}
 
@@ -36,18 +36,20 @@ namespace app
 
     void ApplicationBellPowerNap::createUserInterface()
     {
-        windowsFactory.attach(gui::name::window::main_window, [this](Application *app, const std::string &name) {
+        windowsFactory.attach(gui::name::window::main_window, [this](ApplicationCommon *app, const std::string &name) {
             auto presenter = std::make_unique<powernap::PowerNapMainWindowPresenter>(app, settings.get());
             return std::make_unique<gui::PowerNapMainWindow>(app, std::move(presenter));
         });
-        windowsFactory.attach(gui::window::name::powernapProgress, [this](Application *app, const std::string &name) {
-            auto presenter = std::make_unique<powernap::PowerNapProgressPresenter>(app, settings.get(), *alarm);
-            return std::make_unique<gui::PowerNapProgressWindow>(app, std::move(presenter));
-        });
-        windowsFactory.attach(gui::window::name::powernapSessionEnded, [](Application *app, const std::string &name) {
-            auto presenter = std::make_unique<powernap::PowerNapSessionEndPresenter>(app);
-            return std::make_unique<gui::PowerNapSessionEndedWindow>(app, std::move(presenter));
-        });
+        windowsFactory.attach(
+            gui::window::name::powernapProgress, [this](ApplicationCommon *app, const std::string &name) {
+                auto presenter = std::make_unique<powernap::PowerNapProgressPresenter>(app, settings.get(), *alarm);
+                return std::make_unique<gui::PowerNapProgressWindow>(app, std::move(presenter));
+            });
+        windowsFactory.attach(gui::window::name::powernapSessionEnded,
+                              [](ApplicationCommon *app, const std::string &name) {
+                                  auto presenter = std::make_unique<powernap::PowerNapSessionEndPresenter>(app);
+                                  return std::make_unique<gui::PowerNapSessionEndedWindow>(app, std::move(presenter));
+                              });
 
         attachPopups({gui::popup::ID::AlarmActivated});
     }
diff --git a/products/BellHybrid/apps/application-bell-powernap/CMakeLists.txt b/products/BellHybrid/apps/application-bell-powernap/CMakeLists.txt
index cc9534103..07d678e0e 100644
--- a/products/BellHybrid/apps/application-bell-powernap/CMakeLists.txt
+++ b/products/BellHybrid/apps/application-bell-powernap/CMakeLists.txt
@@ -44,6 +44,7 @@ target_sources(application-bell-powernap
 
 target_link_libraries(application-bell-powernap
     PRIVATE
+        app
         bell::app-common
         bell::app-main
 
diff --git a/products/BellHybrid/apps/application-bell-powernap/include/application-bell-powernap/ApplicationBellPowerNap.hpp b/products/BellHybrid/apps/application-bell-powernap/include/application-bell-powernap/ApplicationBellPowerNap.hpp
index 550d57204..fcc05ca4d 100644
--- a/products/BellHybrid/apps/application-bell-powernap/include/application-bell-powernap/ApplicationBellPowerNap.hpp
+++ b/products/BellHybrid/apps/application-bell-powernap/include/application-bell-powernap/ApplicationBellPowerNap.hpp
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <common/ApplicationBell.hpp>
+#include <Application.hpp>
 
 namespace gui::window::name
 {
@@ -19,7 +19,7 @@ namespace app
 
     inline constexpr auto applicationBellPowerNapName = "ApplicationBellPowerNap";
 
-    class ApplicationBellPowerNap : public ApplicationBell
+    class ApplicationBellPowerNap : public Application
     {
         std::unique_ptr<powernap::PowerNapAlarmImpl> alarm;
 
diff --git a/products/BellHybrid/apps/application-bell-powernap/presenter/PowerNapMainWindowPresenter.cpp b/products/BellHybrid/apps/application-bell-powernap/presenter/PowerNapMainWindowPresenter.cpp
index d66836add..a93cc2d4c 100644
--- a/products/BellHybrid/apps/application-bell-powernap/presenter/PowerNapMainWindowPresenter.cpp
+++ b/products/BellHybrid/apps/application-bell-powernap/presenter/PowerNapMainWindowPresenter.cpp
@@ -5,13 +5,13 @@
 #include "models/PowerNapModel.hpp"
 #include "data/PowerNapCommon.hpp"
 #include <ApplicationBellPowerNap.hpp>
-#include <apps-common/Application.hpp>
+#include <apps-common/ApplicationCommon.hpp>
 #include <service-db/agents/settings/SystemSettings.hpp>
 #include <service-db/Settings.hpp>
 
 namespace app::powernap
 {
-    PowerNapMainWindowPresenter::PowerNapMainWindowPresenter(app::Application *app, settings::Settings *settings)
+    PowerNapMainWindowPresenter::PowerNapMainWindowPresenter(app::ApplicationCommon *app, settings::Settings *settings)
         : app{app}, settings{settings}, model{std::make_shared<PowerNapModel>()}
     {}
 
diff --git a/products/BellHybrid/apps/application-bell-powernap/presenter/PowerNapMainWindowPresenter.hpp b/products/BellHybrid/apps/application-bell-powernap/presenter/PowerNapMainWindowPresenter.hpp
index faee954ac..38774ccd1 100644
--- a/products/BellHybrid/apps/application-bell-powernap/presenter/PowerNapMainWindowPresenter.hpp
+++ b/products/BellHybrid/apps/application-bell-powernap/presenter/PowerNapMainWindowPresenter.hpp
@@ -13,7 +13,7 @@ namespace gui
 
 namespace app
 {
-    class Application;
+    class ApplicationCommon;
 }
 
 namespace settings
@@ -45,12 +45,12 @@ namespace app::powernap
 
     class PowerNapMainWindowPresenter : public PowerNapMainWindowContract::Presenter
     {
-        app::Application *app        = nullptr;
+        app::ApplicationCommon *app  = nullptr;
         settings::Settings *settings = nullptr;
         std::shared_ptr<PowerNapModel> model;
 
       public:
-        PowerNapMainWindowPresenter(app::Application *app, settings::Settings *settings);
+        PowerNapMainWindowPresenter(app::ApplicationCommon *app, settings::Settings *settings);
         auto getNapTimeProvider() -> std::shared_ptr<gui::ListItemProvider> override;
 
         void loadNapTimeList() override;
diff --git a/products/BellHybrid/apps/application-bell-powernap/presenter/PowerNapProgressPresenter.cpp b/products/BellHybrid/apps/application-bell-powernap/presenter/PowerNapProgressPresenter.cpp
index 6f5b85349..0bdec016f 100644
--- a/products/BellHybrid/apps/application-bell-powernap/presenter/PowerNapProgressPresenter.cpp
+++ b/products/BellHybrid/apps/application-bell-powernap/presenter/PowerNapProgressPresenter.cpp
@@ -22,7 +22,7 @@ namespace
 } // namespace
 namespace app::powernap
 {
-    PowerNapProgressPresenter::PowerNapProgressPresenter(app::Application *app,
+    PowerNapProgressPresenter::PowerNapProgressPresenter(app::ApplicationCommon *app,
                                                          settings::Settings *settings,
                                                          PowerNapAlarm &alarm)
         : app{app}, settings{settings}, alarm{alarm},
diff --git a/products/BellHybrid/apps/application-bell-powernap/presenter/PowerNapProgressPresenter.hpp b/products/BellHybrid/apps/application-bell-powernap/presenter/PowerNapProgressPresenter.hpp
index df6822c51..d9028443f 100644
--- a/products/BellHybrid/apps/application-bell-powernap/presenter/PowerNapProgressPresenter.hpp
+++ b/products/BellHybrid/apps/application-bell-powernap/presenter/PowerNapProgressPresenter.hpp
@@ -9,7 +9,7 @@
 #include <memory>
 namespace app
 {
-    class Application;
+    class ApplicationCommon;
 } // namespace app
 namespace gui
 {
@@ -47,7 +47,7 @@ namespace app::powernap
 
     class PowerNapProgressPresenter : public PowerNapProgressContract::Presenter
     {
-        app::Application *app        = nullptr;
+        app::ApplicationCommon *app  = nullptr;
         settings::Settings *settings = nullptr;
         PowerNapAlarm &alarm;
         std::unique_ptr<app::ProgressTimer> timer;
@@ -62,6 +62,6 @@ namespace app::powernap
         void onNapAlarmFinished();
 
       public:
-        PowerNapProgressPresenter(app::Application *app, settings::Settings *settings, PowerNapAlarm &alarm);
+        PowerNapProgressPresenter(app::ApplicationCommon *app, settings::Settings *settings, PowerNapAlarm &alarm);
     };
 } // namespace app::powernap
diff --git a/products/BellHybrid/apps/application-bell-powernap/presenter/PowerNapSessionEndedPresenter.cpp b/products/BellHybrid/apps/application-bell-powernap/presenter/PowerNapSessionEndedPresenter.cpp
index fa3da697d..2f3337c64 100644
--- a/products/BellHybrid/apps/application-bell-powernap/presenter/PowerNapSessionEndedPresenter.cpp
+++ b/products/BellHybrid/apps/application-bell-powernap/presenter/PowerNapSessionEndedPresenter.cpp
@@ -9,7 +9,7 @@
 
 namespace app::powernap
 {
-    PowerNapSessionEndPresenter ::PowerNapSessionEndPresenter(app::Application *app) : app{app}
+    PowerNapSessionEndPresenter ::PowerNapSessionEndPresenter(app::ApplicationCommon *app) : app{app}
     {}
 
     void PowerNapSessionEndPresenter::activate()
diff --git a/products/BellHybrid/apps/application-bell-powernap/presenter/PowerNapSessionEndedPresenter.hpp b/products/BellHybrid/apps/application-bell-powernap/presenter/PowerNapSessionEndedPresenter.hpp
index 8de6ff9d8..aa425ef9e 100644
--- a/products/BellHybrid/apps/application-bell-powernap/presenter/PowerNapSessionEndedPresenter.hpp
+++ b/products/BellHybrid/apps/application-bell-powernap/presenter/PowerNapSessionEndedPresenter.hpp
@@ -7,7 +7,7 @@
 
 namespace app
 {
-    class Application;
+    class ApplicationCommon;
 }
 
 namespace app::powernap
@@ -29,10 +29,10 @@ namespace app::powernap
 
     class PowerNapSessionEndPresenter : public PowerNapSessionEndedContract::Presenter
     {
-        app::Application *app{};
+        app::ApplicationCommon *app{};
         void activate() override;
 
       public:
-        explicit PowerNapSessionEndPresenter(app::Application *app);
+        explicit PowerNapSessionEndPresenter(app::ApplicationCommon *app);
     };
 } // namespace app::powernap
diff --git a/products/BellHybrid/apps/application-bell-powernap/widgets/PowerNapAlarm.cpp b/products/BellHybrid/apps/application-bell-powernap/widgets/PowerNapAlarm.cpp
index 0fe02b4a4..b2e1fdff6 100644
--- a/products/BellHybrid/apps/application-bell-powernap/widgets/PowerNapAlarm.cpp
+++ b/products/BellHybrid/apps/application-bell-powernap/widgets/PowerNapAlarm.cpp
@@ -13,7 +13,7 @@ namespace
 
 namespace app::powernap
 {
-    PowerNapAlarmImpl::PowerNapAlarmImpl(app::Application *app) : app{app}
+    PowerNapAlarmImpl::PowerNapAlarmImpl(app::ApplicationCommon *app) : app{app}
     {}
 
     void PowerNapAlarmImpl::start()
diff --git a/products/BellHybrid/apps/application-bell-powernap/widgets/PowerNapAlarm.hpp b/products/BellHybrid/apps/application-bell-powernap/widgets/PowerNapAlarm.hpp
index 66647037d..6a6f0659d 100644
--- a/products/BellHybrid/apps/application-bell-powernap/widgets/PowerNapAlarm.hpp
+++ b/products/BellHybrid/apps/application-bell-powernap/widgets/PowerNapAlarm.hpp
@@ -6,7 +6,7 @@
 
 namespace app
 {
-    class Application;
+    class ApplicationCommon;
 }
 
 namespace app::powernap
@@ -22,14 +22,14 @@ namespace app::powernap
 
     class PowerNapAlarmImpl : public PowerNapAlarm
     {
-        app::Application *app{};
+        app::ApplicationCommon *app{};
         audio::Token token;
 
         void start() override;
         void stop() override;
 
       public:
-        explicit PowerNapAlarmImpl(app::Application *app);
+        explicit PowerNapAlarmImpl(app::ApplicationCommon *app);
         void registerAudioStream(audio::Token _token);
     };
 
diff --git a/products/BellHybrid/apps/application-bell-powernap/windows/PowerNapMainWindow.cpp b/products/BellHybrid/apps/application-bell-powernap/windows/PowerNapMainWindow.cpp
index 36e0fa032..f839b1074 100644
--- a/products/BellHybrid/apps/application-bell-powernap/windows/PowerNapMainWindow.cpp
+++ b/products/BellHybrid/apps/application-bell-powernap/windows/PowerNapMainWindow.cpp
@@ -8,7 +8,8 @@
 namespace gui
 {
     PowerNapMainWindow::PowerNapMainWindow(
-        app::Application *app, std::unique_ptr<app::powernap::PowerNapMainWindowContract::Presenter> &&windowPresenter)
+        app::ApplicationCommon *app,
+        std::unique_ptr<app::powernap::PowerNapMainWindowContract::Presenter> &&windowPresenter)
         : AppWindow(app, gui::name::window::main_window), windowPresenter{std::move(windowPresenter)}
     {
         this->windowPresenter->attach(this);
diff --git a/products/BellHybrid/apps/application-bell-powernap/windows/PowerNapMainWindow.hpp b/products/BellHybrid/apps/application-bell-powernap/windows/PowerNapMainWindow.hpp
index 9c0e9774e..43a691a9f 100644
--- a/products/BellHybrid/apps/application-bell-powernap/windows/PowerNapMainWindow.hpp
+++ b/products/BellHybrid/apps/application-bell-powernap/windows/PowerNapMainWindow.hpp
@@ -19,7 +19,7 @@ namespace gui
         status_bar::Configuration configureStatusBar(status_bar::Configuration appConfiguration) override;
 
       public:
-        PowerNapMainWindow(app::Application *app,
+        PowerNapMainWindow(app::ApplicationCommon *app,
                            std::unique_ptr<app::powernap::PowerNapMainWindowContract::Presenter> &&windowPresenter);
     };
 } // namespace gui
diff --git a/products/BellHybrid/apps/application-bell-powernap/windows/PowerNapProgressWindow.cpp b/products/BellHybrid/apps/application-bell-powernap/windows/PowerNapProgressWindow.cpp
index d3f6064fa..a3c58a216 100644
--- a/products/BellHybrid/apps/application-bell-powernap/windows/PowerNapProgressWindow.cpp
+++ b/products/BellHybrid/apps/application-bell-powernap/windows/PowerNapProgressWindow.cpp
@@ -50,7 +50,7 @@ namespace
 namespace gui
 {
     PowerNapProgressWindow::PowerNapProgressWindow(
-        app::Application *app, std::shared_ptr<app::powernap::PowerNapProgressContract::Presenter> presenter)
+        app::ApplicationCommon *app, std::shared_ptr<app::powernap::PowerNapProgressContract::Presenter> presenter)
         : AppWindow(app, gui::window::name::powernapProgress), presenter{std::move(presenter)}
     {
         buildInterface();
diff --git a/products/BellHybrid/apps/application-bell-powernap/windows/PowerNapProgressWindow.hpp b/products/BellHybrid/apps/application-bell-powernap/windows/PowerNapProgressWindow.hpp
index aef4ffb26..1a736ca78 100644
--- a/products/BellHybrid/apps/application-bell-powernap/windows/PowerNapProgressWindow.hpp
+++ b/products/BellHybrid/apps/application-bell-powernap/windows/PowerNapProgressWindow.hpp
@@ -26,7 +26,7 @@ namespace gui
         void napEnded() override;
 
       public:
-        PowerNapProgressWindow(app::Application *app,
+        PowerNapProgressWindow(app::ApplicationCommon *app,
                                std::shared_ptr<app::powernap::PowerNapProgressContract::Presenter> presenter);
     };
 } // namespace gui
diff --git a/products/BellHybrid/apps/application-bell-powernap/windows/PowerNapSessionEndedWindow.cpp b/products/BellHybrid/apps/application-bell-powernap/windows/PowerNapSessionEndedWindow.cpp
index f6cb8ff68..d00f68664 100644
--- a/products/BellHybrid/apps/application-bell-powernap/windows/PowerNapSessionEndedWindow.cpp
+++ b/products/BellHybrid/apps/application-bell-powernap/windows/PowerNapSessionEndedWindow.cpp
@@ -13,7 +13,7 @@
 namespace gui
 {
     PowerNapSessionEndedWindow::PowerNapSessionEndedWindow(
-        app::Application *app, std::shared_ptr<app::powernap::PowerNapSessionEndedContract::Presenter> presenter)
+        app::ApplicationCommon *app, std::shared_ptr<app::powernap::PowerNapSessionEndedContract::Presenter> presenter)
         : WindowWithTimer(app, gui::window::name::powernapSessionEnded), presenter{std::move(presenter)}
     {
         buildInterface();
diff --git a/products/BellHybrid/apps/application-bell-powernap/windows/PowerNapSessionEndedWindow.hpp b/products/BellHybrid/apps/application-bell-powernap/windows/PowerNapSessionEndedWindow.hpp
index 5ff467c63..689a77da9 100644
--- a/products/BellHybrid/apps/application-bell-powernap/windows/PowerNapSessionEndedWindow.hpp
+++ b/products/BellHybrid/apps/application-bell-powernap/windows/PowerNapSessionEndedWindow.hpp
@@ -17,6 +17,7 @@ namespace gui
 
       public:
         explicit PowerNapSessionEndedWindow(
-            app::Application *app, std::shared_ptr<app::powernap::PowerNapSessionEndedContract::Presenter> presenter);
+            app::ApplicationCommon *app,
+            std::shared_ptr<app::powernap::PowerNapSessionEndedContract::Presenter> presenter);
     };
 } // namespace gui
diff --git a/products/BellHybrid/apps/application-bell-settings/ApplicationBellSettings.cpp b/products/BellHybrid/apps/application-bell-settings/ApplicationBellSettings.cpp
index 1c39a9d6f..47db7d671 100644
--- a/products/BellHybrid/apps/application-bell-settings/ApplicationBellSettings.cpp
+++ b/products/BellHybrid/apps/application-bell-settings/ApplicationBellSettings.cpp
@@ -35,7 +35,7 @@ namespace app
                                                      sys::phone_modes::PhoneMode mode,
                                                      sys::bluetooth::BluetoothMode bluetoothMode,
                                                      StartInBackground startInBackground)
-        : ApplicationBell(std::move(name), std::move(parent), mode, bluetoothMode, startInBackground)
+        : Application(std::move(name), std::move(parent), mode, bluetoothMode, startInBackground)
     {}
 
     sys::ReturnCodes ApplicationBellSettings::InitHandler()
@@ -51,49 +51,54 @@ namespace app
 
     void ApplicationBellSettings::createUserInterface()
     {
-        windowsFactory.attach(gui::name::window::main_window, [](Application *app, const std::string &name) {
+        windowsFactory.attach(gui::name::window::main_window, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::BellSettingsWindow>(app);
         });
 
         // Advanced
-        windowsFactory.attach(gui::window::name::bellSettingsAdvanced, [](Application *app, const std::string &name) {
-            return std::make_unique<gui::BellSettingsAdvancedWindow>(app);
-        });
+        windowsFactory.attach(gui::window::name::bellSettingsAdvanced,
+                              [](ApplicationCommon *app, const std::string &name) {
+                                  return std::make_unique<gui::BellSettingsAdvancedWindow>(app);
+                              });
 
-        windowsFactory.attach(gui::window::name::bellSettingsTimeUnits, [](Application *app, const std::string &name) {
-            auto temperatureUnitModel = std::make_unique<bell_settings::TemperatureUnitModel>(app);
-            auto timeUnitsProvider    = std::make_shared<bell_settings::TimeUnitsModel>(app);
-            auto presenter            = std::make_unique<bell_settings::TimeUnitsWindowPresenter>(timeUnitsProvider,
-                                                                                       std::move(temperatureUnitModel));
-            return std::make_unique<gui::BellSettingsTimeUnitsWindow>(app, std::move(presenter));
-        });
+        windowsFactory.attach(
+            gui::window::name::bellSettingsTimeUnits, [](ApplicationCommon *app, const std::string &name) {
+                auto temperatureUnitModel = std::make_unique<bell_settings::TemperatureUnitModel>(app);
+                auto timeUnitsProvider    = std::make_shared<bell_settings::TimeUnitsModel>(app);
+                auto presenter            = std::make_unique<bell_settings::TimeUnitsWindowPresenter>(
+                    timeUnitsProvider, std::move(temperatureUnitModel));
+                return std::make_unique<gui::BellSettingsTimeUnitsWindow>(app, std::move(presenter));
+            });
 
-        windowsFactory.attach(gui::window::name::bellSettingsFrontlight, [](Application *app, const std::string &name) {
-            auto model =
-                std::make_shared<bell_settings::FrontlightModel>(app, static_cast<ApplicationBellSettings *>(app));
-            auto presenter = std::make_unique<bell_settings::FrontlightWindowPresenter>(std::move(model));
-            return std::make_unique<gui::BellSettingsFrontlightWindow>(app, std::move(presenter));
-        });
+        windowsFactory.attach(
+            gui::window::name::bellSettingsFrontlight, [](ApplicationCommon *app, const std::string &name) {
+                auto model =
+                    std::make_shared<bell_settings::FrontlightModel>(app, static_cast<ApplicationBellSettings *>(app));
+                auto presenter = std::make_unique<bell_settings::FrontlightWindowPresenter>(std::move(model));
+                return std::make_unique<gui::BellSettingsFrontlightWindow>(app, std::move(presenter));
+            });
 
-        windowsFactory.attach(gui::BellFinishedWindow::name, [](Application *app, const std::string &name) {
+        windowsFactory.attach(gui::BellFinishedWindow::name, [](ApplicationCommon *app, const std::string &name) {
             return std::make_unique<gui::BellFinishedWindow>(app);
         });
 
-        windowsFactory.attach(gui::window::name::bellSettingsHomeView, [](Application *app, const std::string &name) {
-            return std::make_unique<gui::BellSettingsHomeViewWindow>(app);
-        });
+        windowsFactory.attach(gui::window::name::bellSettingsHomeView,
+                              [](ApplicationCommon *app, const std::string &name) {
+                                  return std::make_unique<gui::BellSettingsHomeViewWindow>(app);
+                              });
 
         windowsFactory.attach(gui::window::name::bellSettingsBedtimeTone,
-                              [](Application *app, const std::string &name) {
+                              [](ApplicationCommon *app, const std::string &name) {
                                   return std::make_unique<gui::BellSettingsBedtimeToneWindow>(app);
                               });
 
-        windowsFactory.attach(gui::window::name::bellSettingsTurnOff, [](Application *app, const std::string &name) {
-            return std::make_unique<gui::BellSettingsTurnOffWindow>(app);
-        });
+        windowsFactory.attach(gui::window::name::bellSettingsTurnOff,
+                              [](ApplicationCommon *app, const std::string &name) {
+                                  return std::make_unique<gui::BellSettingsTurnOffWindow>(app);
+                              });
 
         windowsFactory.attach(
-            gui::window::name::bellSettingsAlarmSettingsPrewakeUp, [](Application *app, const std::string &name) {
+            gui::window::name::bellSettingsAlarmSettingsPrewakeUp, [](ApplicationCommon *app, const std::string &name) {
                 auto model     = std::make_shared<bell_settings::PrewakeUpModel>(app);
                 auto presenter = std::make_unique<bell_settings::PrewakeUpWindowPresenter>(std::move(model));
                 return std::make_unique<gui::BellSettingsPrewakeUpWindow>(app, std::move(presenter));
@@ -103,11 +108,11 @@ namespace app
 
         // Alarm setup
         windowsFactory.attach(gui::BellSettingsAlarmSettingsWindow::name,
-                              [](Application *app, const std::string &name) {
+                              [](ApplicationCommon *app, const std::string &name) {
                                   return std::make_unique<gui::BellSettingsAlarmSettingsWindow>(app);
                               });
         windowsFactory.attach(
-            gui::BellSettingsAlarmSettingsSnoozeWindow::name, [this](Application *app, const std::string &) {
+            gui::BellSettingsAlarmSettingsSnoozeWindow::name, [this](ApplicationCommon *app, const std::string &) {
                 auto model     = std::make_unique<bell_settings::SnoozeSettingsModel>(this);
                 auto provider  = std::make_shared<bell_settings::SnoozeListItemProvider>(*model);
                 auto presenter = std::make_unique<bell_settings::SnoozePresenter>(provider, std::move(model));
diff --git a/products/BellHybrid/apps/application-bell-settings/CMakeLists.txt b/products/BellHybrid/apps/application-bell-settings/CMakeLists.txt
index 15a8bc315..6240775e9 100644
--- a/products/BellHybrid/apps/application-bell-settings/CMakeLists.txt
+++ b/products/BellHybrid/apps/application-bell-settings/CMakeLists.txt
@@ -79,6 +79,7 @@ target_sources(application-bell-settings
 
 target_link_libraries(application-bell-settings
     PRIVATE
+        app
         bellgui
         bell::app-common
         bell::db
diff --git a/products/BellHybrid/apps/application-bell-settings/include/application-bell-settings/ApplicationBellSettings.hpp b/products/BellHybrid/apps/application-bell-settings/include/application-bell-settings/ApplicationBellSettings.hpp
index deaf52bf5..db296bf89 100644
--- a/products/BellHybrid/apps/application-bell-settings/include/application-bell-settings/ApplicationBellSettings.hpp
+++ b/products/BellHybrid/apps/application-bell-settings/include/application-bell-settings/ApplicationBellSettings.hpp
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <common/ApplicationBell.hpp>
+#include <Application.hpp>
 #include <service-evtmgr/screen-light-control/ScreenLightControl.hpp>
 
 namespace gui::window::name
@@ -44,7 +44,7 @@ namespace app
         };
     }; // namespace settingsInterface
 
-    class ApplicationBellSettings : public ApplicationBell, public settingsInterface::BellScreenLightSettings
+    class ApplicationBellSettings : public Application, public settingsInterface::BellScreenLightSettings
     {
       public:
         ApplicationBellSettings(std::string name                            = applicationBellSettingsName,
diff --git a/products/BellHybrid/apps/application-bell-settings/models/FrontlightModel.cpp b/products/BellHybrid/apps/application-bell-settings/models/FrontlightModel.cpp
index ce179bb90..cbbe7bb25 100644
--- a/products/BellHybrid/apps/application-bell-settings/models/FrontlightModel.cpp
+++ b/products/BellHybrid/apps/application-bell-settings/models/FrontlightModel.cpp
@@ -22,7 +22,8 @@ namespace
 
 namespace app::bell_settings
 {
-    FrontlightModel::FrontlightModel(app::Application *app, app::settingsInterface::BellScreenLightSettings *slSettings)
+    FrontlightModel::FrontlightModel(app::ApplicationCommon *app,
+                                     app::settingsInterface::BellScreenLightSettings *slSettings)
         : application(app), screenLightSettings(slSettings)
     {
         settings.init(service::ServiceProxy{application->weak_from_this()});
diff --git a/products/BellHybrid/apps/application-bell-settings/models/FrontlightModel.hpp b/products/BellHybrid/apps/application-bell-settings/models/FrontlightModel.hpp
index f79315cb7..d229c34f3 100644
--- a/products/BellHybrid/apps/application-bell-settings/models/FrontlightModel.hpp
+++ b/products/BellHybrid/apps/application-bell-settings/models/FrontlightModel.hpp
@@ -8,14 +8,15 @@
 #include <widgets/Spinner.hpp>
 #include <service-db/Settings.hpp>
 
-class Application;
+class ApplicationCommon;
 
 namespace app::bell_settings
 {
     class FrontlightModel
     {
       public:
-        explicit FrontlightModel(app::Application *app, app::settingsInterface::BellScreenLightSettings *slSettings);
+        explicit FrontlightModel(app::ApplicationCommon *app,
+                                 app::settingsInterface::BellScreenLightSettings *slSettings);
         ~FrontlightModel();
 
         auto saveData() -> void;
@@ -25,7 +26,7 @@ namespace app::bell_settings
         [[nodiscard]] auto getSpinner() -> gui::Spinner *;
 
       private:
-        app::Application *application                                        = nullptr;
+        app::ApplicationCommon *application                                  = nullptr;
         app::settingsInterface::BellScreenLightSettings *screenLightSettings = nullptr;
         gui::Spinner *frontlightSetSpinner                                   = nullptr;
         mutable settings::Settings settings;
diff --git a/products/BellHybrid/apps/application-bell-settings/models/PrewakeUpModel.cpp b/products/BellHybrid/apps/application-bell-settings/models/PrewakeUpModel.cpp
index 3bdc4ecc0..7d827eb63 100644
--- a/products/BellHybrid/apps/application-bell-settings/models/PrewakeUpModel.cpp
+++ b/products/BellHybrid/apps/application-bell-settings/models/PrewakeUpModel.cpp
@@ -9,7 +9,7 @@
 
 namespace app::bell_settings
 {
-    PrewakeUpModel::PrewakeUpModel(app::Application *app) : application(app)
+    PrewakeUpModel::PrewakeUpModel(app::ApplicationCommon *app) : application(app)
     {}
 
     PrewakeUpModel::~PrewakeUpModel()
diff --git a/products/BellHybrid/apps/application-bell-settings/models/PrewakeUpModel.hpp b/products/BellHybrid/apps/application-bell-settings/models/PrewakeUpModel.hpp
index 6f02e6e37..34c08790e 100644
--- a/products/BellHybrid/apps/application-bell-settings/models/PrewakeUpModel.hpp
+++ b/products/BellHybrid/apps/application-bell-settings/models/PrewakeUpModel.hpp
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <apps-common/Application.hpp>
+#include <apps-common/ApplicationCommon.hpp>
 #include <apps-common/InternalModel.hpp>
 
 namespace app::bell_settings
@@ -11,7 +11,7 @@ namespace app::bell_settings
     class PrewakeUpModel : public app::InternalModel<gui::ListItem *>, public gui::ListItemProvider
     {
       public:
-        explicit PrewakeUpModel(app::Application *app);
+        explicit PrewakeUpModel(app::ApplicationCommon *app);
 
         ~PrewakeUpModel();
 
@@ -32,6 +32,6 @@ namespace app::bell_settings
         [[nodiscard]] auto getMinimalItemSpaceRequired() const -> unsigned int override;
 
       private:
-        app::Application *application{};
+        app::ApplicationCommon *application{};
     };
 } // namespace app::bell_settings
diff --git a/products/BellHybrid/apps/application-bell-settings/models/TemperatureUnitModel.cpp b/products/BellHybrid/apps/application-bell-settings/models/TemperatureUnitModel.cpp
index 64dafa082..ede9c9e36 100644
--- a/products/BellHybrid/apps/application-bell-settings/models/TemperatureUnitModel.cpp
+++ b/products/BellHybrid/apps/application-bell-settings/models/TemperatureUnitModel.cpp
@@ -3,7 +3,7 @@
 
 #include "TemperatureUnitModel.hpp"
 
-#include <apps-common/Application.hpp>
+#include <apps-common/ApplicationCommon.hpp>
 #include <service-db/Settings.hpp>
 #include <db/SystemSettings.hpp>
 
@@ -14,7 +14,7 @@ namespace
 
 namespace app::bell_settings
 {
-    TemperatureUnitModel::TemperatureUnitModel(app::Application *app)
+    TemperatureUnitModel::TemperatureUnitModel(app::ApplicationCommon *app)
     {
         settings.init(service::ServiceProxy{app->weak_from_this()});
     }
diff --git a/products/BellHybrid/apps/application-bell-settings/models/TemperatureUnitModel.hpp b/products/BellHybrid/apps/application-bell-settings/models/TemperatureUnitModel.hpp
index 785247b00..7a90e0bb1 100644
--- a/products/BellHybrid/apps/application-bell-settings/models/TemperatureUnitModel.hpp
+++ b/products/BellHybrid/apps/application-bell-settings/models/TemperatureUnitModel.hpp
@@ -10,7 +10,7 @@
 
 namespace app
 {
-    class Application;
+    class ApplicationCommon;
 }
 
 namespace app::bell_settings
@@ -28,7 +28,7 @@ namespace app::bell_settings
     class TemperatureUnitModel : public AbstractTemperatureUnitModel
     {
       public:
-        explicit TemperatureUnitModel(Application *app);
+        explicit TemperatureUnitModel(ApplicationCommon *app);
 
         utils::temperature::Temperature::Unit get() const override;
 
diff --git a/products/BellHybrid/apps/application-bell-settings/models/TimeUnitsModel.cpp b/products/BellHybrid/apps/application-bell-settings/models/TimeUnitsModel.cpp
index e35222048..0d94967db 100644
--- a/products/BellHybrid/apps/application-bell-settings/models/TimeUnitsModel.cpp
+++ b/products/BellHybrid/apps/application-bell-settings/models/TimeUnitsModel.cpp
@@ -18,7 +18,7 @@
 
 namespace app::bell_settings
 {
-    TimeUnitsModel::TimeUnitsModel(app::Application *app) : application(app)
+    TimeUnitsModel::TimeUnitsModel(app::ApplicationCommon *app) : application(app)
     {}
 
     TimeUnitsModel::~TimeUnitsModel()
diff --git a/products/BellHybrid/apps/application-bell-settings/models/TimeUnitsModel.hpp b/products/BellHybrid/apps/application-bell-settings/models/TimeUnitsModel.hpp
index e62676835..f7ea4c354 100644
--- a/products/BellHybrid/apps/application-bell-settings/models/TimeUnitsModel.hpp
+++ b/products/BellHybrid/apps/application-bell-settings/models/TimeUnitsModel.hpp
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <apps-common/Application.hpp>
+#include <apps-common/ApplicationCommon.hpp>
 #include <apps-common/InternalModel.hpp>
 #include <module-utils/Temperature.hpp>
 #include <time/time_locale.hpp>
@@ -22,7 +22,7 @@ namespace app::bell_settings
     class TimeUnitsModel : public app::InternalModel<gui::ListItem *>, public gui::ListItemProvider
     {
       public:
-        explicit TimeUnitsModel(app::Application *app);
+        explicit TimeUnitsModel(app::ApplicationCommon *app);
 
         ~TimeUnitsModel();
 
@@ -45,7 +45,7 @@ namespace app::bell_settings
         [[nodiscard]] auto getTemperatureUnit() -> utils::temperature::Temperature::Unit;
 
       private:
-        app::Application *application{};
+        app::ApplicationCommon *application{};
         gui::TimeSetListItem *timeSetListItem{};
         gui::TimeFormatSetListItem *timeFmtSetListItem{};
         gui::TemperatureUnitListItem *temperatureUnitListItem{};
diff --git a/products/BellHybrid/apps/application-bell-settings/models/alarm_settings/SnoozeListItemProvider.cpp b/products/BellHybrid/apps/application-bell-settings/models/alarm_settings/SnoozeListItemProvider.cpp
index 68928d2f4..87e681afd 100644
--- a/products/BellHybrid/apps/application-bell-settings/models/alarm_settings/SnoozeListItemProvider.cpp
+++ b/products/BellHybrid/apps/application-bell-settings/models/alarm_settings/SnoozeListItemProvider.cpp
@@ -5,7 +5,7 @@
 #include "SnoozeListItemProvider.hpp"
 #include "SnoozeListItems.hpp"
 
-#include <apps-common/Application.hpp>
+#include <apps-common/ApplicationCommon.hpp>
 #include <common/models/SnoozeSettingsModel.hpp>
 #include <gui/widgets/ListViewEngine.hpp>
 
diff --git a/products/BellHybrid/apps/application-bell-settings/windows/BellSettingsBedtimeToneWindow.cpp b/products/BellHybrid/apps/application-bell-settings/windows/BellSettingsBedtimeToneWindow.cpp
index b46c62d15..0e7f86a9d 100644
--- a/products/BellHybrid/apps/application-bell-settings/windows/BellSettingsBedtimeToneWindow.cpp
+++ b/products/BellHybrid/apps/application-bell-settings/windows/BellSettingsBedtimeToneWindow.cpp
@@ -7,7 +7,7 @@
 
 namespace gui
 {
-    BellSettingsBedtimeToneWindow::BellSettingsBedtimeToneWindow(app::Application *app, std::string name)
+    BellSettingsBedtimeToneWindow::BellSettingsBedtimeToneWindow(app::ApplicationCommon *app, std::string name)
         : AppWindow(app, std::move(name))
     {
         buildInterface();
diff --git a/products/BellHybrid/apps/application-bell-settings/windows/BellSettingsBedtimeToneWindow.hpp b/products/BellHybrid/apps/application-bell-settings/windows/BellSettingsBedtimeToneWindow.hpp
index a4a826424..3bec985b0 100644
--- a/products/BellHybrid/apps/application-bell-settings/windows/BellSettingsBedtimeToneWindow.hpp
+++ b/products/BellHybrid/apps/application-bell-settings/windows/BellSettingsBedtimeToneWindow.hpp
@@ -12,7 +12,7 @@ namespace gui
     class BellSettingsBedtimeToneWindow : public AppWindow
     {
       public:
-        explicit BellSettingsBedtimeToneWindow(app::Application *app,
+        explicit BellSettingsBedtimeToneWindow(app::ApplicationCommon *app,
                                                std::string name = gui::window::name::bellSettingsBedtimeTone);
 
         void buildInterface() override;
diff --git a/products/BellHybrid/apps/application-bell-settings/windows/BellSettingsFrontlight.cpp b/products/BellHybrid/apps/application-bell-settings/windows/BellSettingsFrontlight.cpp
index d28dd5405..b854188e9 100644
--- a/products/BellHybrid/apps/application-bell-settings/windows/BellSettingsFrontlight.cpp
+++ b/products/BellHybrid/apps/application-bell-settings/windows/BellSettingsFrontlight.cpp
@@ -14,7 +14,7 @@
 namespace gui
 {
     BellSettingsFrontlightWindow::BellSettingsFrontlightWindow(
-        app::Application *app,
+        app::ApplicationCommon *app,
         std::unique_ptr<app::bell_settings::FrontlightWindowContract::Presenter> &&windowPresenter,
         std::string name)
         : AppWindow(app, std::move(name)), presenter{std::move(windowPresenter)}
diff --git a/products/BellHybrid/apps/application-bell-settings/windows/BellSettingsFrontlight.hpp b/products/BellHybrid/apps/application-bell-settings/windows/BellSettingsFrontlight.hpp
index 7507da5f0..10fa07a43 100644
--- a/products/BellHybrid/apps/application-bell-settings/windows/BellSettingsFrontlight.hpp
+++ b/products/BellHybrid/apps/application-bell-settings/windows/BellSettingsFrontlight.hpp
@@ -15,7 +15,7 @@ namespace gui
     {
       public:
         explicit BellSettingsFrontlightWindow(
-            app::Application *app,
+            app::ApplicationCommon *app,
             std::unique_ptr<app::bell_settings::FrontlightWindowContract::Presenter> &&windowPresenter,
             std::string name = window::name::bellSettingsFrontlight);
 
diff --git a/products/BellHybrid/apps/application-bell-settings/windows/BellSettingsHomeViewWindow.cpp b/products/BellHybrid/apps/application-bell-settings/windows/BellSettingsHomeViewWindow.cpp
index 2e72b755b..980b7037d 100644
--- a/products/BellHybrid/apps/application-bell-settings/windows/BellSettingsHomeViewWindow.cpp
+++ b/products/BellHybrid/apps/application-bell-settings/windows/BellSettingsHomeViewWindow.cpp
@@ -7,7 +7,7 @@
 
 namespace gui
 {
-    BellSettingsHomeViewWindow::BellSettingsHomeViewWindow(app::Application *app, std::string name)
+    BellSettingsHomeViewWindow::BellSettingsHomeViewWindow(app::ApplicationCommon *app, std::string name)
         : AppWindow(app, std::move(name))
     {
         buildInterface();
diff --git a/products/BellHybrid/apps/application-bell-settings/windows/BellSettingsHomeViewWindow.hpp b/products/BellHybrid/apps/application-bell-settings/windows/BellSettingsHomeViewWindow.hpp
index e787aad9e..d48d49b83 100644
--- a/products/BellHybrid/apps/application-bell-settings/windows/BellSettingsHomeViewWindow.hpp
+++ b/products/BellHybrid/apps/application-bell-settings/windows/BellSettingsHomeViewWindow.hpp
@@ -12,7 +12,7 @@ namespace gui
     class BellSettingsHomeViewWindow : public AppWindow
     {
       public:
-        explicit BellSettingsHomeViewWindow(app::Application *app,
+        explicit BellSettingsHomeViewWindow(app::ApplicationCommon *app,
                                             std::string name = gui::window::name::bellSettingsHomeView);
 
         void buildInterface() override;
diff --git a/products/BellHybrid/apps/application-bell-settings/windows/BellSettingsPrewakeUpWindow.cpp b/products/BellHybrid/apps/application-bell-settings/windows/BellSettingsPrewakeUpWindow.cpp
index 4ff659bf6..5e9de798e 100644
--- a/products/BellHybrid/apps/application-bell-settings/windows/BellSettingsPrewakeUpWindow.cpp
+++ b/products/BellHybrid/apps/application-bell-settings/windows/BellSettingsPrewakeUpWindow.cpp
@@ -13,7 +13,7 @@
 namespace gui
 {
     BellSettingsPrewakeUpWindow::BellSettingsPrewakeUpWindow(
-        app::Application *app,
+        app::ApplicationCommon *app,
         std::unique_ptr<app::bell_settings::PrewakeUpWindowContract::Presenter> &&windowPresenter,
         std::string name)
         : AppWindow(app, name), presenter{std::move(windowPresenter)}
diff --git a/products/BellHybrid/apps/application-bell-settings/windows/BellSettingsPrewakeUpWindow.hpp b/products/BellHybrid/apps/application-bell-settings/windows/BellSettingsPrewakeUpWindow.hpp
index b98570113..dc95d497f 100644
--- a/products/BellHybrid/apps/application-bell-settings/windows/BellSettingsPrewakeUpWindow.hpp
+++ b/products/BellHybrid/apps/application-bell-settings/windows/BellSettingsPrewakeUpWindow.hpp
@@ -17,7 +17,7 @@ namespace gui
     {
       public:
         explicit BellSettingsPrewakeUpWindow(
-            app::Application *app,
+            app::ApplicationCommon *app,
             std::unique_ptr<app::bell_settings::PrewakeUpWindowContract::Presenter> &&windowPresenter,
             std::string name = gui::window::name::bellSettingsAlarmSettingsPrewakeUp);
 
diff --git a/products/BellHybrid/apps/application-bell-settings/windows/BellSettingsTurnOffWindow.cpp b/products/BellHybrid/apps/application-bell-settings/windows/BellSettingsTurnOffWindow.cpp
index 0c5e6ceb7..61e49e557 100644
--- a/products/BellHybrid/apps/application-bell-settings/windows/BellSettingsTurnOffWindow.cpp
+++ b/products/BellHybrid/apps/application-bell-settings/windows/BellSettingsTurnOffWindow.cpp
@@ -7,7 +7,7 @@
 
 namespace gui
 {
-    BellSettingsTurnOffWindow::BellSettingsTurnOffWindow(app::Application *app, std::string name)
+    BellSettingsTurnOffWindow::BellSettingsTurnOffWindow(app::ApplicationCommon *app, std::string name)
         : AppWindow(app, std::move(name))
     {
         buildInterface();
diff --git a/products/BellHybrid/apps/application-bell-settings/windows/BellSettingsTurnOffWindow.hpp b/products/BellHybrid/apps/application-bell-settings/windows/BellSettingsTurnOffWindow.hpp
index a61179229..e7c305a9e 100644
--- a/products/BellHybrid/apps/application-bell-settings/windows/BellSettingsTurnOffWindow.hpp
+++ b/products/BellHybrid/apps/application-bell-settings/windows/BellSettingsTurnOffWindow.hpp
@@ -12,7 +12,7 @@ namespace gui
     class BellSettingsTurnOffWindow : public AppWindow
     {
       public:
-        explicit BellSettingsTurnOffWindow(app::Application *app,
+        explicit BellSettingsTurnOffWindow(app::ApplicationCommon *app,
                                            std::string name = gui::window::name::bellSettingsTurnOff);
 
         void buildInterface() override;
diff --git a/products/BellHybrid/apps/application-bell-settings/windows/BellSettingsWindow.cpp b/products/BellHybrid/apps/application-bell-settings/windows/BellSettingsWindow.cpp
index 7af5fddb9..078678bbd 100644
--- a/products/BellHybrid/apps/application-bell-settings/windows/BellSettingsWindow.cpp
+++ b/products/BellHybrid/apps/application-bell-settings/windows/BellSettingsWindow.cpp
@@ -14,7 +14,8 @@
 namespace gui
 {
 
-    BellSettingsWindow::BellSettingsWindow(app::Application *app) : OptionWindow(app, gui::window::name::bellSettings)
+    BellSettingsWindow::BellSettingsWindow(app::ApplicationCommon *app)
+        : OptionWindow(app, gui::window::name::bellSettings)
     {
         addOptions(settingsOptionsList());
         buildInterface();
diff --git a/products/BellHybrid/apps/application-bell-settings/windows/BellSettingsWindow.hpp b/products/BellHybrid/apps/application-bell-settings/windows/BellSettingsWindow.hpp
index c230a3aec..ea364d580 100644
--- a/products/BellHybrid/apps/application-bell-settings/windows/BellSettingsWindow.hpp
+++ b/products/BellHybrid/apps/application-bell-settings/windows/BellSettingsWindow.hpp
@@ -11,7 +11,7 @@ namespace gui
     class BellSettingsWindow : public OptionWindow
     {
       public:
-        explicit BellSettingsWindow(app::Application *app);
+        explicit BellSettingsWindow(app::ApplicationCommon *app);
 
       private:
         std::list<Option> settingsOptionsList();
diff --git a/products/BellHybrid/apps/application-bell-settings/windows/advanced/BellSettingsAdvancedWindow.cpp b/products/BellHybrid/apps/application-bell-settings/windows/advanced/BellSettingsAdvancedWindow.cpp
index 57631937d..be222b565 100644
--- a/products/BellHybrid/apps/application-bell-settings/windows/advanced/BellSettingsAdvancedWindow.cpp
+++ b/products/BellHybrid/apps/application-bell-settings/windows/advanced/BellSettingsAdvancedWindow.cpp
@@ -13,7 +13,7 @@
 namespace gui
 {
 
-    BellSettingsAdvancedWindow::BellSettingsAdvancedWindow(app::Application *app)
+    BellSettingsAdvancedWindow::BellSettingsAdvancedWindow(app::ApplicationCommon *app)
         : OptionWindow(app, gui::window::name::bellSettingsAdvanced)
     {
         addOptions(settingsOptionsList());
diff --git a/products/BellHybrid/apps/application-bell-settings/windows/advanced/BellSettingsAdvancedWindow.hpp b/products/BellHybrid/apps/application-bell-settings/windows/advanced/BellSettingsAdvancedWindow.hpp
index 2fb68ea7a..9c0cb34c4 100644
--- a/products/BellHybrid/apps/application-bell-settings/windows/advanced/BellSettingsAdvancedWindow.hpp
+++ b/products/BellHybrid/apps/application-bell-settings/windows/advanced/BellSettingsAdvancedWindow.hpp
@@ -11,7 +11,7 @@ namespace gui
     class BellSettingsAdvancedWindow : public OptionWindow
     {
       public:
-        explicit BellSettingsAdvancedWindow(app::Application *app);
+        explicit BellSettingsAdvancedWindow(app::ApplicationCommon *app);
 
       private:
         std::list<Option> settingsOptionsList();
diff --git a/products/BellHybrid/apps/application-bell-settings/windows/advanced/BellSettingsTimeUnitsWindow.cpp b/products/BellHybrid/apps/application-bell-settings/windows/advanced/BellSettingsTimeUnitsWindow.cpp
index dea15f333..43d9348bc 100644
--- a/products/BellHybrid/apps/application-bell-settings/windows/advanced/BellSettingsTimeUnitsWindow.cpp
+++ b/products/BellHybrid/apps/application-bell-settings/windows/advanced/BellSettingsTimeUnitsWindow.cpp
@@ -13,7 +13,7 @@
 namespace gui
 {
     BellSettingsTimeUnitsWindow::BellSettingsTimeUnitsWindow(
-        app::Application *app,
+        app::ApplicationCommon *app,
         std::unique_ptr<app::bell_settings::TimeUnitsWindowContract::Presenter> &&windowPresenter,
         std::string name)
         : AppWindow(app, name), presenter{std::move(windowPresenter)}
diff --git a/products/BellHybrid/apps/application-bell-settings/windows/advanced/BellSettingsTimeUnitsWindow.hpp b/products/BellHybrid/apps/application-bell-settings/windows/advanced/BellSettingsTimeUnitsWindow.hpp
index d42b6405c..64e73b8b0 100644
--- a/products/BellHybrid/apps/application-bell-settings/windows/advanced/BellSettingsTimeUnitsWindow.hpp
+++ b/products/BellHybrid/apps/application-bell-settings/windows/advanced/BellSettingsTimeUnitsWindow.hpp
@@ -17,7 +17,7 @@ namespace gui
     {
       public:
         explicit BellSettingsTimeUnitsWindow(
-            app::Application *app,
+            app::ApplicationCommon *app,
             std::unique_ptr<app::bell_settings::TimeUnitsWindowContract::Presenter> &&windowPresenter,
             std::string name = gui::window::name::bellSettingsTimeUnits);
 
diff --git a/products/BellHybrid/apps/application-bell-settings/windows/alarm_settings/BellSettingsAlarmSettingsSnoozeWindow.cpp b/products/BellHybrid/apps/application-bell-settings/windows/alarm_settings/BellSettingsAlarmSettingsSnoozeWindow.cpp
index f24b5f400..8f99b33ef 100644
--- a/products/BellHybrid/apps/application-bell-settings/windows/alarm_settings/BellSettingsAlarmSettingsSnoozeWindow.cpp
+++ b/products/BellHybrid/apps/application-bell-settings/windows/alarm_settings/BellSettingsAlarmSettingsSnoozeWindow.cpp
@@ -7,7 +7,7 @@
 #include "models/alarm_settings/SnoozeListItemProvider.hpp"
 #include "presenter/alarm_settings/SnoozePresenter.hpp"
 
-#include <apps-common/Application.hpp>
+#include <apps-common/ApplicationCommon.hpp>
 #include <common/BellFinishedWindow.hpp>
 #include <gui/input/InputEvent.hpp>
 #include <widgets/SideListView.hpp>
@@ -16,7 +16,7 @@ namespace gui
 {
 
     BellSettingsAlarmSettingsSnoozeWindow::BellSettingsAlarmSettingsSnoozeWindow(
-        app::Application *app, std::unique_ptr<app::bell_settings::SnoozePresenter> presenter)
+        app::ApplicationCommon *app, std::unique_ptr<app::bell_settings::SnoozePresenter> presenter)
         : AppWindow(app, name), presenter{std::move(presenter)}
     {
         this->presenter->attach(this);
diff --git a/products/BellHybrid/apps/application-bell-settings/windows/alarm_settings/BellSettingsAlarmSettingsSnoozeWindow.hpp b/products/BellHybrid/apps/application-bell-settings/windows/alarm_settings/BellSettingsAlarmSettingsSnoozeWindow.hpp
index 70e11af29..1dd2d3a59 100644
--- a/products/BellHybrid/apps/application-bell-settings/windows/alarm_settings/BellSettingsAlarmSettingsSnoozeWindow.hpp
+++ b/products/BellHybrid/apps/application-bell-settings/windows/alarm_settings/BellSettingsAlarmSettingsSnoozeWindow.hpp
@@ -15,7 +15,7 @@ namespace gui
     {
       public:
         static constexpr auto name = "BellSettingsAlarmSettingsSnooze";
-        BellSettingsAlarmSettingsSnoozeWindow(app::Application *app,
+        BellSettingsAlarmSettingsSnoozeWindow(app::ApplicationCommon *app,
                                               std::unique_ptr<app::bell_settings::SnoozePresenter> presenter);
 
         void buildInterface() override;
diff --git a/products/BellHybrid/apps/application-bell-settings/windows/alarm_settings/BellSettingsAlarmSettingsWindow.cpp b/products/BellHybrid/apps/application-bell-settings/windows/alarm_settings/BellSettingsAlarmSettingsWindow.cpp
index fab7d025a..29596072c 100644
--- a/products/BellHybrid/apps/application-bell-settings/windows/alarm_settings/BellSettingsAlarmSettingsWindow.cpp
+++ b/products/BellHybrid/apps/application-bell-settings/windows/alarm_settings/BellSettingsAlarmSettingsWindow.cpp
@@ -11,7 +11,8 @@
 
 namespace gui
 {
-    BellSettingsAlarmSettingsWindow::BellSettingsAlarmSettingsWindow(app::Application *app) : OptionWindow(app, name)
+    BellSettingsAlarmSettingsWindow::BellSettingsAlarmSettingsWindow(app::ApplicationCommon *app)
+        : OptionWindow(app, name)
     {
         addOptions(alarmSettingsOptionsList());
         buildInterface();
diff --git a/products/BellHybrid/apps/application-bell-settings/windows/alarm_settings/BellSettingsAlarmSettingsWindow.hpp b/products/BellHybrid/apps/application-bell-settings/windows/alarm_settings/BellSettingsAlarmSettingsWindow.hpp
index dafc80470..9e3c60ead 100644
--- a/products/BellHybrid/apps/application-bell-settings/windows/alarm_settings/BellSettingsAlarmSettingsWindow.hpp
+++ b/products/BellHybrid/apps/application-bell-settings/windows/alarm_settings/BellSettingsAlarmSettingsWindow.hpp
@@ -14,7 +14,7 @@ namespace gui
       public:
         static constexpr auto name = "BellSettingsAlarmSettingsWindow";
 
-        explicit BellSettingsAlarmSettingsWindow(app::Application *app);
+        explicit BellSettingsAlarmSettingsWindow(app::ApplicationCommon *app);
 
       private:
         std::list<Option> alarmSettingsOptionsList();
diff --git a/products/BellHybrid/apps/common/CMakeLists.txt b/products/BellHybrid/apps/common/CMakeLists.txt
index c45354a34..5b3e7b07a 100644
--- a/products/BellHybrid/apps/common/CMakeLists.txt
+++ b/products/BellHybrid/apps/common/CMakeLists.txt
@@ -11,7 +11,6 @@ target_include_directories(application-bell-common
 target_sources(application-bell-common
     PRIVATE
         src/AlarmModel.cpp
-        src/ApplicationBell.cpp
         src/TimeUtils.cpp
         src/popups/AlarmActivatedWindow.cpp
         src/SnoozeSettingsModel.cpp
@@ -19,10 +18,9 @@ target_sources(application-bell-common
         src/BellSideListItemWithCallbacks.cpp
     PUBLIC
         include/common/BellFinishedWindow.hpp
-        include/common/ApplicationBell.hpp
         include/common/TimeUtils.hpp
-        include/common/models/AlarmModel.hpp
         include/common/models/AbstractAlarmModel.hpp
+        include/common/models/AlarmModel.hpp
         include/common/models/SnoozeSettingsModel.hpp
         include/common/popups/AlarmActivatedWindow.hpp
         include/common/widgets/BellSideListItemWithCallbacks.hpp
diff --git a/products/BellHybrid/apps/common/include/common/BellFinishedWindow.hpp b/products/BellHybrid/apps/common/include/common/BellFinishedWindow.hpp
index 1dacf019c..bd1c6c393 100644
--- a/products/BellHybrid/apps/common/include/common/BellFinishedWindow.hpp
+++ b/products/BellHybrid/apps/common/include/common/BellFinishedWindow.hpp
@@ -40,7 +40,7 @@ namespace gui
 
         static constexpr auto name = "BellFinishedWindow";
 
-        explicit BellFinishedWindow(app::Application *app);
+        explicit BellFinishedWindow(app::ApplicationCommon *app);
 
       private:
         void buildInterface() override;
diff --git a/products/BellHybrid/apps/common/include/common/models/AlarmModel.hpp b/products/BellHybrid/apps/common/include/common/models/AlarmModel.hpp
index 3717ac414..8033ff616 100644
--- a/products/BellHybrid/apps/common/include/common/models/AlarmModel.hpp
+++ b/products/BellHybrid/apps/common/include/common/models/AlarmModel.hpp
@@ -13,7 +13,7 @@
 
 namespace app
 {
-    class Application;
+    class ApplicationCommon;
 }
 
 namespace app
@@ -23,7 +23,7 @@ namespace app
     class AlarmModel : public AbstractAlarmModel, public AsyncCallbackReceiver
     {
       public:
-        explicit AlarmModel(Application *app);
+        explicit AlarmModel(ApplicationCommon *app);
 
         bool isActive() const override;
         void setAlarmTime(time_t time) override;
@@ -47,7 +47,7 @@ namespace app
         AlarmEventRecord generateDefaultAlarm() const;
         std::shared_ptr<AlarmEventRecord> getAlarmPtr() const;
 
-        Application *app{};
+        ApplicationCommon *app{};
         State state{State::Invalid};
         SingleEventRecord cachedRecord;
         std::uint32_t snoozeCount = 0;
diff --git a/products/BellHybrid/apps/common/include/common/models/SnoozeSettingsModel.hpp b/products/BellHybrid/apps/common/include/common/models/SnoozeSettingsModel.hpp
index e73c4438c..fe1e1639c 100644
--- a/products/BellHybrid/apps/common/include/common/models/SnoozeSettingsModel.hpp
+++ b/products/BellHybrid/apps/common/include/common/models/SnoozeSettingsModel.hpp
@@ -8,7 +8,7 @@
 
 namespace app
 {
-    class Application;
+    class ApplicationCommon;
 }
 
 namespace app::bell_settings
@@ -17,7 +17,7 @@ namespace app::bell_settings
     class SnoozeSettingsModel : public AbstractSnoozeSettingsModel
     {
       public:
-        explicit SnoozeSettingsModel(Application *app);
+        explicit SnoozeSettingsModel(ApplicationCommon *app);
         void setSnooze(bool value) override;
         bool getSnooze() const override;
 
diff --git a/products/BellHybrid/apps/common/include/common/popups/AlarmActivatedWindow.hpp b/products/BellHybrid/apps/common/include/common/popups/AlarmActivatedWindow.hpp
index 7e1739e0a..72a7a90df 100644
--- a/products/BellHybrid/apps/common/include/common/popups/AlarmActivatedWindow.hpp
+++ b/products/BellHybrid/apps/common/include/common/popups/AlarmActivatedWindow.hpp
@@ -11,7 +11,7 @@ namespace gui
     class AlarmActivatedWindow : public Dialog
     {
       public:
-        explicit AlarmActivatedWindow(app::Application *app);
+        explicit AlarmActivatedWindow(app::ApplicationCommon *app);
         void onBeforeShow(ShowMode mode, SwitchData *data) override;
     };
 } /* namespace gui */
diff --git a/products/BellHybrid/apps/common/src/AlarmModel.cpp b/products/BellHybrid/apps/common/src/AlarmModel.cpp
index cc3583a0b..4133ea23c 100644
--- a/products/BellHybrid/apps/common/src/AlarmModel.cpp
+++ b/products/BellHybrid/apps/common/src/AlarmModel.cpp
@@ -3,7 +3,7 @@
 
 #include "models/AlarmModel.hpp"
 
-#include <apps-common/Application.hpp>
+#include <apps-common/ApplicationCommon.hpp>
 #include <db/SystemSettings.hpp>
 #include <module-db/Interface/AlarmEventRecord.hpp>
 #include <time/dateCommon.hpp>
@@ -14,7 +14,7 @@
 
 namespace app
 {
-    AlarmModel::AlarmModel(Application *app) : app::AsyncCallbackReceiver{app}, app{app}
+    AlarmModel::AlarmModel(ApplicationCommon *app) : app::AsyncCallbackReceiver{app}, app{app}
     {
         state = State::InitInProgress;
         settings.init(service::ServiceProxy{app->weak_from_this()});
diff --git a/products/BellHybrid/apps/common/src/BellFinishedWindow.cpp b/products/BellHybrid/apps/common/src/BellFinishedWindow.cpp
index 8ab6e387a..d6f705021 100644
--- a/products/BellHybrid/apps/common/src/BellFinishedWindow.cpp
+++ b/products/BellHybrid/apps/common/src/BellFinishedWindow.cpp
@@ -2,7 +2,7 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "common/BellFinishedWindow.hpp"
-#include <apps-common/Application.hpp>
+#include <apps-common/ApplicationCommon.hpp>
 #include <gui/input/InputEvent.hpp>
 #include <gui/widgets/Icon.hpp>
 #include <i18n/i18n.hpp>
@@ -10,7 +10,7 @@
 namespace gui
 {
 
-    BellFinishedWindow::BellFinishedWindow(app::Application *app) : WindowWithTimer(app, name)
+    BellFinishedWindow::BellFinishedWindow(app::ApplicationCommon *app) : WindowWithTimer(app, name)
     {
         buildInterface();
 
diff --git a/products/BellHybrid/apps/common/src/SnoozeSettingsModel.cpp b/products/BellHybrid/apps/common/src/SnoozeSettingsModel.cpp
index 7f648ba1c..a33a4e6b4 100644
--- a/products/BellHybrid/apps/common/src/SnoozeSettingsModel.cpp
+++ b/products/BellHybrid/apps/common/src/SnoozeSettingsModel.cpp
@@ -3,12 +3,12 @@
 
 #include "models/SnoozeSettingsModel.hpp"
 
-#include <apps-common/Application.hpp>
+#include <apps-common/ApplicationCommon.hpp>
 #include <db/SystemSettings.hpp>
 
 namespace app::bell_settings
 {
-    SnoozeSettingsModel::SnoozeSettingsModel(Application *app)
+    SnoozeSettingsModel::SnoozeSettingsModel(ApplicationCommon *app)
     {
         settings.init(service::ServiceProxy{app->weak_from_this()});
     }
diff --git a/products/BellHybrid/apps/common/src/popups/AlarmActivatedWindow.cpp b/products/BellHybrid/apps/common/src/popups/AlarmActivatedWindow.cpp
index 364b5580b..4c3532298 100644
--- a/products/BellHybrid/apps/common/src/popups/AlarmActivatedWindow.cpp
+++ b/products/BellHybrid/apps/common/src/popups/AlarmActivatedWindow.cpp
@@ -1,14 +1,15 @@
 // Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include <common/popups/AlarmActivatedWindow.hpp>
 
 #include <apps-common/messages/DialogMetadataMessage.hpp>
 #include <common/TimeUtils.hpp>
+#include <common/popups/AlarmActivatedWindow.hpp>
+#include <popups/Popups.hpp>
 
 namespace gui
 {
-    AlarmActivatedWindow::AlarmActivatedWindow(app::Application *app)
+    AlarmActivatedWindow::AlarmActivatedWindow(app::ApplicationCommon *app)
         : Dialog(app, popup::window::alarm_activated_window)
     {}
 
diff --git a/products/BellHybrid/apps/common/include/common/ApplicationBell.hpp b/products/BellHybrid/apps/include/Application.hpp
similarity index 70%
rename from products/BellHybrid/apps/common/include/common/ApplicationBell.hpp
rename to products/BellHybrid/apps/include/Application.hpp
index 14e5a3ec8..223399269 100644
--- a/products/BellHybrid/apps/common/include/common/ApplicationBell.hpp
+++ b/products/BellHybrid/apps/include/Application.hpp
@@ -3,14 +3,14 @@
 
 #pragma once
 
-#include <apps-common/Application.hpp>
+#include <ApplicationCommon.hpp>
 
 namespace app
 {
-    class ApplicationBell : public Application
+    class Application : public ApplicationCommon
     {
       public:
-        using Application::Application;
+        using ApplicationCommon::ApplicationCommon;
 
       protected:
         void attachPopups(const std::vector<gui::popup::ID> &popupsList) override;
diff --git a/products/PurePhone/CMakeLists.txt b/products/PurePhone/CMakeLists.txt
index 61cc08d8d..4ae63fe82 100644
--- a/products/PurePhone/CMakeLists.txt
+++ b/products/PurePhone/CMakeLists.txt
@@ -43,6 +43,7 @@ set_target_properties(PurePhone
 
 target_link_libraries(PurePhone
     PRIVATE
+        app
         $<$<BOOL:${ENABLE_APP_ANTENNA}>:application-antenna>
         application-calculator
         application-calendar
@@ -109,6 +110,7 @@ include(GitHubWorkerMessages)
 github_message_standalone()
 github_message_update()
 
+add_subdirectory(apps)
 add_subdirectory(services)
 add_subdirectory(sys)
 
diff --git a/products/PurePhone/apps/Application.cpp b/products/PurePhone/apps/Application.cpp
new file mode 100644
index 000000000..f154a8c27
--- /dev/null
+++ b/products/PurePhone/apps/Application.cpp
@@ -0,0 +1,4 @@
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
+
+#include <Application.hpp>
diff --git a/products/PurePhone/apps/CMakeLists.txt b/products/PurePhone/apps/CMakeLists.txt
new file mode 100644
index 000000000..24094ecb1
--- /dev/null
+++ b/products/PurePhone/apps/CMakeLists.txt
@@ -0,0 +1,19 @@
+add_library(app STATIC)
+
+target_sources(app
+    PRIVATE
+        Application.cpp
+    PUBLIC
+        include/Application.hpp
+)
+
+target_include_directories(app
+    PUBLIC
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+)
+
+target_link_libraries(app
+    PRIVATE
+        apps-common
+)
+
diff --git a/products/PurePhone/apps/include/Application.hpp b/products/PurePhone/apps/include/Application.hpp
new file mode 100644
index 000000000..6b74b2dea
--- /dev/null
+++ b/products/PurePhone/apps/include/Application.hpp
@@ -0,0 +1,15 @@
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
+// For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
+
+#pragma once
+
+#include <ApplicationCommon.hpp>
+
+namespace app
+{
+    class Application : public ApplicationCommon
+    {
+      public:
+        using ApplicationCommon::ApplicationCommon;
+    };
+} // namespace app
diff --git a/products/PurePhone/services/appmgr/ApplicationManager.cpp b/products/PurePhone/services/appmgr/ApplicationManager.cpp
index e38b9feea..ffabfa47b 100644
--- a/products/PurePhone/services/appmgr/ApplicationManager.cpp
+++ b/products/PurePhone/services/appmgr/ApplicationManager.cpp
@@ -500,7 +500,7 @@ namespace app::manager
 
         if (targetApp->state() == ApplicationHandle::State::ACTIVE_FORGROUND ||
             targetApp->state() == ApplicationHandle::State::ACTIVE_BACKGROUND) {
-            app::Application::requestAction(this, targetName, action.actionId, std::move(action.params));
+            app::ApplicationCommon::requestAction(this, targetName, action.actionId, std::move(action.params));
             return ActionProcessStatus::Accepted;
         }
         return ActionProcessStatus::Skipped;
diff --git a/products/PurePhone/test/test-settings/test-service-db-settings-api.cpp b/products/PurePhone/test/test-settings/test-service-db-settings-api.cpp
index 62773a252..3c1a09b41 100644
--- a/products/PurePhone/test/test-settings/test-service-db-settings-api.cpp
+++ b/products/PurePhone/test/test-settings/test-service-db-settings-api.cpp
@@ -19,16 +19,22 @@
 #include "test-service-db-settings-testapps.hpp"
 #include "Database.cpp"
 
+#include <module-db/Databases/CalllogDB.hpp>
 #include <module-db/Databases/CountryCodesDB.hpp>
 #include <module-db/Databases/EventsDB.hpp>
 #include <module-db/Databases/MultimediaFilesDB.hpp>
 #include <module-db/Databases/NotesDB.hpp>
 #include <module-db/Databases/NotificationsDB.hpp>
+#include <module-db/Databases/SmsDB.hpp>
 #include <module-db/Interface/AlarmEventRecord.hpp>
+#include <module-db/Interface/CalllogRecord.hpp>
 #include <module-db/Interface/CountryCodeRecord.hpp>
 #include <module-db/Interface/MultimediaFilesRecord.hpp>
 #include <module-db/Interface/NotesRecord.hpp>
 #include <module-db/Interface/NotificationsRecord.hpp>
+#include <module-db/Interface/SMSRecord.hpp>
+#include <module-db/Interface/SMSTemplateRecord.hpp>
+#include <module-db/Interface/ThreadRecord.hpp>
 #include <service-db/agents/quotes/QuotesAgent.hpp>
 
 TEST_CASE("SettingsApi")
diff --git a/products/PurePhone/test/test-settings/test-service-db-settings-testapps.hpp b/products/PurePhone/test/test-settings/test-service-db-settings-testapps.hpp
index c67b90232..dc0ceb063 100644
--- a/products/PurePhone/test/test-settings/test-service-db-settings-testapps.hpp
+++ b/products/PurePhone/test/test-settings/test-service-db-settings-testapps.hpp
@@ -1,6 +1,9 @@
 // Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
+#include <iostream>
+#include <mutex>
+
 namespace app
 {
     class UserPowerDownRequest : public sys::DataMessage
diff --git a/products/PurePhone/test/test-settings/test-service-db-settings-testservices.hpp b/products/PurePhone/test/test-settings/test-service-db-settings-testservices.hpp
index 76f673e5b..4e66a03ef 100644
--- a/products/PurePhone/test/test-settings/test-service-db-settings-testservices.hpp
+++ b/products/PurePhone/test/test-settings/test-service-db-settings-testservices.hpp
@@ -2,6 +2,7 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include <memory>
+#include <iostream>
 
 namespace settings
 {