diff --git a/app/src/main/java/info/nightscout/androidaps/utils/TimerUtil.kt b/app/src/main/java/info/nightscout/androidaps/utils/TimerUtil.kt
index 4f0ce09609..b62f00df54 100644
--- a/app/src/main/java/info/nightscout/androidaps/utils/TimerUtil.kt
+++ b/app/src/main/java/info/nightscout/androidaps/utils/TimerUtil.kt
@@ -14,12 +14,14 @@ class TimerUtil @Inject constructor(
     private val resourceHelper: ResourceHelper,
 ) {
 
-    fun scheduleReminder(time: Long, text: String? = null) = Intent(AlarmClock.ACTION_SET_TIMER).apply {
-        val length: Int = ((time - DateUtil.now()) / 1000).toInt()
-        flags = flags or Intent.FLAG_ACTIVITY_NEW_TASK
-        putExtra(AlarmClock.EXTRA_LENGTH, length)
-        putExtra(AlarmClock.EXTRA_SKIP_UI, true)
-        putExtra(AlarmClock.EXTRA_MESSAGE, text ?: resourceHelper.gs(R.string.app_name))
-        context.startActivity(this)
+    fun scheduleReminder(time: Long, text: String? = null) {
+        Intent(AlarmClock.ACTION_SET_TIMER).apply {
+            val length: Int = ((time - DateUtil.now()) / 1000).toInt()
+            flags = flags or Intent.FLAG_ACTIVITY_NEW_TASK
+            putExtra(AlarmClock.EXTRA_LENGTH, length)
+            putExtra(AlarmClock.EXTRA_SKIP_UI, true)
+            putExtra(AlarmClock.EXTRA_MESSAGE, text ?: resourceHelper.gs(R.string.app_name))
+            context.startActivity(this)
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_carbs.xml b/app/src/main/res/layout/dialog_carbs.xml
index 6b7ffdde26..f0f306c6ff 100644
--- a/app/src/main/res/layout/dialog_carbs.xml
+++ b/app/src/main/res/layout/dialog_carbs.xml
@@ -100,6 +100,12 @@
                         android:textAppearance="@style/TextAppearance.AppCompat.Small"
                         android:textStyle="bold" />
 
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:src="@drawable/ic_access_alarm_24dp" />
+
                     <CheckBox
                         android:id="@+id/alarmCheckBox"
                         android:layout_width="wrap_content"
@@ -107,13 +113,6 @@
                         android:layout_gravity="center_vertical"
                         android:checked="false"
                         android:padding="2dp" />
-
-                    <ImageView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:layout_marginRight="8dp"
-                        android:src="@drawable/ic_access_alarm_24dp" />
                 </LinearLayout>
 
                 <LinearLayout
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionAlarmTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionAlarmTest.kt
index ea965e52b6..c17260f535 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionAlarmTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionAlarmTest.kt
@@ -10,6 +10,7 @@ import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.automation.elements.InputString
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
 import info.nightscout.androidaps.queue.Callback
+import info.nightscout.androidaps.utils.TimerUtil
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import org.junit.Assert
 import org.junit.Before
@@ -22,12 +23,13 @@ import org.powermock.core.classloader.annotations.PrepareForTest
 import org.powermock.modules.junit4.PowerMockRunner
 
 @RunWith(PowerMockRunner::class)
-@PrepareForTest(NSUpload::class, RxBusWrapper::class)
+@PrepareForTest(NSUpload::class, RxBusWrapper::class, TimerUtil::class)
 class ActionAlarmTest : TestBase() {
 
     @Mock lateinit var resourceHelper: ResourceHelper
     @Mock lateinit var rxBus: RxBusWrapper
     @Mock lateinit var context: Context
+    @Mock lateinit var timerUtil: TimerUtil
 
     private lateinit var sut: ActionAlarm
     var injector: HasAndroidInjector = HasAndroidInjector {
@@ -36,6 +38,7 @@ class ActionAlarmTest : TestBase() {
                 it.resourceHelper = resourceHelper
                 it.rxBus = rxBus
                 it.context = context
+                it.timerUtil = timerUtil
             }
             if (it is PumpEnactResult) {
                 it.aapsLogger = aapsLogger