diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ffa3204..6b2cb38 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="be.digitalia.fosdem"
     android:versionCode="0700104"
@@ -58,6 +59,12 @@
                 android:name="android.app.searchable"
                 android:resource="@xml/main_searchable" />
         </activity>
+        <!-- Clearing the Task Affinity allows this dialog activity to be displayed without bringing to front the main application with it. -->
+        <activity
+            android:name=".activities.RoomImageDialogActivity"
+            android:excludeFromRecents="true"
+            android:taskAffinity=""
+            android:theme="@style/DialogTheme" />
         <activity
             android:name=".activities.SettingsActivity"
             android:label="@string/settings" />
diff --git a/res/drawable-hdpi/ic_action_place.png b/res/drawable-hdpi/ic_action_place.png
new file mode 100644
index 0000000..4b3a5fe
Binary files /dev/null and b/res/drawable-hdpi/ic_action_place.png differ
diff --git a/res/drawable-mdpi/ic_action_place.png b/res/drawable-mdpi/ic_action_place.png
new file mode 100644
index 0000000..6c7fbc9
Binary files /dev/null and b/res/drawable-mdpi/ic_action_place.png differ
diff --git a/res/drawable-xhdpi/ic_action_place.png b/res/drawable-xhdpi/ic_action_place.png
new file mode 100644
index 0000000..4eda585
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_place.png differ
diff --git a/res/drawable-xxhdpi/ic_action_place.png b/res/drawable-xxhdpi/ic_action_place.png
new file mode 100644
index 0000000..ae08ea0
Binary files /dev/null and b/res/drawable-xxhdpi/ic_action_place.png differ
diff --git a/res/values-v11/styles.xml b/res/values-v11/styles.xml
new file mode 100644
index 0000000..7efda10
--- /dev/null
+++ b/res/values-v11/styles.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <style name="DialogTheme" parent="@android:style/Theme.Holo.Light.Dialog" />
+
+</resources>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6e6e790..1d5aefc 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -101,6 +101,7 @@
     <string name="more_info">More info</string>
 
     <!-- Others -->
+    <string name="room_map">Room map</string>
     <string name="directions">Directions to ULB</string>
     <string name="no_data">No data available.</string>
     <string name="about">About</string>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index e202197..add8019 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
     <style name="AppTheme" parent="@style/Theme.AppCompat.Light">
@@ -12,6 +13,8 @@
         <item name="activatedBackgroundIndicator">@drawable/activated_background</item>
     </style>
 
+    <style name="DialogTheme" parent="@android:style/Theme.Dialog" />
+
     <style name="ActionBar.Solid.Fosdem" parent="@style/Widget.AppCompat.Light.ActionBar.Solid">
 
         <!-- Only override the progress bar style for modern devices with Holo theme -->
diff --git a/src/be/digitalia/fosdem/activities/RoomImageDialogActivity.java b/src/be/digitalia/fosdem/activities/RoomImageDialogActivity.java
new file mode 100644
index 0000000..ffc9355
--- /dev/null
+++ b/src/be/digitalia/fosdem/activities/RoomImageDialogActivity.java
@@ -0,0 +1,30 @@
+package be.digitalia.fosdem.activities;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.widget.ImageView;
+
+/**
+ * A special Activity which is displayed like a dialog and shows a room image. Specify the room name and the room image id as Intent extras.
+ * 
+ * @author Christophe Beyls
+ * 
+ */
+public class RoomImageDialogActivity extends Activity {
+
+	public static final String EXTRA_ROOM_NAME = "roomName";
+	public static final String EXTRA_ROOM_IMAGE_RESOURCE_ID = "imageResId";
+
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		Intent intent = getIntent();
+
+		setTitle(intent.getStringExtra(EXTRA_ROOM_NAME));
+
+		ImageView imageView = new ImageView(this);
+		imageView.setImageResource(intent.getIntExtra(EXTRA_ROOM_IMAGE_RESOURCE_ID, 0));
+		setContentView(imageView);
+	}
+}
diff --git a/src/be/digitalia/fosdem/services/AlarmIntentService.java b/src/be/digitalia/fosdem/services/AlarmIntentService.java
index c78a63c..73f02eb 100644
--- a/src/be/digitalia/fosdem/services/AlarmIntentService.java
+++ b/src/be/digitalia/fosdem/services/AlarmIntentService.java
@@ -9,18 +9,24 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.database.Cursor;
+import android.graphics.Color;
 import android.net.Uri;
 import android.preference.PreferenceManager;
 import android.support.v4.app.NotificationCompat;
 import android.support.v4.app.TaskStackBuilder;
+import android.text.Spannable;
+import android.text.SpannableString;
 import android.text.TextUtils;
+import android.text.style.ForegroundColorSpan;
 import be.digitalia.fosdem.R;
 import be.digitalia.fosdem.activities.EventDetailsActivity;
 import be.digitalia.fosdem.activities.MainActivity;
+import be.digitalia.fosdem.activities.RoomImageDialogActivity;
 import be.digitalia.fosdem.db.DatabaseManager;
 import be.digitalia.fosdem.fragments.SettingsFragment;
 import be.digitalia.fosdem.model.Event;
 import be.digitalia.fosdem.receivers.AlarmReceiver;
+import be.digitalia.fosdem.utils.StringUtils;
 
 /**
  * A service to schedule or unschedule alarms in the background, keeping the app responsive.
@@ -140,7 +146,7 @@ public class AlarmIntentService extends IntentService {
 
 				String personsSummary = event.getPersonsSummary();
 				String trackName = event.getTrack().getName();
-				String bigText;
+				CharSequence bigText;
 				String contentText;
 				if (TextUtils.isEmpty(personsSummary)) {
 					contentText = trackName;
@@ -151,16 +157,31 @@ public class AlarmIntentService extends IntentService {
 					if (TextUtils.isEmpty(subTitle)) {
 						bigText = personsSummary;
 					} else {
-						bigText = String.format("%1s\n\n%2$s", subTitle, personsSummary);
+						SpannableString spannableBigText = new SpannableString(String.format("%1$s\n%2$s", subTitle, personsSummary));
+						// Set the subtitle in white color
+						spannableBigText.setSpan(new ForegroundColorSpan(Color.WHITE), 0, subTitle.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+						bigText = spannableBigText;
 					}
 				}
 
-				Notification notification = new NotificationCompat.Builder(this).setSmallIcon(R.drawable.ic_launcher).setWhen(event.getStartTime().getTime())
-						.setContentTitle(event.getTitle()).setContentText(contentText)
+				NotificationCompat.Builder notificationBuilder = new NotificationCompat.Builder(this).setSmallIcon(R.drawable.ic_launcher)
+						.setWhen(event.getStartTime().getTime()).setContentTitle(event.getTitle()).setContentText(contentText)
 						.setStyle(new NotificationCompat.BigTextStyle().bigText(bigText).setSummaryText(trackName)).setContentInfo(event.getRoomName())
-						.setContentIntent(eventPendingIntent).setAutoCancel(true).setDefaults(defaultFlags).setPriority(NotificationCompat.PRIORITY_DEFAULT)
-						.build();
-				notificationManager.notify((int) eventId, notification);
+						.setContentIntent(eventPendingIntent).setAutoCancel(true).setDefaults(defaultFlags).setPriority(NotificationCompat.PRIORITY_DEFAULT);
+
+				// Add an optional action button to show the room map image
+				String roomName = event.getRoomName();
+				int roomImageResId = getResources().getIdentifier(StringUtils.roomNameToResourceName(roomName), "drawable", getPackageName());
+				if (roomImageResId != 0) {
+					// The room name is the unique Id of a RoomImageDialogActivity
+					Intent mapIntent = new Intent(this, RoomImageDialogActivity.class).setFlags(Intent.FLAG_ACTIVITY_NEW_TASK).setData(Uri.parse(roomName));
+					mapIntent.putExtra(RoomImageDialogActivity.EXTRA_ROOM_NAME, roomName);
+					mapIntent.putExtra(RoomImageDialogActivity.EXTRA_ROOM_IMAGE_RESOURCE_ID, roomImageResId);
+					PendingIntent mapPendingIntent = PendingIntent.getActivity(this, 0, mapIntent, PendingIntent.FLAG_UPDATE_CURRENT);
+					notificationBuilder.addAction(R.drawable.ic_action_place, getString(R.string.room_map), mapPendingIntent);
+				}
+
+				notificationManager.notify((int) eventId, notificationBuilder.build());
 			}
 
 			AlarmReceiver.completeWakefulIntent(intent);