diff --git a/layouts/shortcodes/info.html b/layouts/shortcodes/info.html
deleted file mode 100644
index 6a24aa9c5e..0000000000
--- a/layouts/shortcodes/info.html
+++ /dev/null
@@ -1 +0,0 @@
-<div class="notices info">{{ .Inner }}</div>
diff --git a/layouts/shortcodes/notice.html b/layouts/shortcodes/notice.html
new file mode 100644
index 0000000000..936f68a3ac
--- /dev/null
+++ b/layouts/shortcodes/notice.html
@@ -0,0 +1 @@
+<div class="notices {{ .Get 0 }}" {{ if len .Params | eq 2 }} id="{{ .Get 1 }}" {{ end }}>{{ .Inner }}</div>
diff --git a/layouts/shortcodes/tip.html b/layouts/shortcodes/tip.html
deleted file mode 100644
index 9312445ebb..0000000000
--- a/layouts/shortcodes/tip.html
+++ /dev/null
@@ -1 +0,0 @@
-<div class="notices tip">{{ .Inner }}</div>
diff --git a/layouts/shortcodes/warn.html b/layouts/shortcodes/warn.html
deleted file mode 100644
index d685b0bf79..0000000000
--- a/layouts/shortcodes/warn.html
+++ /dev/null
@@ -1 +0,0 @@
-<div class="notices warning">{{ .Inner }}</div>