54 files changed, 149 insertions(+), 133 deletions(-)

M module-apps/application-alarm-clock/widgets/AlarmClockStyle.hpp
M module-apps/application-alarm-clock/windows/AlarmClockMainWindow.cpp
M module-apps/application-antenna/windows/ScanModesWindow.cpp
M module-apps/application-calculator/widgets/CalculatorStyle.hpp
M module-apps/application-calendar/widgets/CalendarStyle.hpp
M module-apps/application-calendar/windows/CalendarMainWindow.cpp
M module-apps/application-calllog/data/CallLogStyle.hpp
M module-apps/application-desktop/windows/MenuWindow.cpp
M module-apps/application-desktop/windows/PostUpdateWindow.cpp
M module-apps/application-meditation/data/Style.hpp
M module-apps/application-messages/data/MessagesStyle.hpp
M module-apps/application-messages/windows/MessagesMainWindow.cpp
M module-apps/application-messages/windows/NewMessage.cpp
M module-apps/application-music-player/data/MusicPlayerStyle.hpp
M module-apps/application-notes/style/NoteEditStyle.hpp
M module-apps/application-notes/style/NotePreviewStyle.hpp
M module-apps/application-notes/style/NotesListStyle.hpp
M module-apps/application-notes/windows/NoteMainWindow.cpp
M module-apps/application-phonebook/data/PhonebookStyle.hpp
M module-apps/application-phonebook/widgets/ContactFlagsWidget.cpp
M module-apps/application-settings-new/widgets/SettingsStyle.hpp
M module-apps/application-settings-new/windows/ApnSettingsWindow.cpp
M module-apps/application-settings-new/windows/QuotesAddWindow.cpp
M module-apps/application-settings-new/windows/QuotesMainWindow.cpp
M module-apps/application-settings-new/windows/SoundSelectWindow.cpp
M module-apps/application-settings-new/windows/TechnicalInformationWindow.cpp
M module-apps/application-settings/widgets/ColorTestListStyle.hpp
M module-apps/application-settings/windows/BtScanWindow.cpp
M module-apps/application-settings/windows/BtWindow.cpp
M module-apps/application-settings/windows/CellularPassthroughWindow.cpp
M module-apps/application-settings/windows/FotaWindow.cpp
M module-apps/application-settings/windows/Info.cpp
M module-apps/application-settings/windows/UITestWindow.cpp
M module-apps/application-special-input/data/SpecialCharactersTableStyle.hpp
M module-apps/apps-common/locks/windows/LockInputWindow.cpp
M module-apps/apps-common/options/OptionStyle.hpp
M module-apps/apps-common/popups/VolumeWindow.cpp
M module-apps/apps-common/popups/lock-popups/PhoneLockChangeInfoWindow.cpp
M module-apps/apps-common/popups/lock-popups/PhoneLockedInfoWindow.cpp
M module-apps/apps-common/popups/lock-popups/SimInfoWindow.cpp
M module-apps/apps-common/popups/lock-popups/SimNotReadyWindow.cpp
M module-apps/apps-common/widgets/DateAndTimeStyle.hpp
M module-apps/apps-common/windows/AppWindow.cpp
M module-apps/apps-common/windows/Dialog.cpp
M module-gui/gui/widgets/StatusBar.cpp
M module-gui/gui/widgets/Style.hpp
M module-gui/gui/widgets/status-bar/BatteryBar.cpp
M module-gui/gui/widgets/status-bar/BatteryText.cpp
M module-gui/gui/widgets/status-bar/NetworkAccessTechnology.cpp
M module-gui/gui/widgets/status-bar/PhoneMode.cpp
M module-gui/gui/widgets/status-bar/SignalStrengthBar.cpp
M module-gui/gui/widgets/status-bar/SignalStrengthText.cpp
M module-gui/gui/widgets/status-bar/Style.hpp
M module-gui/gui/widgets/status-bar/Time.cpp

@@ 1,4 1,4 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #pragma once


@@ 17,7 17,7 @@ namespace style::alarmClock
         inline constexpr auto arrow_x    = 30;
         inline constexpr auto arrow_y    = 62;
         inline constexpr auto listView_x = style::window::default_left_margin;
-        inline constexpr auto listView_y = style::header::height;
+        inline constexpr auto listView_y = style::window::default_vertical_pos;
         inline constexpr auto listView_w = style::listview::body_width_with_scroll;
         inline constexpr auto listView_h = style::window_height - listView_y - style::footer::height;
 

@@ 54,13 54,14 @@ namespace app::alarmClock
         };
         alarmsList->rebuildList();
 
-        emptyListIcon                       = new gui::Icon(this,
-                                      0,
-                                      style::header::height,
-                                      style::window_width,
-                                      style::window_height - ::style::header::height - ::style::footer::height,
-                                      "phonebook_empty_grey_circle_W_G",
-                                      utils::translate("app_alarm_clock_no_alarms_information"));
+        emptyListIcon =
+            new gui::Icon(this,
+                          0,
+                          style::window::default_vertical_pos,
+                          style::window_width,
+                          style::window_height - ::style::window::default_vertical_pos - ::style::footer::height,
+                          "phonebook_empty_grey_circle_W_G",
+                          utils::translate("app_alarm_clock_no_alarms_information"));
         emptyListIcon->focusChangedCallback = [this](gui::Item &) {
             onEmptyList();
             return true;

@@ 50,9 50,9 @@ namespace gui
         modeButtonParams.insert(std::pair<uint32_t, std::string>(scanModes::CDMA_and_HDR_only, "CDMA and HDR only"));
 
         uint32_t w = this->getWidth() - style::window::default_left_margin * 2;
-        uint32_t h = this->getHeight() - title->offset_h() - bottomBar->getHeight();
+        uint32_t h = this->getHeight() - style::window::default_vertical_pos - bottomBar->getHeight();
 
-        modesBox = new gui::VBox(this, style::window::default_left_margin, (uint32_t)title->offset_h(), w, h);
+        modesBox = new gui::VBox(this, style::window::default_left_margin, style::window::default_vertical_pos, w, h);
         modesBox->setPenWidth(0);
         modesBox->setPenFocusWidth(0);
         modesBox->setEdges(gui::RectangleEdge::None);

@@ 12,10 12,10 @@ namespace style::calculator
     namespace window
     {
         inline constexpr auto math_box_height      = 240;
-        inline constexpr auto math_box_offset_top  = style::header::height + 200;
+        inline constexpr auto math_box_offset_top  = style::window::default_vertical_pos + 200;
         inline constexpr auto math_box_cell_height = 80;
         inline constexpr auto math_box_cell_width  = style::window::default_body_width / 3;
-        inline constexpr auto input_offset_top     = style::header::height + 20;
+        inline constexpr auto input_offset_top     = style::window::default_vertical_pos + 20;
         inline constexpr auto input_height         = 100;
         inline constexpr auto input_width          = 400;
         inline constexpr auto input_margin         = 40;

@@ 51,7 51,7 @@ namespace style
             inline constexpr auto arrow_x    = 30;
             inline constexpr auto arrow_y    = 62;
             inline constexpr auto listView_x = style::window::default_left_margin;
-            inline constexpr auto listView_y = style::header::height;
+            inline constexpr auto listView_y = style::window::default_vertical_pos;
             inline constexpr auto listView_w = style::listview::body_width_with_scroll;
             inline constexpr auto listView_h = style::window_height - listView_y - style::footer::height;
 

@@ 51,9 51,9 @@ namespace gui
         auto app = dynamic_cast<app::ApplicationCalendar *>(application);
         assert(app != nullptr);
 
-        offsetFromTop = title->offset_h() + style::window::calendar::month_year_height;
+        offsetFromTop = style::window::default_vertical_pos + style::window::calendar::month_year_height;
         monthWidth    = style::window::default_body_width;
-        monthHeight   = style::window_height - title->offset_h() - style::footer::height;
+        monthHeight   = style::window_height - style::window::default_vertical_pos - style::footer::height;
         dayWidth      = style::window::calendar::day_cell_width;
         dayHeight     = style::window::calendar::day_cell_height;
 


@@ 133,7 133,7 @@ namespace gui
     {
         dateLabel = new Label(this,
                               style::window::default_left_margin,
-                              title->offset_h(),
+                              style::window::default_vertical_pos,
                               style::window::default_body_width,
                               style::window::calendar::month_year_height,
                               actualDateTime);

@@ 15,7 15,7 @@ namespace callLogStyle
     namespace detailsWindow
     {
         constexpr inline auto x = style::window::bottomBar::leftMargin;
-        constexpr inline auto y = style::header::height;
+        constexpr inline auto y = style::window::default_vertical_pos;
         constexpr inline auto w = style::window_width - 2 * x;
         constexpr inline auto h = style::window::default_body_height;
 


@@ 43,7 43,7 @@ namespace callLogStyle
     namespace mainWindow
     {
         constexpr inline uint32_t x = style::window::default_left_margin;
-        constexpr inline uint32_t y = style::header::height;
+        constexpr inline uint32_t y = style::window::default_vertical_pos;
         constexpr inline uint32_t w = style::listview::body_width_with_scroll;
         constexpr inline uint32_t h = style::window_height - y - style::footer::height;
     } // namespace mainWindow

@@ 273,15 273,13 @@ namespace gui
 
         using namespace style::window;
         mainMenu->setSize(this->area().w - default_left_margin - default_right_margin,
-                          bottomBar->area().pos(Axis::Y) - this->title->getOffset(Axis::Y) -
-                              style::design::grid_offset);
-        mainMenu->setPosition(default_left_margin, title->getOffset(Axis::Y) + style::design::grid_offset);
+                          bottomBar->area().pos(Axis::Y) - default_vertical_pos - style::design::grid_offset);
+        mainMenu->setPosition(default_left_margin, default_vertical_pos + style::design::grid_offset);
         mainMenu->setVisible(false);
 
         toolsMenu->setSize(this->area().w - default_left_margin - default_right_margin,
-                           bottomBar->area().pos(Axis::Y) - this->title->getOffset(Axis::Y) -
-                               style::design::grid_offset);
-        toolsMenu->setPosition(default_left_margin, title->getOffset(Axis::Y) + style::design::grid_offset);
+                           bottomBar->area().pos(Axis::Y) - default_vertical_pos - style::design::grid_offset);
+        toolsMenu->setPosition(default_left_margin, default_vertical_pos + style::design::grid_offset);
         toolsMenu->setVisible(false);
 
         switchMenu(mainMenu);

@@ 74,7 74,7 @@ void PostUpdateWindow::buildInterface()
 
     infoIcon = new gui::Icon(this,
                              style::window::default_left_margin,
-                             style::header::height,
+                             style::window::default_vertical_pos,
                              style::window::default_body_width,
                              style::window::default_body_height,
                              "circle_success",

@@ 9,9 9,9 @@ namespace style::meditation
     namespace body
     {
         constexpr auto Width  = style::window_width;
-        constexpr auto Height = style::window_height - style::header::height - style::footer::height - 1;
+        constexpr auto Height = style::window_height - style::window::default_vertical_pos - style::footer::height - 1;
         constexpr auto X      = 1;
-        constexpr auto Y      = style::header::height;
+        constexpr auto Y      = style::window::default_vertical_pos;
     } // namespace body
 
     namespace timer


@@ 112,7 112,7 @@ namespace style::meditation
         namespace window
         {
             constexpr auto X      = style::window::default_left_margin;
-            constexpr auto Y      = style::header::height;
+            constexpr auto Y      = style::window::default_vertical_pos;
             constexpr auto Width  = style::listview::body_width_with_scroll;
             constexpr auto Height = style::window_height - Y - style::footer::height;
         } // namespace window

@@ 1,4 1,4 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #pragma once


@@ 11,7 11,7 @@ namespace style
         {
             inline constexpr uint32_t listPositionX = style::window::default_left_margin;
             // Magic 1 -> discussed with Design for proper alignment.
-            inline constexpr uint32_t ListPositionY = style::header::height - 1;
+            inline constexpr uint32_t ListPositionY = style::window::default_vertical_pos - 1;
             // Bottom margin need to be added to fit all elements.
             inline constexpr uint32_t listHeight =
                 style::window_height - ListPositionY - style::footer::height + style::margins::small;


@@ 96,7 96,7 @@ namespace style
         namespace smsList
         {
             inline constexpr uint32_t x = style::window::default_left_margin;
-            inline constexpr uint32_t y = style::header::height;
+            inline constexpr uint32_t y = style::window::default_vertical_pos;
             inline constexpr uint32_t h = style::window::default_body_height;
             inline constexpr uint32_t w = style::listview::body_width_with_scroll;
         } // namespace smsList


@@ 106,7 106,7 @@ namespace style
             namespace list
             {
                 inline constexpr uint32_t x = style::window::default_left_margin;
-                inline constexpr uint32_t y = style::header::height;
+                inline constexpr uint32_t y = style::window::default_vertical_pos;
                 inline constexpr uint32_t h = style::window_height - y - style::footer::height;
                 inline constexpr uint32_t w = style::listview::body_width_with_scroll;
 

@@ 74,9 74,9 @@ namespace gui
 
         emptyListIcon = new Icon(this,
                                  0,
-                                 style::header::height,
+                                 style::window::default_vertical_pos,
                                  style::window_width,
-                                 style::window_height - style::header::height - style::footer::height,
+                                 style::window_height - style::window::default_vertical_pos - style::footer::height,
                                  "phonebook_empty_grey_circle_W_G",
                                  utils::translate("app_messages_no_messages"));
 

@@ 190,8 190,8 @@ namespace gui
         setTitle(utils::translate("sms_title_message"));
 
         const uint32_t w = this->getWidth() - style::window::default_left_margin - style::window::default_right_margin;
-        const uint32_t h = this->getHeight() - title->offset_h() - bottomBar->getHeight();
-        body             = new gui::VBox(this, style::window::default_left_margin, (uint32_t)title->offset_h(), w, h);
+        const uint32_t h = this->getHeight() - style::window::default_vertical_pos - bottomBar->getHeight();
+        body = new gui::VBox(this, style::window::default_left_margin, style::window::default_vertical_pos, w, h);
 
         auto recipientLabel = new Label(body, 0, 0, body->getWidth(), msgStyle::recipientLabel::h);
         recipientLabel->setText(utils::translate("sms_add_rec_num"));

@@ 1,4 1,4 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #pragma once


@@ 71,7 71,7 @@ namespace musicPlayerStyle
     {
         constexpr uint32_t x = style::window::default_left_margin;
         // Magic 1 -> discussed with Design for proper alignment.
-        constexpr uint32_t y = style::header::height - 1;
+        constexpr uint32_t y = style::window::default_vertical_pos - 1;
         constexpr uint32_t w = style::listview::body_width_with_scroll;
         // Bottom margin need to be added to fit all elements.
         constexpr uint32_t h = style::window_height - y - style::footer::height + style::margins::small;

@@ 1,4 1,4 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #pragma once


@@ 8,7 8,7 @@
 namespace app::notes::style::edit
 {
     constexpr inline auto LeftMargin = ::style::window::default_left_margin;
-    constexpr inline auto TopMargin  = ::style::header::height + ::style::margins::very_big - 1;
+    constexpr inline auto TopMargin  = ::style::window::default_vertical_pos + ::style::margins::very_big - 1;
     constexpr inline auto Width      = ::style::window::default_body_width;
     constexpr inline auto Height     = ::style::window::default_body_height - ::style::margins::very_big;
 

@@ 1,4 1,4 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #pragma once


@@ 8,7 8,7 @@
 namespace app::notes::style::preview
 {
     constexpr inline auto LeftMargin = ::style::window::default_left_margin;
-    constexpr inline auto TopMargin  = ::style::header::height + ::style::margins::very_big - 1;
+    constexpr inline auto TopMargin  = ::style::window::default_vertical_pos + ::style::margins::very_big - 1;
     constexpr inline auto Width      = ::style::window::default_body_width;
     constexpr inline auto Height     = ::style::window::default_body_height - ::style::margins::very_big;
 

@@ 1,4 1,4 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #pragma once


@@ 8,7 8,7 @@
 namespace app::notes::style::list
 {
     constexpr inline auto X      = ::style::window::default_left_margin;
-    constexpr inline auto Y      = ::style::header::height + ::style::margins::small - 1;
+    constexpr inline auto Y      = ::style::window::default_vertical_pos + ::style::margins::small - 1;
     constexpr inline auto Width  = ::style::window::default_body_width;
     constexpr inline auto Height = ::style::window::default_body_height - ::style::margins::small;
 

@@ 93,13 93,14 @@ namespace app::notes
         list->setVisible(true);
         list->rebuildList();
 
-        emptyListIcon                       = new gui::Icon(this,
-                                      0,
-                                      ::style::header::height,
-                                      ::style::window_width,
-                                      ::style::window_height - ::style::header::height - ::style::footer::height,
-                                      "phonebook_empty_grey_circle_W_G",
-                                      utils::translate("app_notes_no_notes"));
+        emptyListIcon =
+            new gui::Icon(this,
+                          0,
+                          ::style::window::default_vertical_pos,
+                          ::style::window_width,
+                          ::style::window_height - ::style::window::default_vertical_pos - ::style::footer::height,
+                          "phonebook_empty_grey_circle_W_G",
+                          utils::translate("app_notes_no_notes"));
         emptyListIcon->focusChangedCallback = [this]([[maybe_unused]] gui::Item &item) {
             onEmptyList();
             return true;

@@ 44,7 44,7 @@ namespace phonebookStyle
         namespace contactsList
         {
             inline constexpr uint32_t x = style::window::default_left_margin;
-            inline constexpr uint32_t y = style::header::height;
+            inline constexpr uint32_t y = style::window::default_vertical_pos;
             inline constexpr uint32_t w = style::listview::body_width_with_scroll;
             inline constexpr uint32_t h = style::window_height - y - style::footer::height;
         } // namespace contactsList


@@ 55,7 55,7 @@ namespace phonebookStyle
         namespace newContactsList
         {
             inline constexpr uint32_t x = style::window::default_left_margin;
-            inline constexpr uint32_t y = style::header::height;
+            inline constexpr uint32_t y = style::window::default_vertical_pos;
             inline constexpr uint32_t w = style::listview::body_width_with_scroll;
             inline constexpr uint32_t h = style::window_height - y - style::footer::height;
         } // namespace newContactsList


@@ 66,14 66,14 @@ namespace phonebookStyle
         namespace contactDetailsList
         {
             inline constexpr uint32_t x = style::window::default_left_margin;
-            inline constexpr uint32_t y = style::header::height + 74;
+            inline constexpr uint32_t y = style::window::default_vertical_pos + 74;
             inline constexpr uint32_t w = style::listview::body_width_with_scroll;
             inline constexpr uint32_t h = style::window_height - y - style::footer::height;
         } // namespace contactDetailsList
         namespace contactDetailsListNoFlags
         {
             inline constexpr uint32_t x = style::window::default_left_margin;
-            inline constexpr uint32_t y = style::header::height;
+            inline constexpr uint32_t y = style::window::default_vertical_pos;
             inline constexpr uint32_t w = style::listview::body_width_with_scroll;
             inline constexpr uint32_t h = style::window_height - y - style::footer::height;
         } // namespace contactDetailsListNoFlags


@@ 85,7 85,7 @@ namespace phonebookStyle
         namespace searchResultList
         {
             inline constexpr uint32_t x = style::window::default_left_margin;
-            inline constexpr uint32_t y = style::header::height;
+            inline constexpr uint32_t y = style::window::default_vertical_pos;
             inline constexpr uint32_t w = style::listview::body_width_with_scroll;
             inline constexpr uint32_t h = style::window_height - y - style::footer::height;
         } // namespace searchResultList


@@ 96,7 96,7 @@ namespace phonebookStyle
         namespace contactsListIce
         {
             inline constexpr uint32_t x = style::window::default_left_margin;
-            inline constexpr uint32_t y = style::header::height;
+            inline constexpr uint32_t y = style::window::default_vertical_pos;
             inline constexpr uint32_t w = style::listview::body_width_with_scroll;
             inline constexpr uint32_t h = style::window_height - y - style::footer::height;
         } // namespace contactsListIce

@@ 17,7 17,7 @@ namespace gui
 
     const unsigned char ContactFlagsWidget::iconsCount = 4;
     ContactFlagsWidget::ContactFlagsWidget(Item *parent)
-        : Rect(parent, 0, style::header::height, style::window_width, style::widget::ContactFlag::height)
+        : Rect(parent, 0, style::window::default_vertical_pos, style::window_width, style::widget::ContactFlag::height)
     {
         favourites = speedDial = ice = true;
         blocked                      = false;

@@ 77,7 77,7 @@ namespace style
 
             namespace nightshift
             {
-                inline constexpr auto body_offset = style::header::height + 16;
+                inline constexpr auto body_offset = style::window::default_vertical_pos + 16;
 
                 inline constexpr auto separator_h = 55;
             } // namespace nightshift


@@ 85,7 85,7 @@ namespace style
             namespace newApn
             {
                 inline constexpr uint32_t x = style::window::default_left_margin;
-                inline constexpr uint32_t y = style::header::height;
+                inline constexpr uint32_t y = style::window::default_vertical_pos;
                 inline constexpr uint32_t w = style::listview::body_width_with_scroll;
                 inline constexpr uint32_t h = style::window_height - y - style::footer::height;
             } // namespace newApn


@@ 131,7 131,8 @@ namespace style
             namespace sar
             {
                 inline constexpr auto LeftMargin = ::style::window::default_left_margin;
-                inline constexpr auto TopMargin  = ::style::header::height + ::style::margins::very_big - 1;
+                inline constexpr auto TopMargin =
+                    ::style::window::default_vertical_pos + ::style::margins::very_big - 1;
                 inline constexpr auto Width      = ::style::window::default_body_width;
                 inline constexpr auto Height     = ::style::window::default_body_height - ::style::margins::very_big;
 


@@ 153,7 154,7 @@ namespace style
         namespace list
         {
             inline constexpr auto X      = style::window::default_left_margin;
-            inline constexpr auto Y      = style::header::height;
+            inline constexpr auto Y      = style::window::default_vertical_pos;
             inline constexpr auto Width  = style::listview::body_width_with_scroll;
             inline constexpr auto Height = style::window_height - Y - style::footer::height;
         } // namespace list

@@ 36,9 36,9 @@ namespace gui
                                     "cross");
         emptyListIcon  = new Icon(this,
                                  0,
-                                 style::header::height,
+                                 style::window::default_vertical_pos,
                                  style::window_width,
-                                 style::window_height - style::header::height - style::footer::height,
+                                 style::window_height - style::window::default_vertical_pos - style::footer::height,
                                  "phonebook_empty_grey_circle_W_G",
                                  utils::translate("app_settings_apn_settings_no_apns"));
 

@@ 47,7 47,7 @@ namespace gui
 
         auto vBox = new VBox(this,
                              style::window::default_left_margin,
-                             style::header::height + style::margins::very_big,
+                             style::window::default_vertical_pos + style::margins::very_big,
                              style::window::default_body_width,
                              style::window::default_body_height);
 

@@ 17,7 17,7 @@ namespace style::quotes
     namespace list
     {
         constexpr auto X      = style::window::default_left_margin;
-        constexpr auto Y      = style::header::height;
+        constexpr auto Y      = style::window::default_vertical_pos;
         constexpr auto Width  = style::listview::body_width_with_scroll;
         constexpr auto Height = style::window_height - Y - style::footer::height;
     } // namespace list

@@ 31,10 31,10 @@ namespace gui
 
         mSoundsList = new gui::ListView(this,
                                         style::window::default_left_margin,
-                                        style::header::height - 1,
+                                        style::window::default_vertical_pos - 1,
                                         style::listview::body_width_with_scroll,
-                                        style::window_height - style::header::height + 1 - style::footer::height +
-                                            style::margins::small,
+                                        style::window_height - style::window::default_vertical_pos + 1 -
+                                            style::footer::height + style::margins::small,
                                         mSoundsModel,
                                         listview::ScrollBarType::Proportional);
 

@@ 26,7 26,7 @@ namespace gui
 
         auto vBox = new VBox(this,
                              style::window::default_left_margin,
-                             style::header::height + style::margins::very_big,
+                             style::window::default_vertical_pos + style::margins::very_big,
                              style::window::default_body_width,
                              style::window::default_body_height);
         vBox->setEdges(RectangleEdge::None);

@@ 10,7 10,7 @@ namespace style::colorTest
     namespace listview
     {
         inline constexpr auto x      = style::window::default_left_margin;
-        inline constexpr auto y      = style::header::height;
+        inline constexpr auto y      = style::window::default_vertical_pos;
         inline constexpr auto width  = style::listview::body_width_with_scroll;
         inline constexpr auto height = style::window_height - y - style::footer::height;
     } // namespace listview

@@ 65,7 65,8 @@ namespace gui
 
         setTitle(utils::translate("BT_scan_results"));
 
-        box = new gui::VBox(this, 0, title->offset_h(), style::window_width, 7 * style::window::label::default_h);
+        box = new gui::VBox(
+            this, 0, style::window::default_vertical_pos, style::window_width, 7 * style::window::label::default_h);
 
         for (auto device : devices) {
             add_box_label2(box, device.name, [=](Item &) {

@@ 63,7 63,8 @@ namespace gui
         setTitle(utils::translate("app_settings_bt"));
 
         LOG_INFO("Create box layout");
-        box = new gui::VBox(this, 0, title->offset_h(), style::window_width, 8 * style::window::label::default_h);
+        box = new gui::VBox(
+            this, 0, style::window::default_vertical_pos, style::window_width, 8 * style::window::label::default_h);
         box->setEdges(RectangleEdge::None);
 
         add_box_label(box, "Bluetooth on off", [=](Item &) {

@@ 34,7 34,8 @@ namespace gui
 
         setTitle(utils::translate("app_settings_cellular_passthrough"));
 
-        layout = new VBox(this, 0, title->offset_h(), style::window_width, 8 * style::window::label::big_h);
+        layout = new VBox(
+            this, 0, style::window::default_vertical_pos, style::window_width, 8 * style::window::label::big_h);
         layout->setPenFocusWidth(style::window::default_border_no_focus_w);
 
         statusHbox = new gui::HBox(layout,

@@ 42,7 42,8 @@ namespace gui
         bottomBar->setText(BottomBar::Side::CENTER, utils::translate("Go"));
         bottomBar->setText(BottomBar::Side::RIGHT, utils::translate("common_back"));
 
-        mainBox = new gui::VBox(this, 0, title->offset_h(), style::window_width, style::window_height);
+        mainBox =
+            new gui::VBox(this, 0, style::window::default_vertical_pos, style::window_width, style::window_height);
         mainBox->setPenWidth(style::window::default_border_no_focus_w);
 
         addBoxLabel(mainBox, "FOTA Status:");

@@ 39,7 39,7 @@ namespace gui
 
         setTitle("Info");
 
-        box = new gui::VBox(this, 0, title->offset_h(), style::window_width, style::window_height);
+        box = new gui::VBox(this, 0, style::window::default_vertical_pos, style::window_width, style::window_height);
         box->setPenWidth(style::window::default_border_no_focus_w);
 
         addAlignedLabelWithValue(box, "GIT revision:", std::string(GIT_REV));

@@ 28,8 28,11 @@ namespace gui
         bottomBar->setText(BottomBar::Side::CENTER, utils::translate(style::strings::common::select));
         bottomBar->setText(BottomBar::Side::RIGHT, utils::translate(style::strings::common::back));
         setTitle("UI TEST");
-        text = new gui::Text(
-            this, style::window::default_left_margin, title->offset_h(), style::window::default_body_width, 300);
+        text = new gui::Text(this,
+                             style::window::default_left_margin,
+                             style::window::default_vertical_pos,
+                             style::window::default_body_width,
+                             300);
         text->setEditMode(EditMode::Edit);
         text->setFont(style::window::font::medium);
         LOG_DEBUG(

@@ 1,4 1,4 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #pragma once


@@ 30,7 30,7 @@ namespace specialInputStyle
     namespace specialInputListView
     {
         constexpr uint32_t x = style::window::default_left_margin;
-        constexpr uint32_t y = style::header::height;
+        constexpr uint32_t y = style::window::default_vertical_pos;
         constexpr uint32_t w = style::listview::body_width_with_scroll;
         constexpr uint32_t h = style::window::default_body_height;
     } // namespace specialInputListView

@@ 30,7 30,7 @@ namespace gui
     {
         body = new VBox(this,
                         style::window::default_left_margin,
-                        style::header::height,
+                        style::window::default_vertical_pos,
                         style::window::default_body_width,
                         style::window::default_body_height);
         body->setEdges(RectangleEdge::None);

@@ 44,7 44,7 @@ namespace gui::option
         inline constexpr gui::Length option_rightbig_min_size = 350;
         inline constexpr uint32_t optionsListTopMargin        = 10U;
         inline constexpr uint32_t optionsListX                = style::window::default_left_margin;
-        inline constexpr uint32_t optionsListY                = style::header::height + optionsListTopMargin;
+        inline constexpr uint32_t optionsListY = style::window::default_vertical_pos + optionsListTopMargin;
         inline constexpr uint32_t optionsListW                = style::window::default_body_width;
         inline constexpr uint32_t optionsListH                = style::window::default_body_height;
     } // namespace window

@@ 18,7 18,7 @@ namespace gui
     {
         volumeText = new Label(this,
                                style::window::default_left_margin,
-                               title->offset_h(),
+                               style::window::default_vertical_pos,
                                style::window::default_body_width,
                                style::window::volume::title_height,
                                utils::translate(style::window::volume::base_title_key));

@@ 53,7 53,7 @@ void PhoneLockChangeInfoWindow::buildInterface()
 
     infoIcon = new gui::Icon(this,
                              style::window::default_left_margin,
-                             style::header::height,
+                             style::window::default_vertical_pos,
                              style::window::default_body_width,
                              style::window::default_body_height,
                              "success_icon_W_G",

@@ 55,7 55,7 @@ void PhoneLockedInfoWindow::buildInterface()
 
     infoIcon = new gui::Icon(this,
                              style::window::default_left_margin,
-                             style::header::height,
+                             style::window::default_vertical_pos,
                              style::window::default_body_width,
                              style::window::default_body_height,
                              "unlock_icon_W_G",

@@ 64,7 64,7 @@ void SimInfoWindow::buildInterface()
 
     infoIcon = new gui::Icon(this,
                              style::window::default_left_margin,
-                             style::header::height,
+                             style::window::default_vertical_pos,
                              style::window::default_body_width,
                              style::window::default_body_height,
                              "success_icon_W_G",

@@ 37,7 37,7 @@ void SimNotReadyWindow::buildInterface()
 
     infoIcon = new gui::Icon(this,
                              style::window::default_left_margin,
-                             style::header::height,
+                             style::window::default_vertical_pos,
                              style::window::default_body_width,
                              style::window::default_body_height,
                              "sim_card_W_G",

@@ 13,7 13,7 @@ namespace style::window::date_and_time
     inline constexpr auto time_input_24h_w = 195;
     inline constexpr auto hBox_h           = height - 1.25 * topMargin;
     inline constexpr auto listView_x       = style::window::default_left_margin;
-    inline constexpr auto listView_y       = style::header::height;
+    inline constexpr auto listView_y       = style::window::default_vertical_pos;
     inline constexpr auto listView_w       = style::listview::body_width_with_scroll;
     inline constexpr auto listView_h       = style::window_height - listView_y - style::footer::height;
 } // namespace style::window::date_and_time

@@ 37,6 37,15 @@ namespace gui
 
     void AppWindow::buildInterface()
     {
+        auto config          = configureStatusBar(application->getStatusBarConfiguration());
+        namespace status_bar = style::status_bar;
+        statusBar            = new gui::status_bar::StatusBar(this,
+                                                   status_bar::default_horizontal_pos,
+                                                   status_bar::default_vertical_pos,
+                                                   status_bar::width,
+                                                   status_bar::height);
+        statusBar->configure(std::move(config));
+
         bottomBar = new gui::BottomBar(this, 0, style::window_height - 51, style::window_width, 50);
         bottomBar->setActive(BottomBar::Side::LEFT, false);
         bottomBar->setActive(BottomBar::Side::CENTER, false);


@@ 50,12 59,6 @@ namespace gui
         title->setEdges(RectangleEdge::Bottom);
         title->setEllipsis(Ellipsis::Right);
         title->visible = false;
-
-        auto config          = configureStatusBar(application->getStatusBarConfiguration());
-        namespace status_bar = style::header::status_bar;
-        statusBar            = new gui::status_bar::StatusBar(
-            this, (style::window_width - status_bar::width) / 2, 0, status_bar::width, status_bar::height);
-        statusBar->configure(std::move(config));
     }
 
     status_bar::Configuration AppWindow::configureStatusBar(status_bar::Configuration appConfiguration)

@@ 17,7 17,7 @@ Dialog::Dialog(app::Application *app, const std::string &name) : gui::AppWindow(
 
     icon = new Icon(this,
                     style::window::default_left_margin,
-                    style::header::height,
+                    style::window::default_vertical_pos,
                     style::window::default_body_width,
                     style::window::default_body_height,
                     "",


@@ 123,7 123,7 @@ DialogYesNoIconTxt::DialogYesNoIconTxt(app::Application *app, const std::string 
 {
     iconText = new Label(this,
                          style::window::default_left_margin,
-                         style::header::height,
+                         style::window::default_vertical_pos,
                          style::window::default_body_width,
                          dialog::style::iconTextLabel::h,
                          "");

@@ 20,7 20,7 @@
 
 namespace gui::status_bar
 {
-    using namespace style::header::status_bar;
+    using namespace style::status_bar;
 
     constexpr auto batteryWidgetAsText = false;
     using BatteryType                  = std::conditional<batteryWidgetAsText, BatteryText, BatteryBar>::type;


@@ 117,6 117,7 @@ namespace gui::status_bar
         lock = new Lock(centralBox, 0, 0);
         lock->setMargins(Margins(0, 0, 0, margins::iconBottom));
         time = new Time(centralBox, 0, 0, 0, 0);
+        time->setPadding(gui::Padding(0, 0, 0, time::bottomPadding));
         time->setMaximumSize(time::maxX, this->drawArea.h);
 
         // right

@@ 21,20 21,28 @@ namespace style
 {
     inline constexpr auto window_height = getScreenResolutionY();
     inline constexpr auto window_width  = getScreenResolutionX();
+
+    namespace status_bar
+    {
+        inline constexpr auto default_horizontal_pos  = 20U;
+        inline constexpr auto default_vertical_pos    = 0U;
+        inline constexpr unsigned status_bar_margin_w = default_horizontal_pos * 2;
+        inline constexpr auto height                  = 46U;
+        inline constexpr auto width                   = window_width - status_bar_margin_w;
+    } // namespace status_bar
+
     namespace header
     {
-        inline constexpr auto height = 105U;
-        namespace status_bar
-        {
-            inline constexpr unsigned status_bar_margin_w = 40U;
-            inline constexpr auto height                  = 46U;
-            inline constexpr auto width                   = window_width - status_bar_margin_w;
-        }; // namespace status_bar
+        inline constexpr auto default_horizontal_pos = 0U;
+        inline constexpr auto default_vertical_pos   = status_bar::height;
+        inline constexpr auto height                 = 59U;
+        inline constexpr auto width                  = window_width;
+
         namespace font
         {
-            inline constexpr auto title = "gt_pressura_bold_32";
-        }; // namespace font
-    };     // namespace header
+            inline constexpr auto title = "gt_pressura_bold_30";
+        } // namespace font
+    }     // namespace header
 
     namespace footer
     {


@@ 48,12 56,13 @@ namespace style
 
     namespace window
     {
+        inline constexpr auto default_vertical_pos = header::default_vertical_pos + header::height;
         inline constexpr auto default_left_margin  = 20U;
         inline constexpr auto default_right_margin = 20U;
         inline constexpr auto default_body_width =
             style::window_width - style::window::default_right_margin - style::window::default_left_margin;
         inline constexpr auto default_body_height =
-            style::window_height - style::header::height - style::footer::height;
+            style::window_height - style::window::default_vertical_pos - style::footer::height;
         inline constexpr auto default_border_focus_w       = 2U;
         inline constexpr auto default_border_rect_no_focus = 1U;
         inline constexpr auto default_border_no_focus_w    = 0U;

@@ 32,7 32,7 @@ namespace gui::status_bar
     {
         img = new Image(this, battery1);
 
-        setMinimumSize(img->getWidth(), style::header::status_bar::height);
+        setMinimumSize(img->getWidth(), style::status_bar::height);
     }
 
     void BatteryBar::showBatteryLevel(std::uint32_t percentage)

@@ 15,11 15,11 @@ namespace gui::status_bar
         label = new Label(this, 0, 0, 0, 0);
         label->setFilled(false);
         label->setBorderColor(gui::ColorNoColor);
-        label->setFont(style::header::status_bar::battery::font);
+        label->setFont(style::status_bar::battery::font);
         label->setAlignment(gui::Alignment(gui::Alignment::Horizontal::Right, gui::Alignment::Vertical::Bottom));
 
-        setMinimumSize(style::header::status_bar::battery::maxX, style::header::status_bar::height);
-        label->setMaximumSize(style::header::status_bar::battery::maxX, style::header::status_bar::height);
+        setMinimumSize(style::status_bar::battery::maxX, style::status_bar::height);
+        label->setMaximumSize(style::status_bar::battery::maxX, style::status_bar::height);
     }
 
     void BatteryText::showBatteryLevel(std::uint32_t percentage)

@@ 11,7 11,7 @@ namespace gui::status_bar
         : StatusBarWidgetBase(parent, x, y, w, h)
     {
         setEdges(RectangleEdge::None);
-        setFont(style::header::status_bar::nat::font);
+        setFont(style::status_bar::nat::font);
         setAlignment(gui::Alignment(gui::Alignment::Horizontal::Left, gui::Alignment::Vertical::Bottom));
     }
 

@@ 15,7 15,7 @@ namespace gui::status_bar
         : StatusBarWidgetBase(parent, x, y, w, h)
     {
         setEdges(RectangleEdge::None);
-        setFont(style::header::status_bar::nat::font);
+        setFont(style::status_bar::nat::font);
         setAlignment(gui::Alignment(gui::Alignment::Horizontal::Left, gui::Alignment::Vertical::Center));
     }
 

@@ 43,7 43,7 @@ namespace gui::status_bar
         : SignalStrengthBase(parent, x, y, w, h)
     {
         img = new Image(this, signal_none);
-        setMinimumSize(img->getWidth(), style::header::status_bar::height);
+        setMinimumSize(img->getWidth(), style::status_bar::height);
     }
 
     void SignalStrengthBar::update(const Store::SignalStrength &signal, const Store::Network::Status &status)

@@ 15,11 15,11 @@ namespace gui::status_bar
         label = new Label(this, 0, 0, 0, 0);
         label->setFilled(false);
         label->setBorderColor(gui::ColorNoColor);
-        label->setFont(style::header::status_bar::signal::font);
+        label->setFont(style::status_bar::signal::font);
         label->setAlignment(gui::Alignment(gui::Alignment::Horizontal::Left, gui::Alignment::Vertical::Bottom));
 
-        setMinimumSize(style::header::status_bar::signal::maxX, style::header::status_bar::height);
-        label->setMaximumSize(style::header::status_bar::signal::maxX, style::header::status_bar::height);
+        setMinimumSize(style::status_bar::signal::maxX, style::status_bar::height);
+        label->setMaximumSize(style::status_bar::signal::maxX, style::status_bar::height);
     }
 
     void SignalStrengthText::update(const Store::SignalStrength &signal,

@@ 5,14 5,8 @@
 
 #include <Style.hpp>
 
-namespace style::header::status_bar
+namespace style::status_bar
 {
-    namespace font
-    {
-
-        inline constexpr auto title = "gt_pressura_bold_32";
-    }; // namespace font
-
     namespace margins
     {
         inline constexpr auto iconBottom = 4u;


@@ 21,8 15,9 @@ namespace style::header::status_bar
     }; // namespace margins
     namespace time
     {
-        inline constexpr auto font = "gt_pressura_regular_24";
-        inline constexpr auto maxX = 100u;
+        inline constexpr auto font          = "gt_pressura_regular_24";
+        inline constexpr auto maxX          = 100u;
+        inline constexpr auto bottomPadding = 7u;
     }; // namespace time
     namespace nat
     {


@@ 48,12 43,12 @@ namespace style::header::status_bar
     {
         namespace left
         {
-            inline constexpr auto minX = 165u;
+            inline constexpr auto minX = 170u;
             inline constexpr auto maxX = 205u;
         }; // namespace left
         namespace right
         {
-            inline constexpr auto minX = 165u;
+            inline constexpr auto minX = 170u;
             inline constexpr auto maxX = 205u;
         }; // namespace right
         namespace center


@@ 63,4 58,4 @@ namespace style::header::status_bar
         }; // namespace center
     };     // namespace boxes
 
-}; // namespace style::header::status_bar
+}; // namespace style::status_bar

@@ 12,8 12,8 @@ namespace gui::status_bar
     {
         setFilled(false);
         setBorderColor(gui::ColorNoColor);
-        setFont(style::header::status_bar::time::font);
-        setAlignment(gui::Alignment(gui::Alignment::Horizontal::Center, gui::Alignment::Vertical::Center));
+        setFont(style::status_bar::time::font);
+        setAlignment(gui::Alignment(gui::Alignment::Horizontal::Center, gui::Alignment::Vertical::Bottom));
         using namespace utils::time;
         setFormat(Locale::format(Locale::TimeFormat::FormatTime12H));
         update();