diff --git a/app/src/main/java/com/philliphsu/clock2/UpcomingAlarmReceiver.java b/app/src/main/java/com/philliphsu/clock2/UpcomingAlarmReceiver.java
index 3ec19b1..3aef4d5 100644
--- a/app/src/main/java/com/philliphsu/clock2/UpcomingAlarmReceiver.java
+++ b/app/src/main/java/com/philliphsu/clock2/UpcomingAlarmReceiver.java
@@ -67,11 +67,11 @@ public class UpcomingAlarmReceiver extends BroadcastReceiver {
                         .setAction(ACTION_DISMISS_NOW);
                 PendingIntent pi = PendingIntent.getBroadcast(context, (int) id, in, FLAG_ONE_SHOT);
                 Notification note = new NotificationCompat.Builder(context)
-                        .setSmallIcon(R.mipmap.ic_launcher) // TODO: alarm icon
+                        .setSmallIcon(R.drawable.ic_alarm_24dp)
                         .setContentTitle(title)
                         .setContentText(text)
                         .setOngoing(true)
-                        .addAction(R.mipmap.ic_launcher, context.getString(R.string.dismiss_now), pi)
+                        .addAction(R.drawable.ic_dismiss_alarm_24dp, context.getString(R.string.dismiss_now), pi)
                         .build();
                 nm.notify(TAG, (int) id, note);
             }
diff --git a/app/src/main/java/com/philliphsu/clock2/alarms/AlarmRingtoneService.java b/app/src/main/java/com/philliphsu/clock2/alarms/AlarmRingtoneService.java
index 9aa4946..99367b4 100644
--- a/app/src/main/java/com/philliphsu/clock2/alarms/AlarmRingtoneService.java
+++ b/app/src/main/java/com/philliphsu/clock2/alarms/AlarmRingtoneService.java
@@ -70,13 +70,13 @@ public class AlarmRingtoneService extends RingtoneService<Alarm> {
                 : getRingingObject().label();
         return new NotificationCompat.Builder(this)
                 // Required contents
-                .setSmallIcon(R.mipmap.ic_launcher) // TODO: alarm icon
+                .setSmallIcon(R.drawable.ic_alarm_24dp)
                 .setContentTitle(title)
                 .setContentText(formatTime(this, System.currentTimeMillis()))
-                .addAction(R.mipmap.ic_launcher, // TODO: correct icon
+                .addAction(R.drawable.ic_snooze_24dp,
                         getString(R.string.snooze),
                         getPendingIntent(ACTION_SNOOZE, getRingingObject().getIntId()))
-                .addAction(R.mipmap.ic_launcher, // TODO: correct icon
+                .addAction(R.drawable.ic_dismiss_alarm_24dp,
                         getString(R.string.dismiss),
                         getPendingIntent(ACTION_DISMISS, getRingingObject().getIntId()))
                 .build();