12 files changed, 8 insertions(+), 8 deletions(-)

D art/bell/alarm_snooze_W_M.png
R art/bell/{alarm_ringing_W_G => bell_alarm_ringing_W_G}.png
D art/bell/bell_alarm_ringing_W_M.png
M art/bell/bell_alarm_snooze_W_M.png
D image/assets/images/bell/alarm_snooze_W_M.vpi
R image/assets/images/bell/{alarm_ringing_W_G => bell_alarm_ringing_W_G}.vpi
D image/assets/images/bell/bell_alarm_ringing_W_M.vpi
M image/assets/images/bell/bell_alarm_snooze_W_M.vpi
M image/assets/lang/English.json
M module-apps/apps-common/widgets/AlarmSetSpinner.cpp
M products/BellHybrid/apps/application-bell-background-sounds/windows/BGSoundsPausedWindow.cpp
M products/BellHybrid/apps/application-bell-powernap/windows/PowerNapSessionEndedWindow.cpp

@@ 614,7 614,7 @@
   "app_bell_settings_alarm_settings_snooze_chime_interval_bot_desc": "recurring during\nsnooze",
   "app_bell_settings_alarm_settings_snooze_chime_tone": "Snooze chime tone",
   "app_bell_settings_alarm_settings_snooze_chime_volume": "Snooze chime volume",
-  "app_bellmain_home_screen_bottom_desc": "Next alarm will ring",
+  "app_bellmain_home_screen_bottom_desc": "Next alarm will ring in",
   "app_bellmain_home_screen_bottom_desc_dp": "Deep press to activate",
   "app_bell_alarm_deactivated": "<text>Alarm deactivated<br /></text>",
   "app_bell_alarm_set_not_active": "<text>Alarm set.<br />Deep press to activate.</text>",

@@ 102,7 102,7 @@ namespace gui
             alarmImg->setImage("bell_alarm_deactivated_W_M");
             break;
         case Status::RINGING:
-            alarmImg->setImage("bell_alarm_ringing_W_M");
+            alarmImg->setImage("bell_alarm_ringing_W_G");
             break;
         case Status::SNOOZE:
             alarmImg->setImage("bell_alarm_snooze_W_M");

@@ 26,7 26,7 @@ namespace gui
         auto body = new gui::VBox(this, 0, 0, style::window_width, style::window_height);
         body->setAlignment(Alignment(Alignment::Horizontal::Center, Alignment::Vertical::Center));
 
-        new gui::Image(body, "pause");
+        new gui::Image(body, "big_pause_W_G");
 
         auto text = new gui::Text(body, 0, 0, body->getWidth(), bgSoundsStyle::pause::textH);
         text->setText(utils::translate("common_paused"));

@@ 14,7 14,7 @@ namespace gui
 {
     PowerNapSessionEndedWindow::PowerNapSessionEndedWindow(
         app::ApplicationCommon *app, std::shared_ptr<app::powernap::PowerNapSessionEndedContract::Presenter> presenter)
-        : WindowWithTimer(app, gui::window::name::powernapSessionEnded), presenter{std::move(presenter)}
+        : WindowWithTimer(app, window::name::powernapSessionEnded), presenter{std::move(presenter)}
     {
         buildInterface();
     }


@@ 28,14 28,14 @@ namespace gui
 
     void PowerNapSessionEndedWindow::buildLayout()
     {
-        auto body = new gui::VBox(this, 0, 0, style::window_width, style::window_height);
+        auto body = new VBox(this, 0, 0, style::window_width, style::window_height);
         body->setAlignment(Alignment(Alignment::Horizontal::Center, Alignment::Vertical::Center));
 
-        new gui::Image(body, "tethering_notification_icon"); // TODO: ICON!!!!
+        new Image(body, "big_namaste_W_G");
 
-        auto text = new gui::Text(body, 0, 0, body->getWidth(), powerNapStyle::sessionEnd::textH);
+        auto text = new Text(body, 0, 0, body->getWidth(), powerNapStyle::sessionEnd::textH);
         TextFormat format(FontManager::getInstance().getFont(powerNapStyle::descriptionFont));
-        gui::text::RichTextParser parser;
+        text::RichTextParser parser;
         auto textParsed = parser.parse(utils::translate("app_bell_powernap_session_ended_message"), &format);
         text->setText(std::move(textParsed));
         text->setAlignment(Alignment(Alignment::Horizontal::Center, Alignment::Vertical::Center));