diff --git a/src/main/resources/cloud/fo/docbook.xsl b/src/main/resources/cloud/fo/docbook.xsl
index c4245b0..991d09e 100644
--- a/src/main/resources/cloud/fo/docbook.xsl
+++ b/src/main/resources/cloud/fo/docbook.xsl
@@ -52,12 +52,11 @@
   <!-- Title Properties (Sections/Components) -->
   <xsl:attribute-set name="component.title.properties">
     <xsl:attribute name="font-family">CartoGothic Std</xsl:attribute>
-    <xsl:attribute name="color">rgb(84,141,212)</xsl:attribute>
+    <xsl:attribute name="color">rgb(196,0,34)</xsl:attribute>
   </xsl:attribute-set>
 
   <xsl:attribute-set name="section.title.properties">
-    <xsl:attribute name="color">rgb(84,141,212)</xsl:attribute>
-    <xsl:attribute name="font-style">italic</xsl:attribute>
+    <xsl:attribute name="color">rgb(196,0,34)</xsl:attribute>
     <xsl:attribute name="font-family">CartoGothic Std</xsl:attribute>
   </xsl:attribute-set>
 
@@ -69,6 +68,16 @@
       <xsl:attribute name="font-family">CartoGothic Std</xsl:attribute>
   </xsl:attribute-set>
 
+  <xsl:attribute-set name="formal.title.properties">
+      <xsl:attribute name="color">rgb(176,0,14)</xsl:attribute>
+      <xsl:attribute name="font-family">CartoGothic Std</xsl:attribute>
+  </xsl:attribute-set>
+
+  <xsl:attribute-set name="admonition.title.properties">
+      <xsl:attribute name="color">rgb(196,0,34)</xsl:attribute>
+      <xsl:attribute name="font-family">CartoGothic Std</xsl:attribute>
+  </xsl:attribute-set>
+
   <xsl:param name="local.l10n.xml" select="document('gentex_mods.xml')"/>
 
   <!-- Headers -->
@@ -217,7 +226,7 @@
       <fo:region-after 
                        extent="0.5in" 
                        display-align="after"
-                       background-color="rgb(67,173,213)"
+                       background-color="rgb(176,0,14)"
                        />
     </fo:simple-page-master>
 
diff --git a/src/main/resources/cloud/fo/titlepage/titlepage.templates.xml b/src/main/resources/cloud/fo/titlepage/titlepage.templates.xml
index 04f79ef..92a472d 100644
--- a/src/main/resources/cloud/fo/titlepage/titlepage.templates.xml
+++ b/src/main/resources/cloud/fo/titlepage/titlepage.templates.xml
@@ -1140,8 +1140,9 @@
 	     space-after="0.5em"
 	     margin-left="{$title.margin.left}"
 	     start-indent="0pt"
-	     font-size="&hsize3;"
+	     font-size="&hsize4;"
 	     font-weight="bold"
+         color="rgb(196,0,34)"
 	     font-family="{$title.fontset}"/>
     </t:titlepage-content>
 
@@ -1170,8 +1171,9 @@
 	     space-after="0.5em"
 	     margin-left="{$title.margin.left}"
 	     start-indent="0pt"
-	     font-size="&hsize3;"
+	     font-size="&hsize4;"
 	     font-weight="bold"
+         color="rgb(196,0,34)"
 	     font-family="{$title.fontset}"/>
     </t:titlepage-content>
 
@@ -1200,8 +1202,9 @@
 	     space-after="0.5em"
 	     margin-left="{$title.margin.left}"
 	     start-indent="0pt"
-	     font-size="&hsize3;"
+	     font-size="&hsize4;"
 	     font-weight="bold"
+         color="rgb(196,0,34)"
 	     font-family="{$title.fontset}"/>
     </t:titlepage-content>
 
@@ -1230,8 +1233,9 @@
 	     space-after="0.5em"
 	     margin-left="{$title.margin.left}"
 	     start-indent="0pt"
-	     font-size="&hsize3;"
+	     font-size="&hsize4;"
 	     font-weight="bold"
+         color="rgb(196,0,34)"
 	     font-family="{$title.fontset}"/>
     </t:titlepage-content>
 
@@ -1260,8 +1264,9 @@
 	     space-after="0.5em"
 	     margin-left="{$title.margin.left}"
 	     start-indent="0pt"
-	     font-size="&hsize3;"
+	     font-size="&hsize4;"
 	     font-weight="bold"
+         color="rgb(196,0,34)"
 	     font-family="{$title.fontset}"/>
     </t:titlepage-content>
 
@@ -1290,8 +1295,9 @@
 	     space-after="0.5em"
 	     margin-left="{$title.margin.left}"
 	     start-indent="0pt"
-	     font-size="&hsize3;"
+	     font-size="&hsize4;"
 	     font-weight="bold"
+         color="rgb(196,0,34)"
 	     font-family="{$title.fontset}"/>
     </t:titlepage-content>
 
@@ -1320,8 +1326,9 @@
 	     space-after="0.5em"
 	     margin-left="{$title.margin.left}"
 	     start-indent="0pt"
-	     font-size="&hsize3;"
+	     font-size="&hsize4;"
 	     font-weight="bold"
+         color="rgb(196,0,34)"
 	     font-family="{$title.fontset}"/>
     </t:titlepage-content>
 
diff --git a/src/main/resources/images/caution.svg b/src/main/resources/images/caution.svg
index dd84f3f..e732a36 100644
--- a/src/main/resources/images/caution.svg
+++ b/src/main/resources/images/caution.svg
@@ -1,25 +1,79 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Generator: Adobe Illustrator 9.0, SVG Export Plug-In  -->
-<!DOCTYPE svg [
-	<!ENTITY st0 "fill:#FFFFFF;stroke:none;">
-	<!ENTITY st1 "fill:#FFFFFF;stroke-width:6.6112;stroke-linecap:round;stroke-linejoin:round;">
-	<!ENTITY st2 "stroke:#FFFFFF;stroke-width:6.6112;">
-	<!ENTITY st3 "fill:none;stroke:none;">
-	<!ENTITY st4 "fill-rule:nonzero;clip-rule:nonzero;stroke:#000000;stroke-miterlimit:4;">
-	<!ENTITY st5 "stroke:none;">
-]>
-<svg  width="48pt" height="48pt" viewBox="0 0 48 48" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
-	<g id="Layer_x0020_3" style="&st4;">
-		<g>
-			<path style="&st2;" d="M41.7,35.3L26.6,9.4c-0.6-1-1.7-1.7-2.9-1.6c-1.2,0-2.3,0.7-2.9,1.7L6.3,35.4c-0.6,1-0.6,2.3,0,3.3c0.6,1,1.7,1.6,2.9,1.6h29.6c1.2,0,2.3-0.6,2.9-1.7c0.6-1,0.6-2.3,0-3.3z"/>
-			<path style="&st1;" d="M23.7,11L9.2,37h29.6L23.7,11z"/>
-			<path style="&st0;" d="M23.7,11.9L10.3,36.1h27.5l-14-24.1z"/>
-			<g>
-				<path style="&st5;" d="M24.1,34c-1.1,0-1.8-0.8-1.8-1.8c0-1.1,0.7-1.8,1.8-1.8c1.1,0,1.8,0.7,1.8,1.8c0,1-0.7,1.8-1.8,1.8h0z M22.9,29.3l-0.4-9.1h3.2l-0.4,9.1h-2.3z"/>
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48pt"
+   height="48pt"
+   viewBox="0 0 48 48"
+   xml:space="preserve"
+   id="svg4202"
+   version="1.1"
+   inkscape:version="0.48.0 r9654"
+   sodipodi:docname="caution.svg"><metadata
+   id="metadata4224"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs4222">
+		
+	
+			
+			
+			
+			
+		</defs><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1306"
+   inkscape:window-height="784"
+   id="namedview4220"
+   showgrid="false"
+   inkscape:zoom="14.373972"
+   inkscape:cx="31.692308"
+   inkscape:cy="30"
+   inkscape:window-x="49"
+   inkscape:window-y="50"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="svg4202" />
+	<path
+   style="fill-rule:nonzero;stroke:#ffffff;stroke-width:6.61119986;stroke-miterlimit:4"
+   d="M 41.7,35.3 26.6,9.4 C 26,8.4 24.9,7.7 23.7,7.8 22.5,7.8 21.4,8.5 20.8,9.5 L 6.3,35.4 c -0.6,1 -0.6,2.3 0,3.3 0.6,1 1.7,1.6 2.9,1.6 h 29.6 c 1.2,0 2.3,-0.6 2.9,-1.7 0.6,-1 0.6,-2.3 0,-3.3 z"
+   id="path4207"
+   inkscape:connector-curvature="0" /><path
+   style="fill:#ffffff;fill-rule:nonzero;stroke:#c40022;stroke-width:6.61119986000000015;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
+   d="M 23.7,11 9.2,37 H 38.8 L 23.7,11 z"
+   id="path4209"
+   inkscape:connector-curvature="0" /><path
+   style="fill:#ffffff;fill-rule:nonzero;stroke:none"
+   d="M 23.7,11.9 10.3,36.1 H 37.8 L 23.8,12 z"
+   id="path4211"
+   inkscape:connector-curvature="0" /><g
+   style="fill-rule:nonzero;stroke:#000000;stroke-miterlimit:4"
+   id="g4213">
+				<path
+   style="stroke:none"
+   d="m 24.1,34 c -1.1,0 -1.8,-0.8 -1.8,-1.8 0,-1.1 0.7,-1.8 1.8,-1.8 1.1,0 1.8,0.7 1.8,1.8 0,1 -0.7,1.8 -1.8,1.8 h 0 z m -1.2,-4.7 -0.4,-9.1 h 3.2 l -0.4,9.1 H 23 z"
+   id="path4215"
+   inkscape:connector-curvature="0" />
 			</g>
-		</g>
+	<g
+   id="crop_x0020_marks"
+   style="fill-rule:nonzero;clip-rule:nonzero;stroke:#000000;stroke-miterlimit:4;">
+		<path
+   style="fill:none;stroke:none;"
+   d="M48,48H0V0h48v48z"
+   id="path4218" />
 	</g>
-	<g id="crop_x0020_marks" style="&st4;">
-		<path style="&st3;" d="M48,48H0V0h48v48z"/>
-	</g>
-</svg>
+</svg>
\ No newline at end of file
diff --git a/src/main/resources/images/important.svg b/src/main/resources/images/important.svg
index dd84f3f..a4378d8 100644
--- a/src/main/resources/images/important.svg
+++ b/src/main/resources/images/important.svg
@@ -1,25 +1,79 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Generator: Adobe Illustrator 9.0, SVG Export Plug-In  -->
-<!DOCTYPE svg [
-	<!ENTITY st0 "fill:#FFFFFF;stroke:none;">
-	<!ENTITY st1 "fill:#FFFFFF;stroke-width:6.6112;stroke-linecap:round;stroke-linejoin:round;">
-	<!ENTITY st2 "stroke:#FFFFFF;stroke-width:6.6112;">
-	<!ENTITY st3 "fill:none;stroke:none;">
-	<!ENTITY st4 "fill-rule:nonzero;clip-rule:nonzero;stroke:#000000;stroke-miterlimit:4;">
-	<!ENTITY st5 "stroke:none;">
-]>
-<svg  width="48pt" height="48pt" viewBox="0 0 48 48" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
-	<g id="Layer_x0020_3" style="&st4;">
-		<g>
-			<path style="&st2;" d="M41.7,35.3L26.6,9.4c-0.6-1-1.7-1.7-2.9-1.6c-1.2,0-2.3,0.7-2.9,1.7L6.3,35.4c-0.6,1-0.6,2.3,0,3.3c0.6,1,1.7,1.6,2.9,1.6h29.6c1.2,0,2.3-0.6,2.9-1.7c0.6-1,0.6-2.3,0-3.3z"/>
-			<path style="&st1;" d="M23.7,11L9.2,37h29.6L23.7,11z"/>
-			<path style="&st0;" d="M23.7,11.9L10.3,36.1h27.5l-14-24.1z"/>
-			<g>
-				<path style="&st5;" d="M24.1,34c-1.1,0-1.8-0.8-1.8-1.8c0-1.1,0.7-1.8,1.8-1.8c1.1,0,1.8,0.7,1.8,1.8c0,1-0.7,1.8-1.8,1.8h0z M22.9,29.3l-0.4-9.1h3.2l-0.4,9.1h-2.3z"/>
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48pt"
+   height="48pt"
+   viewBox="0 0 48 48"
+   xml:space="preserve"
+   id="svg4202"
+   version="1.1"
+   inkscape:version="0.48.0 r9654"
+   sodipodi:docname="caution.svg"><metadata
+   id="metadata4224"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+   id="defs4222">
+		
+	
+			
+			
+			
+			
+		</defs><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1306"
+   inkscape:window-height="784"
+   id="namedview4220"
+   showgrid="false"
+   inkscape:zoom="10.163933"
+   inkscape:cx="31.692308"
+   inkscape:cy="30"
+   inkscape:window-x="49"
+   inkscape:window-y="50"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="svg4202" />
+	<path
+   style="fill-rule:nonzero;stroke:#ffffff;stroke-width:6.61119986;stroke-miterlimit:4"
+   d="M 41.7,35.3 26.6,9.4 C 26,8.4 24.9,7.7 23.7,7.8 22.5,7.8 21.4,8.5 20.8,9.5 L 6.3,35.4 c -0.6,1 -0.6,2.3 0,3.3 0.6,1 1.7,1.6 2.9,1.6 h 29.6 c 1.2,0 2.3,-0.6 2.9,-1.7 0.6,-1 0.6,-2.3 0,-3.3 z"
+   id="path4207"
+   inkscape:connector-curvature="0" /><path
+   style="fill:#ffffff;fill-rule:nonzero;stroke:#c40022;stroke-width:6.61119986000000015;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
+   d="M 23.7,11 9.2,37 H 38.8 L 23.7,11 z"
+   id="path4209"
+   inkscape:connector-curvature="0" /><path
+   style="fill:#ffffff;fill-rule:nonzero;stroke:none"
+   d="M 23.7,11.9 10.3,36.1 H 37.8 L 23.8,12 z"
+   id="path4211"
+   inkscape:connector-curvature="0" /><g
+   style="fill-rule:nonzero;stroke:#000000;stroke-miterlimit:4"
+   id="g4213">
+				<path
+   style="stroke:none"
+   d="m 24.1,34 c -1.1,0 -1.8,-0.8 -1.8,-1.8 0,-1.1 0.7,-1.8 1.8,-1.8 1.1,0 1.8,0.7 1.8,1.8 0,1 -0.7,1.8 -1.8,1.8 h 0 z m -1.2,-4.7 -0.4,-9.1 h 3.2 l -0.4,9.1 H 23 z"
+   id="path4215"
+   inkscape:connector-curvature="0" />
 			</g>
-		</g>
+	<g
+   id="crop_x0020_marks"
+   style="fill-rule:nonzero;clip-rule:nonzero;stroke:#000000;stroke-miterlimit:4;">
+		<path
+   style="fill:none;stroke:none;"
+   d="M48,48H0V0h48v48z"
+   id="path4218" />
 	</g>
-	<g id="crop_x0020_marks" style="&st4;">
-		<path style="&st3;" d="M48,48H0V0h48v48z"/>
-	</g>
-</svg>
+</svg>
\ No newline at end of file
diff --git a/src/main/resources/images/note.svg b/src/main/resources/images/note.svg
index 648299d..0ddb7df 100644
--- a/src/main/resources/images/note.svg
+++ b/src/main/resources/images/note.svg
@@ -1,33 +1,108 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Generator: Adobe Illustrator 9.0, SVG Export Plug-In  -->
-<!DOCTYPE svg [
-	<!ENTITY st0 "fill:none;stroke:#FFFFFF;stroke-width:12.1438;stroke-linejoin:round;">
-	<!ENTITY st1 "fill:none;stroke-width:1.2429;">
-	<!ENTITY st2 "fill:#FFFFFF;stroke:none;">
-	<!ENTITY st3 "fill:none;stroke:#FFFFFF;stroke-width:12.7649;stroke-linejoin:round;">
-	<!ENTITY st4 "fill:#FFFFFF;stroke-width:6.3824;stroke-linejoin:round;">
-	<!ENTITY st5 "fill:none;stroke:none;">
-	<!ENTITY st6 "fill-rule:nonzero;clip-rule:nonzero;stroke:#000000;stroke-miterlimit:4;">
-	<!ENTITY st7 "fill:#FFFFFF;stroke:#FFFFFF;stroke-width:12.7649;stroke-linejoin:round;">
-	<!ENTITY st8 "stroke:none;">
-	<!ENTITY st9 "fill:none;stroke-width:4.9715;stroke-linejoin:round;">
-]>
-<svg  xmlns="http://www.w3.org/2000/svg" width="48pt" height="48pt" viewBox="0 0 48 48" xml:space="preserve">
-	<g id="Layer_x0020_1" style="&st6;">
-		<path style="&st0;" d="M35.7,19.8v18.9H11V8.8h13.9l10.8,11z"/>
-		<path style="&st3;" d="M38.7,30.4L25,16.7l-7.7-3l2.7,8.7l13.3,13.4l5.4-5.4z"/>
-		<path style="&st7;" d="M35.7,8.8H11v29.9h24.7V8.8z"/>
-		<path style="&st4;" d="M35.7,8.8H11v29.9h24.7V8.8z"/>
-		<path style="&st2;" d="M35.7,8.8H11v29.9h24.7V8.8z"/>
+
+<svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48pt"
+   height="48pt"
+   viewBox="0 0 48 48"
+   xml:space="preserve"
+   id="svg3862"
+   version="1.1"
+   inkscape:version="0.48.0 r9654"
+   sodipodi:docname="note.svg"><metadata
+   id="metadata3893"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs3891"><linearGradient
+   id="linearGradient3770"
+   osb:paint="solid"><stop
+     style="stop-color:#000000;stop-opacity:1;"
+     offset="0"
+     id="stop3772" /></linearGradient>
+		
+		
+		
+		
+		
+	</defs><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1303"
+   inkscape:window-height="777"
+   id="namedview3889"
+   showgrid="false"
+   inkscape:zoom="9.9415124"
+   inkscape:cx="16.370611"
+   inkscape:cy="30"
+   inkscape:window-x="127"
+   inkscape:window-y="55"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="svg3862" />
+	<g
+   id="Layer_x0020_1"
+   style="fill-rule:nonzero;clip-rule:nonzero;stroke:#000000;stroke-miterlimit:4;">
+		<path
+   style="fill:none;stroke:#FFFFFF;stroke-width:12.1438;stroke-linejoin:round;"
+   d="M35.7,19.8v18.9H11V8.8h13.9l10.8,11z"
+   id="path3865" />
+		<path
+   style="fill:none;stroke:#FFFFFF;stroke-width:12.7649;stroke-linejoin:round;"
+   d="M38.7,30.4L25,16.7l-7.7-3l2.7,8.7l13.3,13.4l5.4-5.4z"
+   id="path3867" />
+		<path
+   style="fill:#FFFFFF;stroke:#FFFFFF;stroke-width:12.7649;stroke-linejoin:round;"
+   d="M35.7,8.8H11v29.9h24.7V8.8z"
+   id="path3869" />
+		<path
+   style="fill:#FFFFFF;stroke-width:6.3824;stroke-linejoin:round;"
+   d="M35.7,8.8H11v29.9h24.7V8.8z"
+   id="path3871" />
+		<path
+   style="fill:#FFFFFF;stroke:none;"
+   d="M35.7,8.8H11v29.9h24.7V8.8z"
+   id="path3873" />
 	</g>
-	<g id="Layer_x0020_4" style="&st6;">
-		<path style="&st9;" d="M38.7,30.4L25,16.7l-7.7-3l2.7,8.7l13.3,13.4l5.4-5.4z"/>
-		<path style="&st8;" d="M38.7,30.4L25,16.7l-7.7-3l2.7,8.7l13.3,13.4l5.4-5.4z"/>
-		<path style="&st8;" d="M20.6,14.7l-2.5,2.5L17,13.4l3.6,1.3z"/>
-		<path style="&st1;" d="M19.6,22.2l3-0.3l2.4-2.4l0.4-2.8"/>
-		<path style="&st2;" d="M20.4,14.9L18.3,17l1.6,5.2l2.7-0.3l2.4-2.4l0.3-2.4l-5-2.2z"/>
+	<path
+   inkscape:connector-curvature="0"
+   id="path3878"
+   d="M 38.7,30.4 25,16.7 l -7.7,-3 2.7,8.7 13.3,13.4 5.4,-5.4 z"
+   style="fill:#c40022;fill-opacity:1;fill-rule:nonzero;stroke:#c40022;stroke-opacity:1" /><path
+   inkscape:connector-curvature="0"
+   id="path3876"
+   d="M 38.7,30.4 25,16.7 l -7.7,-3 2.7,8.7 13.3,13.4 5.4,-5.4 z"
+   style="fill:none;stroke:#000000;stroke-width:2.72;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;fill-opacity:1;stroke-dasharray:none" /><path
+   inkscape:connector-curvature="0"
+   id="path3880"
+   d="m 20.6,14.7 -2.5,2.5 -1.1,-3.8 3.6,1.3 z"
+   style="fill-rule:nonzero;stroke:none;stroke-opacity:1;fill:none;fill-opacity:1;stroke-width:0.40000000000000002;stroke-miterlimit:4;stroke-dasharray:none" /><path
+   inkscape:connector-curvature="0"
+   id="path3884"
+   d="m 20.4,14.9 -2.1,2.1 1.6,5.2 2.7,-0.3 2.4,-2.4 0.3,-2.4 -5,-2.2 z"
+   style="fill:#ffffff;fill-rule:nonzero;stroke:none" /><path
+   inkscape:connector-curvature="0"
+   id="path3882"
+   d="m 19.6,22.2 3,-0.3 2.4,-2.4 0.4,-2.8"
+   style="fill:none;stroke:#000000;stroke-width:1.24290001000000006;stroke-miterlimit:4;fill-opacity:1;stroke-opacity:1" />
+	<g
+   id="crop"
+   style="fill-rule:nonzero;clip-rule:nonzero;stroke:#000000;stroke-miterlimit:4;">
+		<path
+   style="fill:none;stroke:none;"
+   d="M48,48H0V0h48v48z"
+   id="path3887" />
 	</g>
-	<g id="crop" style="&st6;">
-		<path style="&st5;" d="M48,48H0V0h48v48z"/>
-	</g>
-</svg>
+</svg>
\ No newline at end of file
diff --git a/src/main/resources/images/tip.svg b/src/main/resources/images/tip.svg
index 4a64a15..e65ba68 100644
--- a/src/main/resources/images/tip.svg
+++ b/src/main/resources/images/tip.svg
@@ -1,31 +1,115 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Generator: Adobe Illustrator 9.0, SVG Export Plug-In  -->
-<!DOCTYPE svg [
-	<!ENTITY st0 "fill:none;stroke:#000000;stroke-width:1.0944;">
-	<!ENTITY st1 "fill:#FFFFFF;stroke:none;">
-	<!ENTITY st2 "fill-rule:nonzero;clip-rule:nonzero;stroke:#FFFFFF;stroke-width:5.6139;stroke-miterlimit:4;">
-	<!ENTITY st3 "fill:none;stroke:none;">
-	<!ENTITY st4 "fill-rule:nonzero;clip-rule:nonzero;stroke:#000000;stroke-miterlimit:4;">
-	<!ENTITY st5 "stroke:none;">
-]>
-<svg  width="48pt" height="48pt" viewBox="0 0 48 48" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
-	<g id="Layer_x0020_3" style="&st2;">
-		<g>
-			<path d="M9.5,18.6c0,8,6.5,14.4,14.4,14.4c8,0,14.4-6.5,14.4-14.4c0-8-6.5-14.4-14.4-14.4c-8,0-14.4,6.5-14.4,14.4z M12.8,18.6c0-6.2,5-11.2,11.2-11.2c6.2,0,11.2,5,11.2,11.2c0,6.2-5,11.2-11.2,11.2c-6.2,0-11.2-5-11.2-11.2z"/>
-			<path d="M28.1,37.9l-7.6,0.8c-0.9,0.1-1.5,0.9-1.4,1.8c0.1,0.9,0.9,1.5,1.8,1.4l7.6-0.8c0.9-0.1,1.5-0.9,1.4-1.8c-0.1-0.9-0.9-1.5-1.8-1.4z"/>
-			<path d="M28.1,34.8l-7.6,0.8c-0.9,0.1-1.5,0.9-1.4,1.8c0.1,0.9,0.9,1.5,1.8,1.4l7.6-0.8c0.9-0.1,1.5-0.9,1.4-1.8c-0.1-0.9-0.9-1.5-1.8-1.4z"/>
-			<path d="M28.1,31.6l-7.6,0.8c-0.9,0.1-1.5,0.9-1.4,1.8s0.9,1.5,1.8,1.4l7.6-0.8c0.9-0.1,1.5-0.9,1.4-1.8s-0.9-1.5-1.8-1.4z"/>
-			<path d="M23.1,41.3v0.9c0,0.9,0.7,1.6,1.6,1.6c0.9,0,1.6-0.7,1.6-1.6v-0.9h-3.3z"/>
-			<path style="&st1;" d="M35.9,18.7c0,6.6-5.4,12-12,12c-6.6,0-12-5.4-12-12s5.4-12,12-12c6.6,0,12,5.4,12,12z"/>
-			<path style="&st5;" d="M9.6,18.6c0,8,6.5,14.4,14.4,14.4c8,0,14.4-6.5,14.4-14.4c0-8-6.5-14.4-14.4-14.4c-8,0-14.4,6.5-14.4,14.4z M12.9,18.6c0-6.2,5-11.2,11.2-11.2c6.2,0,11.2,5,11.2,11.2c0,6.2-5,11.2-11.2,11.2c-6.2,0-11.2-5-11.2-11.2z"/>
-			<path style="&st5;" d="M28.2,37.9l-7.6,0.8c-0.9,0.1-1.5,0.9-1.4,1.8c0.1,0.9,0.9,1.5,1.8,1.4l7.6-0.8c0.9-0.1,1.5-0.9,1.4-1.8c-0.1-0.9-0.9-1.5-1.8-1.4z"/>
-			<path style="&st5;" d="M28.2,34.7l-7.6,0.8c-0.9,0.1-1.5,0.9-1.4,1.8c0.1,0.9,0.9,1.5,1.8,1.4l7.6-0.8c0.9-0.1,1.5-0.9,1.4-1.8c-0.1-0.9-0.9-1.5-1.8-1.4z"/>
-			<path style="&st5;" d="M28.2,31.6l-7.6,0.8c-0.9,0.1-1.5,0.9-1.4,1.8c0.1,0.9,0.9,1.5,1.8,1.4l7.6-0.8c0.9-0.1,1.5-0.9,1.4-1.8c-0.1-0.9-0.9-1.5-1.8-1.4z"/>
-			<path style="&st5;" d="M23.1,41.3v0.9c0,0.9,0.7,1.6,1.6,1.6s1.6-0.7,1.6-1.6v-0.9h-3.3z"/>
-			<path style="&st0;" d="M22.3,28.3l-3.5-10.7c0,0,6.6,3.9,10.5,0"/>
-		</g>
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48pt"
+   height="48pt"
+   viewBox="0 0 48 48"
+   xml:space="preserve"
+   id="svg4848"
+   version="1.1"
+   inkscape:version="0.48.0 r9654"
+   sodipodi:docname="tip.svg"><metadata
+   id="metadata4884"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs4882">
+		
+	
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+		</defs><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="751"
+   inkscape:window-height="480"
+   id="namedview4880"
+   showgrid="false"
+   inkscape:zoom="3.9931624"
+   inkscape:cx="30"
+   inkscape:cy="30"
+   inkscape:window-x="0"
+   inkscape:window-y="22"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="svg4848" />
+	<path
+   style="fill-rule:nonzero;stroke:#ffffff;stroke-width:5.61390018;stroke-miterlimit:4"
+   d="m 9.5,18.6 c 0,8 6.5,14.4 14.4,14.4 8,0 14.4,-6.5 14.4,-14.4 0,-8 -6.5,-14.4 -14.4,-14.4 -8,0 -14.4,6.5 -14.4,14.4 z m 3.3,0 c 0,-6.2 5,-11.2 11.2,-11.2 6.2,0 11.2,5 11.2,11.2 0,6.2 -5,11.2 -11.2,11.2 -6.2,0 -11.2,-5 -11.2,-11.2 z"
+   id="path4853"
+   inkscape:connector-curvature="0" /><path
+   style="fill-rule:nonzero;stroke:#ffffff;stroke-width:5.61390018;stroke-miterlimit:4"
+   d="m 28.1,37.9 -7.6,0.8 c -0.9,0.1 -1.5,0.9 -1.4,1.8 0.1,0.9 0.9,1.5 1.8,1.4 l 7.6,-0.8 C 29.4,41 30,40.2 29.9,39.3 29.8,38.4 29,37.8 28.1,37.9 z"
+   id="path4855"
+   inkscape:connector-curvature="0" /><path
+   style="fill-rule:nonzero;stroke:#ffffff;stroke-width:5.61390018;stroke-miterlimit:4"
+   d="m 28.1,34.8 -7.6,0.8 c -0.9,0.1 -1.5,0.9 -1.4,1.8 0.1,0.9 0.9,1.5 1.8,1.4 L 28.5,38 C 29.4,37.9 30,37.1 29.9,36.2 29.8,35.3 29,34.7 28.1,34.8 z"
+   id="path4857"
+   inkscape:connector-curvature="0" /><path
+   style="fill-rule:nonzero;stroke:#ffffff;stroke-width:5.61390018;stroke-miterlimit:4"
+   d="m 28.1,31.6 -7.6,0.8 c -0.9,0.1 -1.5,0.9 -1.4,1.8 0.1,0.9 0.9,1.5 1.8,1.4 l 7.6,-0.8 C 29.4,34.7 30,33.9 29.9,33 29.8,32.1 29,31.5 28.1,31.6 z"
+   id="path4859"
+   inkscape:connector-curvature="0" /><path
+   style="fill-rule:nonzero;stroke:#ffffff;stroke-width:5.61390018;stroke-miterlimit:4"
+   d="m 23.1,41.3 v 0.9 c 0,0.9 0.7,1.6 1.6,1.6 0.9,0 1.6,-0.7 1.6,-1.6 V 41.3 H 23 z"
+   id="path4861"
+   inkscape:connector-curvature="0" /><path
+   style="fill:#ffffff;fill-rule:nonzero;stroke:none"
+   d="m 35.9,18.7 c 0,6.6 -5.4,12 -12,12 -6.6,0 -12,-5.4 -12,-12 0,-6.6 5.4,-12 12,-12 6.6,0 12,5.4 12,12 z"
+   id="path4863"
+   inkscape:connector-curvature="0" /><path
+   style="fill-rule:nonzero;stroke:none"
+   d="M 9.6,18.6 C 9.6,26.6 16.1,33 24,33 32,33 38.4,26.5 38.4,18.6 38.4,10.6 31.9,4.2 24,4.2 16,4.2 9.6,10.7 9.6,18.6 z m 3.3,0 c 0,-6.2 5,-11.2 11.2,-11.2 6.2,0 11.2,5 11.2,11.2 0,6.2 -5,11.2 -11.2,11.2 -6.2,0 -11.2,-5 -11.2,-11.2 z"
+   id="path4865"
+   inkscape:connector-curvature="0" /><path
+   style="fill-rule:nonzero;stroke:none"
+   d="m 28.2,37.9 -7.6,0.8 c -0.9,0.1 -1.5,0.9 -1.4,1.8 0.1,0.9 0.9,1.5 1.8,1.4 l 7.6,-0.8 C 29.5,41 30.1,40.2 30,39.3 29.9,38.4 29.1,37.8 28.2,37.9 z"
+   id="path4867"
+   inkscape:connector-curvature="0" /><path
+   style="fill-rule:nonzero;stroke:none"
+   d="m 28.2,34.7 -7.6,0.8 c -0.9,0.1 -1.5,0.9 -1.4,1.8 0.1,0.9 0.9,1.5 1.8,1.4 l 7.6,-0.8 C 29.5,37.8 30.1,37 30,36.1 29.9,35.2 29.1,34.6 28.2,34.7 z"
+   id="path4869"
+   inkscape:connector-curvature="0" /><path
+   style="fill-rule:nonzero;stroke:none"
+   d="m 28.2,31.6 -7.6,0.8 c -0.9,0.1 -1.5,0.9 -1.4,1.8 0.1,0.9 0.9,1.5 1.8,1.4 l 7.6,-0.8 C 29.5,34.7 30.1,33.9 30,33 29.9,32.1 29.1,31.5 28.2,31.6 z"
+   id="path4871"
+   inkscape:connector-curvature="0" /><path
+   style="fill-rule:nonzero;stroke:none"
+   d="m 23.1,41.3 v 0.9 c 0,0.9 0.7,1.6 1.6,1.6 0.9,0 1.6,-0.7 1.6,-1.6 V 41.3 H 23 z"
+   id="path4873"
+   inkscape:connector-curvature="0" /><path
+   style="fill:none;stroke:#c40022;stroke-width:1.09440004999999996;stroke-miterlimit:4;stroke-opacity:1"
+   d="M 22.3,28.3 18.8,17.6 c 0,0 6.6,3.9 10.5,0"
+   id="path4875"
+   inkscape:connector-curvature="0" />
+	<g
+   id="crop_x0020_marks"
+   style="fill-rule:nonzero;clip-rule:nonzero;stroke:#000000;stroke-miterlimit:4;">
+		<path
+   style="fill:none;stroke:none;"
+   d="M48,48H0V0h48v48z"
+   id="path4878" />
 	</g>
-	<g id="crop_x0020_marks" style="&st4;">
-		<path style="&st3;" d="M48,48H0V0h48v48z"/>
-	</g>
-</svg>
+</svg>
\ No newline at end of file
diff --git a/src/main/resources/images/warning.svg b/src/main/resources/images/warning.svg
index fc8d748..519e99d 100644
--- a/src/main/resources/images/warning.svg
+++ b/src/main/resources/images/warning.svg
@@ -1,23 +1,75 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Generator: Adobe Illustrator 9.0, SVG Export Plug-In  -->
-<!DOCTYPE svg [
-	<!ENTITY st0 "fill:#000000;stroke:#FFFFFF;stroke-width:7.9139;stroke-linejoin:round;">
-	<!ENTITY st1 "fill-rule:nonzero;clip-rule:nonzero;fill:#FFFFFF;stroke:#000000;stroke-miterlimit:4;">
-	<!ENTITY st2 "fill:none;stroke:none;">
-	<!ENTITY st3 "fill:#000000;">
-	<!ENTITY st4 "fill-rule:evenodd;clip-rule:evenodd;stroke:none;">
-	<!ENTITY st5 "fill-rule:nonzero;clip-rule:nonzero;stroke:#000000;stroke-miterlimit:4;">
-]>
-<svg  width="48pt" height="48pt" viewBox="0 0 48 48" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
-	<g id="Layer_x0020_4" style="&st1;">
-		<g style="&st4;">
-			<path style="&st0;" d="M16.4,42.3L5.7,31.6V16.4L16.4,5.7h15.2l10.7,10.7v15.2L31.6,42.3H16.4z"/>
-			<path style="&st3;" d="M16.4,42.3L5.7,31.6V16.4L16.4,5.7h15.2l10.7,10.7v15.2L31.6,42.3H16.4z"/>
-			<path d="M11.7,17.7l18.7,18.7l5.9-5.9L17.6,11.7l-5.9,5.9z"/>
-			<path d="M11.7,30.5l5.9,5.9l18.7-18.7l-5.9-5.9L11.7,30.5z"/>
-		</g>
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48pt"
+   height="48pt"
+   viewBox="0 0 48 48"
+   xml:space="preserve"
+   id="svg4741"
+   version="1.1"
+   inkscape:version="0.48.0 r9654"
+   sodipodi:docname="warning.svg"><metadata
+   id="metadata4761"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs4759">
+		
+	
+			
+			
+			
+			
+		</defs><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1159"
+   inkscape:window-height="739"
+   id="namedview4757"
+   showgrid="false"
+   inkscape:zoom="8.9066239"
+   inkscape:cx="30"
+   inkscape:cy="30"
+   inkscape:window-x="122"
+   inkscape:window-y="62"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="svg4741" />
+	<path
+   style="fill:#000000;fill-rule:evenodd;stroke:#ffffff;stroke-width:7.9138999;stroke-linejoin:round"
+   d="M 16.4,42.3 5.7,31.6 V 16.4 L 16.4,5.7 H 31.6 L 42.3,16.4 V 31.6 L 31.6,42.3 H 16.4 z"
+   id="path4746"
+   inkscape:connector-curvature="0" /><path
+   style="fill:#c40022;fill-rule:evenodd;stroke:none;fill-opacity:1"
+   d="M 16.4,42.3 5.7,31.6 V 16.4 L 16.4,5.7 H 31.6 L 42.3,16.4 V 31.6 L 31.6,42.3 H 16.4 z"
+   id="path4748"
+   inkscape:connector-curvature="0" /><path
+   style="fill:#ffffff;fill-rule:evenodd;stroke:none"
+   d="M 11.7,17.7 30.4,36.4 36.3,30.5 17.6,11.7 11.7,17.6 z"
+   id="path4750"
+   inkscape:connector-curvature="0" /><path
+   style="fill:#ffffff;fill-rule:evenodd;stroke:none"
+   d="M 11.7,30.5 17.6,36.4 36.3,17.7 30.4,11.8 11.7,30.5 z"
+   id="path4752"
+   inkscape:connector-curvature="0" />
+	<g
+   id="crop_x0020_marks"
+   style="fill-rule:nonzero;clip-rule:nonzero;stroke:#000000;stroke-miterlimit:4;">
+		<path
+   style="fill:none;stroke:none;"
+   d="M48,48H0V0h48v48z"
+   id="path4755" />
 	</g>
-	<g id="crop_x0020_marks" style="&st5;">
-		<path style="&st2;" d="M48,48H0V0h48v48z"/>
-	</g>
-</svg>
+</svg>
\ No newline at end of file