diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp
index 7a73f12362..1c55658af6 100644
--- a/src/displayapp/DisplayApp.cpp
+++ b/src/displayapp/DisplayApp.cpp
@@ -379,7 +379,7 @@ void DisplayApp::LoadApp(Apps app, DisplayApp::FullRefreshDirections direction)
       currentScreen = std::make_unique<Screens::Timer>(this, timerController);
       break;
     case Apps::Alarm:
-      currentScreen = std::make_unique<Screens::Alarm>(this, alarmController);
+      currentScreen = std::make_unique<Screens::Alarm>(this, alarmController, settingsController);
       break;
 
     // Settings
@@ -417,7 +417,7 @@ void DisplayApp::LoadApp(Apps app, DisplayApp::FullRefreshDirections direction)
       ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
       break;
     case Apps::SettingSetTime:
-      currentScreen = std::make_unique<Screens::SettingSetTime>(this, dateTimeController);
+      currentScreen = std::make_unique<Screens::SettingSetTime>(this, dateTimeController, settingsController);
       ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown);
       break;
     case Apps::SettingChimes:
diff --git a/src/displayapp/screens/Alarm.cpp b/src/displayapp/screens/Alarm.cpp
index 537ac0e066..b57c8f02a6 100644
--- a/src/displayapp/screens/Alarm.cpp
+++ b/src/displayapp/screens/Alarm.cpp
@@ -27,8 +27,8 @@ static void btnEventHandler(lv_obj_t* obj, lv_event_t event) {
   screen->OnButtonEvent(obj, event);
 }
 
-Alarm::Alarm(DisplayApp* app, Controllers::AlarmController& alarmController)
-  : Screen(app), running {true}, alarmController {alarmController} {
+Alarm::Alarm(DisplayApp* app, Controllers::AlarmController& alarmController, Pinetime::Controllers::Settings& settingsController)
+  : Screen(app), running {true}, alarmController {alarmController}, settingsController {settingsController} {
 
   time = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_font(time, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_76);
@@ -40,6 +40,13 @@ Alarm::Alarm(DisplayApp* app, Controllers::AlarmController& alarmController)
 
   lv_obj_align(time, lv_scr_act(), LV_ALIGN_CENTER, 0, -25);
 
+  lblampm = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_text_font(lblampm, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_bold_20);
+  lv_obj_set_style_local_text_color(lblampm, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_GRAY);
+  lv_label_set_text_static(lblampm, "  ");
+  lv_label_set_align(lblampm, LV_LABEL_ALIGN_CENTER);
+  lv_obj_align(lblampm, lv_scr_act(), LV_ALIGN_CENTER, 0, 30);
+
   btnHoursUp = lv_btn_create(lv_scr_act(), nullptr);
   btnHoursUp->user_data = this;
   lv_obj_set_event_cb(btnHoursUp, btnEventHandler);
@@ -95,6 +102,8 @@ Alarm::Alarm(DisplayApp* app, Controllers::AlarmController& alarmController)
   lv_obj_align(btnInfo, lv_scr_act(), LV_ALIGN_CENTER, 0, -85);
   txtInfo = lv_label_create(btnInfo, nullptr);
   lv_label_set_text_static(txtInfo, "i");
+
+  UpdateAlarmTime();
 }
 
 Alarm::~Alarm() {
@@ -180,8 +189,34 @@ bool Alarm::OnButtonPushed() {
 }
 
 void Alarm::UpdateAlarmTime() {
-  lv_label_set_text_fmt(time, "%02d:%02d", alarmHours, alarmMinutes);
-  alarmController.SetAlarmTime(alarmHours, alarmMinutes);
+  if (settingsController.GetClockType() == Controllers::Settings::ClockType::H12) {
+    switch (alarmHours) {
+      case 0:
+        lv_label_set_text_static(lblampm, "AM");
+        lv_label_set_text_fmt(time, "%02d:%02d", 12, alarmMinutes);
+        alarmController.SetAlarmTime(0, alarmMinutes);
+        break;
+      case 1 ... 11:
+        lv_label_set_text_static(lblampm, "AM");
+        lv_label_set_text_fmt(time, "%02d:%02d", alarmHours, alarmMinutes);
+        alarmController.SetAlarmTime(alarmHours, alarmMinutes);
+        break;
+      case 12:
+        lv_label_set_text_static(lblampm, "PM");
+        lv_label_set_text_fmt(time, "%02d:%02d", 12, alarmMinutes);
+        alarmController.SetAlarmTime(12, alarmMinutes);
+        break;
+      case 13 ... 23:
+        lv_label_set_text_static(lblampm, "PM");
+        lv_label_set_text_fmt(time, "%02d:%02d", alarmHours - 12, alarmMinutes);
+        alarmController.SetAlarmTime(alarmHours, alarmMinutes);
+        break;
+    }
+  } else {
+    lv_label_set_text_static(lblampm, "  ");
+    lv_label_set_text_fmt(time, "%02d:%02d", alarmHours, alarmMinutes);
+    alarmController.SetAlarmTime(alarmHours, alarmMinutes);
+  }
 }
 
 void Alarm::SetAlerting() {
diff --git a/src/displayapp/screens/Alarm.h b/src/displayapp/screens/Alarm.h
index 4b301ce194..d45fb96ce5 100644
--- a/src/displayapp/screens/Alarm.h
+++ b/src/displayapp/screens/Alarm.h
@@ -27,7 +27,7 @@ namespace Pinetime {
     namespace Screens {
       class Alarm : public Screen {
       public:
-        Alarm(DisplayApp* app, Controllers::AlarmController& alarmController);
+        Alarm(DisplayApp* app, Controllers::AlarmController& alarmController, Pinetime::Controllers::Settings& settingsController);
         ~Alarm() override;
         void SetAlerting();
         void OnButtonEvent(lv_obj_t* obj, lv_event_t event);
@@ -38,9 +38,10 @@ namespace Pinetime {
         uint8_t alarmHours;
         uint8_t alarmMinutes;
         Controllers::AlarmController& alarmController;
+        Controllers::Settings& settingsController;
 
-        lv_obj_t *time, *btnEnable, *txtEnable, *btnMinutesUp, *btnMinutesDown, *btnHoursUp, *btnHoursDown, *txtMinUp, *txtMinDown,
-          *txtHrUp, *txtHrDown, *btnRecur, *txtRecur, *btnInfo, *txtInfo;
+        lv_obj_t *time, *lblampm, *btnEnable, *txtEnable, *btnMinutesUp, *btnMinutesDown, *btnHoursUp, *btnHoursDown, *txtMinUp,
+          *txtMinDown, *txtHrUp, *txtHrDown, *btnRecur, *txtRecur, *btnInfo, *txtInfo;
         lv_obj_t* txtMessage = nullptr;
         lv_obj_t* btnMessage = nullptr;
 
diff --git a/src/displayapp/screens/settings/SettingSetTime.cpp b/src/displayapp/screens/settings/SettingSetTime.cpp
index 5351adebae..037611f303 100644
--- a/src/displayapp/screens/settings/SettingSetTime.cpp
+++ b/src/displayapp/screens/settings/SettingSetTime.cpp
@@ -4,6 +4,7 @@
 #include <nrf_log.h>
 #include "displayapp/DisplayApp.h"
 #include "displayapp/screens/Symbols.h"
+#include "components/settings/Settings.h"
 
 using namespace Pinetime::Applications::Screens;
 
@@ -16,23 +17,24 @@ namespace {
   constexpr int16_t POS_Y_MINUS = 40;
   constexpr int16_t OFS_Y_COLON = -2;
 
-  void event_handler(lv_obj_t * obj, lv_event_t event) {
-    auto* screen = static_cast<SettingSetTime *>(obj->user_data);
+  void event_handler(lv_obj_t* obj, lv_event_t event) {
+    auto* screen = static_cast<SettingSetTime*>(obj->user_data);
     screen->HandleButtonPress(obj, event);
   }
 }
 
-SettingSetTime::SettingSetTime(Pinetime::Applications::DisplayApp *app, Pinetime::Controllers::DateTime &dateTimeController) :
-  Screen(app),
-  dateTimeController {dateTimeController} {
-  lv_obj_t * title = lv_label_create(lv_scr_act(), nullptr);
+SettingSetTime::SettingSetTime(Pinetime::Applications::DisplayApp* app,
+                               Pinetime::Controllers::DateTime& dateTimeController,
+                               Pinetime::Controllers::Settings& settingsController)
+  : Screen(app), dateTimeController {dateTimeController}, settingsController {settingsController} {
+  lv_obj_t* title = lv_label_create(lv_scr_act(), nullptr);
   lv_label_set_text_static(title, "Set current time");
   lv_label_set_align(title, LV_LABEL_ALIGN_CENTER);
   lv_obj_align(title, lv_scr_act(), LV_ALIGN_IN_TOP_MID, 15, 15);
 
-  lv_obj_t * icon = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_t* icon = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_color(icon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_ORANGE);
-  
+
   lv_label_set_text_static(icon, Symbols::clock);
   lv_label_set_align(icon, LV_LABEL_ALIGN_CENTER);
   lv_obj_align(icon, title, LV_ALIGN_OUT_LEFT_MID, -10, 0);
@@ -45,7 +47,7 @@ SettingSetTime::SettingSetTime(Pinetime::Applications::DisplayApp *app, Pinetime
   lv_obj_align(lblHours, lv_scr_act(), LV_ALIGN_CENTER, POS_X_HOURS, POS_Y_TEXT);
   lv_obj_set_auto_realign(lblHours, true);
 
-  lv_obj_t * lblColon1 = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_t* lblColon1 = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_font(lblColon1, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_42);
   lv_label_set_text_static(lblColon1, ":");
   lv_label_set_align(lblColon1, LV_LABEL_ALIGN_CENTER);
@@ -59,18 +61,24 @@ SettingSetTime::SettingSetTime(Pinetime::Applications::DisplayApp *app, Pinetime
   lv_obj_align(lblMinutes, lv_scr_act(), LV_ALIGN_CENTER, POS_X_MINUTES, POS_Y_TEXT);
   lv_obj_set_auto_realign(lblMinutes, true);
 
-  lv_obj_t * lblColon2 = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_t* lblColon2 = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_font(lblColon2, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_42);
   lv_label_set_text_static(lblColon2, ":");
   lv_label_set_align(lblColon2, LV_LABEL_ALIGN_CENTER);
   lv_obj_align(lblColon2, lv_scr_act(), LV_ALIGN_CENTER, (POS_X_MINUTES + POS_X_SECONDS) / 2, POS_Y_TEXT + OFS_Y_COLON);
 
-  lv_obj_t * lblSeconds = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_t* lblSeconds = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_font(lblSeconds, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_42);
   lv_label_set_text_static(lblSeconds, "00");
   lv_label_set_align(lblSeconds, LV_LABEL_ALIGN_CENTER);
   lv_obj_align(lblSeconds, lv_scr_act(), LV_ALIGN_CENTER, POS_X_SECONDS, POS_Y_TEXT);
 
+  lblampm = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_text_font(lblampm, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_bold_20);
+  lv_label_set_text_static(lblampm, "  ");
+  lv_label_set_align(lblampm, LV_LABEL_ALIGN_CENTER);
+  lv_obj_align(lblampm, lv_scr_act(), LV_ALIGN_CENTER, POS_X_SECONDS, POS_Y_PLUS);
+
   btnHoursPlus = lv_btn_create(lv_scr_act(), nullptr);
   btnHoursPlus->user_data = this;
   lv_obj_set_size(btnHoursPlus, 50, 40);
@@ -105,38 +113,69 @@ SettingSetTime::SettingSetTime(Pinetime::Applications::DisplayApp *app, Pinetime
   lv_obj_align(btnSetTime, lv_scr_act(), LV_ALIGN_IN_BOTTOM_MID, 0, 0);
   lv_obj_set_style_local_value_str(btnSetTime, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, "Set");
   lv_obj_set_event_cb(btnSetTime, event_handler);
+
+  SetHourLabels();
 }
 
 SettingSetTime::~SettingSetTime() {
   lv_obj_clean(lv_scr_act());
 }
 
-void SettingSetTime::HandleButtonPress(lv_obj_t *object, lv_event_t event) {
+void SettingSetTime::SetHourLabels() {
+  if (settingsController.GetClockType() == Controllers::Settings::ClockType::H12) {
+    switch (hoursValue) {
+      case 0:
+        lv_label_set_text_static(lblHours, "12");
+        lv_label_set_text_static(lblampm, "AM");
+        break;
+      case 1 ... 11:
+        lv_label_set_text_fmt(lblHours, "%02d", hoursValue);
+        lv_label_set_text_static(lblampm, "AM");
+        break;
+      case 12:
+        lv_label_set_text_static(lblHours, "12");
+        lv_label_set_text_static(lblampm, "PM");
+        break;
+      case 13 ... 23:
+        lv_label_set_text_fmt(lblHours, "%02d", hoursValue - 12);
+        lv_label_set_text_static(lblampm, "PM");
+        break;
+    }
+  } else {
+    lv_label_set_text_fmt(lblHours, "%02d", hoursValue);
+  }
+}
+
+void SettingSetTime::HandleButtonPress(lv_obj_t* object, lv_event_t event) {
   if (event != LV_EVENT_CLICKED)
     return;
 
   if (object == btnHoursPlus) {
     hoursValue++;
-    if (hoursValue > 23)
+    if (hoursValue > 23) {
       hoursValue = 0;
-    lv_label_set_text_fmt(lblHours, "%02d", hoursValue);
+    }
+    SetHourLabels();
     lv_btn_set_state(btnSetTime, LV_BTN_STATE_RELEASED);
   } else if (object == btnHoursMinus) {
     hoursValue--;
-    if (hoursValue < 0)
+    if (hoursValue < 0) {
       hoursValue = 23;
-    lv_label_set_text_fmt(lblHours, "%02d", hoursValue);
+    }
+    SetHourLabels();
     lv_btn_set_state(btnSetTime, LV_BTN_STATE_RELEASED);
   } else if (object == btnMinutesPlus) {
     minutesValue++;
-    if (minutesValue > 59)
+    if (minutesValue > 59) {
       minutesValue = 0;
+    }
     lv_label_set_text_fmt(lblMinutes, "%02d", minutesValue);
     lv_btn_set_state(btnSetTime, LV_BTN_STATE_RELEASED);
   } else if (object == btnMinutesMinus) {
     minutesValue--;
-    if (minutesValue < 0)
+    if (minutesValue < 0) {
       minutesValue = 59;
+    }
     lv_label_set_text_fmt(lblMinutes, "%02d", minutesValue);
     lv_btn_set_state(btnSetTime, LV_BTN_STATE_RELEASED);
   } else if (object == btnSetTime) {
diff --git a/src/displayapp/screens/settings/SettingSetTime.h b/src/displayapp/screens/settings/SettingSetTime.h
index 8ba41eae45..d02c332e64 100644
--- a/src/displayapp/screens/settings/SettingSetTime.h
+++ b/src/displayapp/screens/settings/SettingSetTime.h
@@ -3,30 +3,37 @@
 #include <cstdint>
 #include <lvgl/lvgl.h>
 #include "components/datetime/DateTimeController.h"
+#include "components/settings/Settings.h"
 #include "displayapp/screens/Screen.h"
 
 namespace Pinetime {
   namespace Applications {
     namespace Screens {
-      class SettingSetTime : public Screen{
-        public:
-          SettingSetTime(DisplayApp* app, Pinetime::Controllers::DateTime &dateTimeController);
-          ~SettingSetTime() override;
+      class SettingSetTime : public Screen {
+      public:
+        SettingSetTime(DisplayApp* app,
+                       Pinetime::Controllers::DateTime& dateTimeController,
+                       Pinetime::Controllers::Settings& settingsController);
+        ~SettingSetTime() override;
 
-          void HandleButtonPress(lv_obj_t *object, lv_event_t event);
-         
-        private:
-          Controllers::DateTime& dateTimeController;
+        void HandleButtonPress(lv_obj_t* object, lv_event_t event);
 
-          int hoursValue;
-          int minutesValue;
-          lv_obj_t * lblHours;
-          lv_obj_t * lblMinutes;
-          lv_obj_t * btnHoursPlus;
-          lv_obj_t * btnHoursMinus;
-          lv_obj_t * btnMinutesPlus;
-          lv_obj_t * btnMinutesMinus;
-          lv_obj_t * btnSetTime;
+      private:
+        Controllers::DateTime& dateTimeController;
+        Controllers::Settings& settingsController;
+
+        void SetHourLabels();
+
+        int hoursValue;
+        int minutesValue;
+        lv_obj_t* lblHours;
+        lv_obj_t* lblMinutes;
+        lv_obj_t* lblampm;
+        lv_obj_t* btnHoursPlus;
+        lv_obj_t* btnHoursMinus;
+        lv_obj_t* btnMinutesPlus;
+        lv_obj_t* btnMinutesMinus;
+        lv_obj_t* btnSetTime;
       };
     }
   }