diff --git a/res/drawable-hdpi/ic_action_notify_cancel.png b/res/drawable-hdpi/ic_action_notify_cancel.png
new file mode 100644
index 0000000..e206f29
Binary files /dev/null and b/res/drawable-hdpi/ic_action_notify_cancel.png differ
diff --git a/res/drawable-hdpi/stat_dfu.png b/res/drawable-hdpi/ic_stat_notify_dfu.png
similarity index 100%
rename from res/drawable-hdpi/stat_dfu.png
rename to res/drawable-hdpi/ic_stat_notify_dfu.png
diff --git a/res/drawable-xhdpi/ic_action_notify_cancel.png b/res/drawable-xhdpi/ic_action_notify_cancel.png
new file mode 100644
index 0000000..d163420
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_notify_cancel.png differ
diff --git a/res/drawable-xhdpi/stat_dfu.png b/res/drawable-xhdpi/ic_stat_notify_dfu.png
similarity index 100%
rename from res/drawable-xhdpi/stat_dfu.png
rename to res/drawable-xhdpi/ic_stat_notify_dfu.png
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 265af60..a9975f1 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,6 +1,8 @@
 <resources>
 
     <string name="dfu_unknown_name">unnamed device</string>
+    
+    <string name="dfu_action_abort">Abort</string>
 
     <string name="dfu_status_initializing">Initializing&#8230;</string>
     <string name="dfu_status_connecting">Connecting&#8230;</string>
diff --git a/src/no/nordicsemi/android/dfu/DfuBaseService.java b/src/no/nordicsemi/android/dfu/DfuBaseService.java
index afb4ac6..6c5f476 100644
--- a/src/no/nordicsemi/android/dfu/DfuBaseService.java
+++ b/src/no/nordicsemi/android/dfu/DfuBaseService.java
@@ -583,7 +583,10 @@ public abstract class DfuBaseService extends IntentService {
 		initialize();
 
 		final LocalBroadcastManager manager = LocalBroadcastManager.getInstance(this);
-		manager.registerReceiver(mDfuActionReceiver, makeDfuActionIntentFilter());
+		final IntentFilter actionFilter = makeDfuActionIntentFilter();
+		manager.registerReceiver(mDfuActionReceiver, actionFilter);
+		// We must register this as a non-local receiver to get broadcasts from the notification action
+		registerReceiver(mDfuActionReceiver, actionFilter);
 
 		final IntentFilter filter = new IntentFilter();
 		filter.addAction(BluetoothDevice.ACTION_ACL_DISCONNECTED);
@@ -597,6 +600,7 @@ public abstract class DfuBaseService extends IntentService {
 		final LocalBroadcastManager manager = LocalBroadcastManager.getInstance(this);
 		manager.unregisterReceiver(mDfuActionReceiver);
 
+		unregisterReceiver(mDfuActionReceiver);
 		unregisterReceiver(mConnectionStateBroadcastReceiver);
 	}
 
@@ -1595,7 +1599,7 @@ public abstract class DfuBaseService extends IntentService {
 		final String deviceAddress = mDeviceAddress;
 		final String deviceName = mDeviceName != null ? mDeviceName : getString(R.string.dfu_unknown_name);
 
-		final Bitmap largeIcon = BitmapFactory.decodeResource(getResources(), R.drawable.stat_dfu);
+		final Bitmap largeIcon = BitmapFactory.decodeResource(getResources(), R.drawable.ic_stat_notify_dfu);
 
 		final Notification.Builder builder = new Notification.Builder(this).setSmallIcon(android.R.drawable.stat_sys_upload).setOnlyAlertOnce(true).setLargeIcon(largeIcon);
 		switch (progress) {
@@ -1646,6 +1650,14 @@ public abstract class DfuBaseService extends IntentService {
 		final PendingIntent pendingIntent = PendingIntent.getActivity(this, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
 		builder.setContentIntent(pendingIntent);
 
+		// Add Abort action to the notification
+		if (progress != PROGRESS_ABORTED && progress != PROGRESS_COMPLETED) {
+			final Intent abortIntent = new Intent(BROADCAST_ACTION);
+			abortIntent.putExtra(EXTRA_ACTION, ACTION_ABORT);
+			final PendingIntent pendingAbortIntent = PendingIntent.getBroadcast(this, 1, abortIntent, PendingIntent.FLAG_UPDATE_CURRENT);
+			builder.addAction(R.drawable.ic_action_notify_cancel, getString(R.string.dfu_action_abort), pendingAbortIntent);
+		}
+
 		final NotificationManager manager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
 		manager.notify(NOTIFICATION_ID, builder.build());
 	}