diff --git a/Common/System/Request.cpp b/Common/System/Request.cpp
index bf55108e06b5..4003318dea4f 100644
--- a/Common/System/Request.cpp
+++ b/Common/System/Request.cpp
@@ -55,6 +55,7 @@ void OnScreenDisplay::Show(OSDType type, const std::string &text, float duration
 				Entry msg = *iter;
 				msg.endTime = now + duration_s;
 				msg.text = text;
+				msg.type = type;
 				entries_.erase(iter);
 				entries_.insert(entries_.begin(), msg);
 				return;
@@ -65,6 +66,7 @@ void OnScreenDisplay::Show(OSDType type, const std::string &text, float duration
 	Entry msg;
 	msg.text = text;
 	msg.endTime = now + duration_s;
+	msg.type = type;
 	msg.id = id;
 	entries_.insert(entries_.begin(), msg);
 }
diff --git a/UI/DevScreens.cpp b/UI/DevScreens.cpp
index e31220e94026..df054e4a0d44 100644
--- a/UI/DevScreens.cpp
+++ b/UI/DevScreens.cpp
@@ -797,6 +797,24 @@ void SystemInfoScreen::CreateTabs() {
 		RecreateViews();
 		return UI::EVENT_DONE;
 	});
+
+	internals->Add(new ItemHeader(si->T("Notification tests")));
+	internals->Add(new Choice(si->T("Error")))->OnClick.Add([&](UI::EventParams &) {
+		g_OSD.Show(OSDType::MESSAGE_ERROR, si->T("Error"));
+		return UI::EVENT_DONE;
+	});
+	internals->Add(new Choice(si->T("Warning")))->OnClick.Add([&](UI::EventParams &) {
+		g_OSD.Show(OSDType::MESSAGE_WARNING, si->T("Warning"));
+		return UI::EVENT_DONE;
+	});
+	internals->Add(new Choice(si->T("Info")))->OnClick.Add([&](UI::EventParams &) {
+		g_OSD.Show(OSDType::MESSAGE_INFO, si->T("Info"));
+		return UI::EVENT_DONE;
+	});
+	internals->Add(new Choice(si->T("Success")))->OnClick.Add([&](UI::EventParams &) {
+		g_OSD.Show(OSDType::MESSAGE_SUCCESS, si->T("Success"));
+		return UI::EVENT_DONE;
+	});
 }
 
 void AddressPromptScreen::CreatePopupContents(UI::ViewGroup *parent) {
diff --git a/UI/OnScreenDisplay.cpp b/UI/OnScreenDisplay.cpp
index 5522ea343ee5..0fe24906ba15 100644
--- a/UI/OnScreenDisplay.cpp
+++ b/UI/OnScreenDisplay.cpp
@@ -7,6 +7,7 @@
 #include "Common/Data/Encoding/Utf8.h"
 #include "Common/Render/TextureAtlas.h"
 #include "Common/Render/DrawBuffer.h"
+#include "Common/Math/math_util.h"
 
 #include "Common/UI/Context.h"
 #include "Common/System/System.h"
@@ -19,14 +20,63 @@ static uint32_t GetOSDBackgroundColor(OSDType type) {
 	// Colors from Infima
 	switch (type) {
 	case OSDType::MESSAGE_ERROR:
-	case OSDType::MESSAGE_ERROR_DUMP: return 0xd53035;  // danger-darker
-	case OSDType::MESSAGE_WARNING: return 0xd99e00;  // warning-darker
-	case OSDType::MESSAGE_INFO: return 0x606770;  // gray-700
+	case OSDType::MESSAGE_ERROR_DUMP: return 0x3530d5;  // danger-darker
+	case OSDType::MESSAGE_WARNING: return 0x009ed9;  // warning-darker
+	case OSDType::MESSAGE_INFO: return 0x706760;  // gray-700
 	case OSDType::MESSAGE_SUCCESS: return 0x008b00;
 	default: return 0x606770;
 	}
 }
 
+ImageID GetOSDIcon(OSDType type) {
+	switch (type) {
+	case OSDType::MESSAGE_INFO: return ImageID::invalid(); //  return ImageID("I_INFO");
+	case OSDType::MESSAGE_ERROR: return ImageID("I_CROSS");
+	case OSDType::MESSAGE_WARNING: return ImageID("I_WARNING");
+	case OSDType::MESSAGE_SUCCESS: return ImageID("I_CHECKEDBOX");
+	default: return ImageID::invalid();
+	}
+}
+
+static const float iconSize = 36.0f;
+
+// Align only matters here for the ASCII-only flag.
+static void MeasureOSDEntry(UIContext &dc, const OnScreenDisplay::Entry &entry, int align, float *width, float *height) {
+	dc.MeasureText(dc.theme->uiFont, 1.0f, 1.0f, entry.text.c_str(), width, height, align);
+
+	if (!GetOSDIcon(entry.type).isInvalid()) {
+		*width += iconSize + 5.0f;
+	}
+
+	*width += 12.0f;
+	*height = std::max(*height, iconSize + 5.0f);
+}
+
+static void RenderOSDEntry(UIContext &dc, const OnScreenDisplay::Entry &entry, Bounds bounds, int align, float alpha) {
+	UI::Drawable background = UI::Drawable(colorAlpha(GetOSDBackgroundColor(entry.type), alpha));
+
+	uint32_t foreGround = whiteAlpha(alpha);
+
+	Bounds shadowBounds = bounds.Expand(10.0f);
+
+	dc.Draw()->DrawImage4Grid(dc.theme->dropShadow4Grid, shadowBounds.x, shadowBounds.y + 4.0f, shadowBounds.x2(), shadowBounds.y2(), alphaMul(0xFF000000, 0.9f * alpha), 1.0f);
+
+	dc.FillRect(background, bounds);
+	dc.SetFontStyle(dc.theme->uiFont);
+
+	ImageID iconID = GetOSDIcon(entry.type);
+
+	if (iconID.isValid()) {
+		dc.DrawImageVGradient(iconID, foreGround, foreGround, Bounds(bounds.x + 2.5f, bounds.y + 2.5f, iconSize, iconSize));
+
+		// Make room
+		bounds.x += iconSize + 5.0f;
+		bounds.w -= iconSize + 5.0f;
+	}
+
+	dc.DrawTextShadowRect(entry.text.c_str(), bounds, colorAlpha(0xFFFFFFFF, alpha), (align & FLAG_DYNAMIC_ASCII) | ALIGN_CENTER);
+}
+
 void OnScreenMessagesView::Draw(UIContext &dc) {
 	if (!g_Config.bShowOnScreenMessages) {
 		return;
@@ -41,9 +91,6 @@ void OnScreenMessagesView::Draw(UIContext &dc) {
 	const std::vector<OnScreenDisplay::Entry> entries = g_OSD.Entries();
 	double now = time_now_d();
 	for (auto iter = entries.begin(); iter != entries.end(); ++iter) {
-		float alpha = (iter->endTime - now) * 4.0f;
-		if (alpha > 1.0) alpha = 1.0f;
-		if (alpha < 0.0) alpha = 0.0f;
 		dc.SetFontScale(1.0f, 1.0f);
 		// Messages that are wider than the screen are left-aligned instead of centered.
 
@@ -55,23 +102,31 @@ void OnScreenMessagesView::Draw(UIContext &dc) {
 		}
 
 		float tw, th;
-		dc.MeasureText(dc.theme->uiFont, 1.0f, 1.0f, iter->text.c_str(), &tw, &th, align);
-		float x = bounds_.centerX();
+		MeasureOSDEntry(dc, *iter, align, &tw, &th);
+
+		Bounds b(0.0f, y, tw, th);
+
 		if (tw > bounds_.w) {
-			align |= ALIGN_TOP | ALIGN_LEFT;
-			x = 2;
+			// Left-aligned
+			b.x = 2;
 		} else {
-			align |= ALIGN_TOP | ALIGN_HCENTER;
+			// Centered
+			b.x = (bounds_.w - b.w) * 0.5f;
 		}
+
+		// Scale down if height doesn't fit.
 		float scale = 1.0f;
 		if (th > bounds_.h - y) {
 			// Scale down!
 			scale = std::max(0.15f, (bounds_.h - y) / th);
 			dc.SetFontScale(scale, scale);
+			b.w *= scale;
+			b.h *= scale;
 		}
-		dc.SetFontStyle(dc.theme->uiFont);
-		dc.DrawTextShadow(iter->text.c_str(), x, y, colorAlpha(0xFFFFFFFF, alpha), align);
-		y += th * scale;
+
+		float alpha = Clamp((float)(iter->endTime - now) * 4.0f, 0.0f, 1.0f);
+		RenderOSDEntry(dc, *iter, b, align, alpha);
+		y += (b.h * scale + 4.0f) * alpha;  // including alpha here gets us smooth animations.
 	}
 
 	// Thin bar at the top of the screen.
diff --git a/ui_atlasscript.txt b/ui_atlasscript.txt
index eead48f3f2f1..16fc12a90ffa 100644
--- a/ui_atlasscript.txt
+++ b/ui_atlasscript.txt
@@ -70,3 +70,4 @@ image I_ARROW_UP source_assets/image/arrow_up.png copy
 image I_ARROW_DOWN source_assets/image/arrow_down.png copy
 image I_SLIDERS source_assets/image/sliders.png copy
 image I_THREE_DOTS source_assets/image/three_dots.png copy
+image I_INFO source_assets/image/info.png copy