diff --git a/_shared_assets/themes/owncloud_com/static/img/note_pencil.svg b/_shared_assets/themes/owncloud_com/static/img/note_pencil.svg
index 43d13587a..4b78598b9 100644
--- a/_shared_assets/themes/owncloud_com/static/img/note_pencil.svg
+++ b/_shared_assets/themes/owncloud_com/static/img/note_pencil.svg
@@ -2,16 +2,9 @@
 <!-- Generator: Adobe Illustrator 18.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="24px" height="24px" viewBox="0 4 24 24" enable-background="new 0 4 24 24" xml:space="preserve">
-<g>
-	<g>
-		<polygon fill="#3A87AD" points="0,28 6.8,26.2 1.8,21.2 		"/>
-	</g>
-	<g>
-		<rect x="2.5" y="12.9" transform="matrix(0.707 -0.7072 0.7072 0.707 -8.1753 13.0196)" fill="#3A87AD" width="18.2" height="7"/>
-	</g>
-	<g>
-		<path fill="#3A87AD" d="M21.5,11.4l2.2-2.2c0.4-0.4,0.4-1.1,0-1.6l-3.4-3.4c-0.4-0.4-1.1-0.4-1.6,0l-2.2,2.2L21.5,11.4z"/>
-	</g>
+	 width="24px" height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g transform="translate(0 -1036.4)">
+	<path fill="#3A87AD" d="M20.4,1036.4c-0.9-0.1-1.9,0.3-2.8,1.2l5.3,5.3C25.5,1040.2,23.2,1036.6,20.4,1036.4z M15.8,1039.3
+		l-12.3,12.3l-3.5,8.8l8.8-3.5l12.3-12.3L15.8,1039.3z M4.4,1052.5l3.5,3.5l-4.4,2.6l-1.8-1.8L4.4,1052.5z"/>
 </g>
 </svg>
diff --git a/_shared_assets/themes/owncloud_com/static/img/warning.svg b/_shared_assets/themes/owncloud_com/static/img/warning.svg
index a949e150b..f28db06a6 100644
--- a/_shared_assets/themes/owncloud_com/static/img/warning.svg
+++ b/_shared_assets/themes/owncloud_com/static/img/warning.svg
@@ -2,22 +2,7 @@
 <!-- Generator: Adobe Illustrator 18.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="32px" height="41.8px" viewBox="0 4 32 41.8" enable-background="new 0 4 32 41.8" xml:space="preserve">
-<g>
-	<path fill="#DD1144" d="M28.8,7.9l1.3-1.3c0.2-0.2,0.2-0.5,0-0.7c-0.2-0.2-0.5-0.2-0.7,0l-1.3,1.3c-0.2,0.2-0.2,0.5,0,0.7
-		C28.3,8.1,28.6,8.1,28.8,7.9z"/>
-	<path fill="#DD1144" d="M25.2,6.8c0.1,0.1,0.2,0.2,0.4,0.2c0.3,0,0.5-0.2,0.5-0.5l0-1.9c0-0.3-0.2-0.5-0.5-0.5
-		c-0.3,0-0.5,0.2-0.5,0.5l0,1.9C25.1,6.5,25.1,6.7,25.2,6.8z"/>
-	<path fill="#DD1144" d="M22.4,7.9c0.2,0.2,0.5,0.2,0.7,0c0.2-0.2,0.2-0.5,0-0.7l-1.3-1.3c-0.2-0.2-0.5-0.2-0.7,0
-		c-0.2,0.2-0.2,0.5,0,0.7L22.4,7.9z"/>
-	<path fill="#DD1144" d="M19.7,10.9h1.9c0.3,0,0.5-0.2,0.5-0.5s-0.2-0.5-0.5-0.5h-1.9c-0.3,0-0.5,0.2-0.5,0.5c0,0.1,0.1,0.3,0.2,0.4
-		C19.4,10.9,19.6,10.9,19.7,10.9z"/>
-	<path fill="#DD1144" d="M23.1,12.9c-0.2-0.2-0.5-0.2-0.7,0l-1.3,1.3c-0.2,0.2-0.2,0.5,0,0.7l0,0c0.2,0.2,0.5,0.2,0.7,0l1.3-1.3
-		C23.3,13.4,23.3,13.1,23.1,12.9L23.1,12.9z"/>
-	<path fill="#DD1144" d="M31.5,9.9h-1.9c-0.3,0-0.5,0.2-0.5,0.5c0,0.1,0.1,0.3,0.2,0.4c0.1,0.1,0.2,0.2,0.4,0.2h1.9
-		c0.3,0,0.5-0.2,0.5-0.5C32,10.1,31.8,9.9,31.5,9.9z"/>
-	<path fill="#DD1144" d="M27.2,19.1c1.8-2.9,1.4-6.8-1.1-9.3c-0.3-0.3-0.9-0.3-1.2,0c-0.3,0.3-0.3,0.9,0,1.2c1.8,1.8,2.2,4.6,1,6.8
-		l-0.4-0.4c-1.1-1.1-2.9-1.1-4-0.1c1.4,0.7,2.7,1.6,3.9,2.7c1.2,1.2,2.1,2.5,2.7,3.9c1.1-1.1,1-2.9-0.1-4L27.2,19.1z"/>
-	<circle fill="#DD1144" cx="14.4" cy="31.3" r="14.4"/>
-</g>
+	 width="32px" height="32px" viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
+<path fill="#DD1144" d="M9.4,0L0,9.4v13.2L9.4,32h13.2l9.4-9.4V9.4L22.6,0L9.4,0z M13.3,5.3h5.3v13.3h-5.3V5.3z M13.3,21.3h5.3v5.3
+	h-5.3V21.3z"/>
 </svg>
diff --git a/_shared_assets/themes/owncloud_org/static/img/note_pencil.svg b/_shared_assets/themes/owncloud_org/static/img/note_pencil.svg
new file mode 100644
index 000000000..150df4ee9
--- /dev/null
+++ b/_shared_assets/themes/owncloud_org/static/img/note_pencil.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 18.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="24px" height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g transform="translate(0 -1036.4)">
+	<path fill="#428BCA" d="M20.4,1036.4c-0.9-0.1-1.9,0.3-2.8,1.2l5.3,5.3C25.5,1040.2,23.2,1036.6,20.4,1036.4z M15.8,1039.3
+		l-12.3,12.3l-3.5,8.8l8.8-3.5l12.3-12.3L15.8,1039.3z M4.4,1052.5l3.5,3.5l-4.4,2.6l-1.8-1.8L4.4,1052.5z"/>
+</g>
+</svg>
diff --git a/_shared_assets/themes/owncloud_org/static/img/warning.svg b/_shared_assets/themes/owncloud_org/static/img/warning.svg
new file mode 100644
index 000000000..f28db06a6
--- /dev/null
+++ b/_shared_assets/themes/owncloud_org/static/img/warning.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 18.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="32px" height="32px" viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
+<path fill="#DD1144" d="M9.4,0L0,9.4v13.2L9.4,32h13.2l9.4-9.4V9.4L22.6,0L9.4,0z M13.3,5.3h5.3v13.3h-5.3V5.3z M13.3,21.3h5.3v5.3
+	h-5.3V21.3z"/>
+</svg>
diff --git a/_shared_assets/themes/owncloud_org/static/styles.css b/_shared_assets/themes/owncloud_org/static/styles.css
index 92474c47e..e950b6d35 100644
--- a/_shared_assets/themes/owncloud_org/static/styles.css
+++ b/_shared_assets/themes/owncloud_org/static/styles.css
@@ -66,7 +66,7 @@ h3 {
 .alert .admonition-title {
   font-weight: bold;
   }
-  
+
 .alert-warning {
   color: #DE5828
 }
@@ -95,6 +95,12 @@ h3 {
         color: white;
 }
 
+.admonition.note {.alert();.alert-info(); border: 1px solid #428BCA !important; padding-left: 60px; padding-top: 15px;  background: #d9edf7 url(img/note_pencil.svg) no-repeat 15px center; }
+.admonition.note a {color: #428BCA; font-weight: bold;}
+.admonition.warning {.alert();.alert-danger();  border:1px solid rgba(221,17,68,0.85); color: #d14; padding-left: 60px; padding-top: 15px;  background: #f7f7f9 url(img/warning.svg) no-repeat 15px center; }
+.admonition.warning a {color: #d14; font-weight: bold;}
+.admonition-title { display: none;}
+
 button a {color: #1d2d44}
 button a:hover {text-decoration: none; }
 
diff --git a/_shared_assets/themes/owncloud_release/static/img/note_pencil.svg b/_shared_assets/themes/owncloud_release/static/img/note_pencil.svg
new file mode 100644
index 000000000..150df4ee9
--- /dev/null
+++ b/_shared_assets/themes/owncloud_release/static/img/note_pencil.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 18.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="24px" height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<g transform="translate(0 -1036.4)">
+	<path fill="#428BCA" d="M20.4,1036.4c-0.9-0.1-1.9,0.3-2.8,1.2l5.3,5.3C25.5,1040.2,23.2,1036.6,20.4,1036.4z M15.8,1039.3
+		l-12.3,12.3l-3.5,8.8l8.8-3.5l12.3-12.3L15.8,1039.3z M4.4,1052.5l3.5,3.5l-4.4,2.6l-1.8-1.8L4.4,1052.5z"/>
+</g>
+</svg>
diff --git a/_shared_assets/themes/owncloud_release/static/img/warning.svg b/_shared_assets/themes/owncloud_release/static/img/warning.svg
new file mode 100644
index 000000000..f28db06a6
--- /dev/null
+++ b/_shared_assets/themes/owncloud_release/static/img/warning.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 18.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="32px" height="32px" viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
+<path fill="#DD1144" d="M9.4,0L0,9.4v13.2L9.4,32h13.2l9.4-9.4V9.4L22.6,0L9.4,0z M13.3,5.3h5.3v13.3h-5.3V5.3z M13.3,21.3h5.3v5.3
+	h-5.3V21.3z"/>
+</svg>
diff --git a/_shared_assets/themes/owncloud_release/static/styles.css b/_shared_assets/themes/owncloud_release/static/styles.css
index b4e8173a5..b86a130ef 100644
--- a/_shared_assets/themes/owncloud_release/static/styles.css
+++ b/_shared_assets/themes/owncloud_release/static/styles.css
@@ -84,6 +84,14 @@ h3 {
         color: white;
 }
 
+/* Alert Settings */
+
+.admonition.note {.alert();.alert-info(); border: 1px solid #428BCA !important; padding-left: 60px; padding-top: 15px;  background: #d9edf7 url(img/note_pencil.svg) no-repeat 15px center; }
+.admonition.note a {color: #428BCA; font-weight: bold;}
+.admonition.warning {.alert();.alert-danger();  border:1px solid rgba(221,17,68,0.85); color: #d14; padding-left: 60px; padding-top: 15px;  background: #f7f7f9 url(img/warning.svg) no-repeat 15px center; }
+.admonition.warning a {color: #d14; font-weight: bold;}
+.admonition-title { display: none;}
+
 button a {color: #1d2d44}
 button a:hover {text-decoration: none; }
 
@@ -450,4 +458,3 @@ li.next {
 }
 
 /*  --  End specific css for documentation --  */
-