diff --git a/templates/default/css/messagebox.css b/templates/default/css/messagebox.css
new file mode 100644
index 0000000..7a08138
--- /dev/null
+++ b/templates/default/css/messagebox.css
@@ -0,0 +1,16 @@
+.messagebox .mcore .msummary  {
+    padding: 0;
+    border: none;
+    text-align: center;
+    font-weight: bold;
+}
+
+.messagebox .mcore .mtext  {
+    padding: 0;
+    margin-top: 0.5em;
+    border: none;
+}
+
+.messagebox .mbcontent img {
+    padding-right: 0.25rem;
+}
\ No newline at end of file
diff --git a/templates/default/messagebox/box.tem b/templates/default/messagebox/box.tem
index 9a7b7d3..7ab1af9 100755
--- a/templates/default/messagebox/box.tem
+++ b/templates/default/messagebox/box.tem
@@ -1,15 +1,16 @@
             <div class="small-8 small-centered columns">
                 <!-- Start messagebox core -->
-                <div class="messagebox callout %(boxclass)s">
-                    <h2>%(title)s</h2>
-                    <div class="mbcontent">
+                <div class="messagebox callout %(class)s">
+                    <h4>%(title)s</h4>
+                    <div class="mbcontent clearfix">
+                        <img src="{V_[templatepath]}/images/%(icon)s.png" width="48" class="float-left" />
                         <div class="mcore">
                             <div class="msummary">%(summary)s</div>
-                            <div class="mtext">%(longdesc)s</div>
+                            <div class="mtext">%(message)s</div>
                         </div>
 %(additional)s
-%(buttons)s
                     </div>
+%(buttons)s
                 </div>
                 <!-- End messagebox core -->
             </div>
diff --git a/templates/default/messagebox/button.tem b/templates/default/messagebox/button.tem
index 7410480..7129651 100755
--- a/templates/default/messagebox/button.tem
+++ b/templates/default/messagebox/button.tem
@@ -1 +1 @@
-<button class="button %(colour)s" onclick="%(onclick)s">%(message)s</div>
+<a class="button %(colour)s" href="%(href)s">%(message)s</a>
\ No newline at end of file
diff --git a/templates/default/messagebox/buttonbar.tem b/templates/default/messagebox/buttonbar.tem
index 5a16ca3..e5dfb92 100755
--- a/templates/default/messagebox/buttonbar.tem
+++ b/templates/default/messagebox/buttonbar.tem
@@ -1 +1 @@
-                        <div class="buttonbox">%(buttons)s</div>
+                        <div class="button-group text-right nomargin">%(buttons)s</div>
\ No newline at end of file
diff --git a/templates/default/page.tem b/templates/default/page.tem
index 9cee8cc..8fc974b 100755
--- a/templates/default/page.tem
+++ b/templates/default/page.tem
@@ -9,6 +9,7 @@
         <link rel="stylesheet" href="{V_[templatepath]}3rdparty/fontawesome/css/font-awesome.min.css" />
 
         <link rel="stylesheet" href="{V_[csspath]}notebox.css" />
+        <link rel="stylesheet" href="{V_[csspath]}messagebox.css" />
         <link rel="stylesheet" href="{V_[csspath]}foundation.mods.css" />
 %(extrahead)s
     </head>