Index: skins/albatross/src/main/resources/albatross/presentation.css
===================================================================
--- skins/albatross/src/main/resources/albatross/presentation.css	(revision 19522)
+++ skins/albatross/src/main/resources/albatross/presentation.css	(working copy)
@@ -146,18 +146,20 @@
   padding: 4px;
 }
 
-.xwikilogintable{
+.xwikilogintable, .xwikiBoxTable{
   margin: auto;
 }
-.xwikilogintable th{
-  text-align: right;
+.xwikilogintable th, .xwikiBoxTable th{
+  text-align: left;
   background-color: transparent;
 }
-.xwikilogintable td{
+.xwikilogintable td, .xwikiBoxTable td{
   text-align: left;
 }
+table.xwikiBoxTable input.inputTextPassword{
+	width: 98%;
+}
 
-
 .xwikitabbar li.active{
   border: 1px solid;
   border-bottom: 3px solid;
Index: skins/albatross/src/main/resources/albatross/screenlayout.css
===================================================================
--- skins/albatross/src/main/resources/albatross/screenlayout.css	(revision 19522)
+++ skins/albatross/src/main/resources/albatross/screenlayout.css	(working copy)
@@ -266,30 +266,56 @@
 "Message Boxes"
 ---------------------------------------------
 */
-fieldset.xwikimessage{
+fieldset.xwikimessage, div.xwikiBox{
   display: block;
   float: none;
   width: 480px;
   margin: auto;
-  border: 2px solid #BBB;
-  border-top: 8px solid #BBB;
+  border: 2px solid #658BB2;
+  border-top: 8px solid #658BB2;
   padding: 0px 8px 16px;
+  background-color:#F5F5F5;
 }
 html > body fieldset.xwikimessage{
   padding-top: 8px;
 }
-
-fieldset.xwikimessage legend {
+.xwikiBoxTitle{
+    display: block;
+    text-align: left;
+    padding: 0px;
+}
+fieldset.xwikimessage legend, .xwikiBoxTitle span  {
   font-weight: bold;
   font-size: 110%;
   padding: 2px 8px;
   margin: 0px;
 }
-fieldset.xwikimessage .xwikimessage{
+.xwikiBoxTitle span {
+	position: absolute;
+	margin:-13px 0px 0px 0px;
+	display: inline;
+	background-color:#658BB2;
+	color:#FFFFFF;
+}
+.xwikiBoxContainer{
+	margin-top: 30px;
+}
+.xwikiBoxContainer div{
+	margin-bottom: 10px;
+}
+fieldset.xwikimessage .xwikimessage, .xwikiBoxMessage{
   text-align: center;
   font-weight: bold;
   font-size: 110%;
 }
+html>body .xwikiBoxMessage{
+	margin:1em 0;
+	display:block;
+}
+.xwikiBoxMessage ul {
+	font-weight: normal;
+	font-size:90.01%;
+}
 fieldset.xwikimessage .buttons {
   text-align: center;
 }
Index: skins/toucan/src/main/resources/toucan/toucan.css
===================================================================
--- skins/toucan/src/main/resources/toucan/toucan.css	(revision 19522)
+++ skins/toucan/src/main/resources/toucan/toucan.css	(working copy)
@@ -1324,11 +1324,6 @@
 /* @end */
 /* @group Message Boxes */
 
-#loginForm div.centered fieldset.xwikimessage table.xwikilogintable tbody tr th,
-    #loginForm div.centered fieldset.xwikimessage table.xwikilogintable tbody tr td {
-    border: none;
-}
-
 /*
 ---------------------------------------------
 "Message Boxes"
@@ -1343,56 +1338,152 @@
     margin-right: 220px;
 }
 
-fieldset.xwikimessage, div.xwikimessage {
-    display: block;
+div.xwikiBox{
+    display: inline-table;
     float: none;
-    width: 400px;
     margin: 65px auto 0;
-    border: none;
-    border-top: 4em solid #efffd4;
-    border-bottom: 65px solid #FFF;
-    padding: 0 8px 16px;
     background-color: #efffd4;
-    text-align: center;
+	background:#ebebeb url(../../resources/icons/xwiki/smallGreyBg.png) repeat-x scroll 0 0;
+	border: 1px solid #DDDDDD;
+	padding:0;
+	width: 400px;
 }
-
-fieldset.xwikimessage legend,
-    div.xwikimessage h3 {
+.xwikiBoxTitle{
+	background-color:transparent;
     display: block;
-    width: 100%;
-    text-align: center;
+    text-align: left;
     font: bold 1.4em sans-serif;
     letter-spacing: 0.4em;
-    color: #508000;
-    padding: 0;
-    margin: 0;
+    color: #888888;
+    padding: 0px;
 }
-
-div.errormessage {
-    color: red;
+.xwikiBoxTitle span {
+	background-color: #fff;
+	position: absolute;
+	margin:-13px 40px 0px 40px;
+	display: inline;
 }
-
-fieldset.xwikimessage .xwikimessage {
-    text-align: center;
+.xwikiBoxContainer {
+	margin:30px 40px 20px;
+	padding:0;
+	text-align: left;
+	width:auto;
+}
+.xwikiBoxMessage{
+    text-align: left;
     font-weight: bold;
     font-size: 110%;
+	line-height:1.4em;
+	margin: 0;
+	color: #4D4D4D;
 }
-
-fieldset.xwikimessage .buttons {
-    text-align: center;
+html>body .xwikiBoxMessage{
+	margin:1em 0;
+	display:block;
 }
-
-fieldset.xwikimessage .buttons a {
-    text-decoration: none;
-    margin: 8px;
+.xwikiBoxText{
+	line-height:1.4em;
+	margin:1em 0;
+	color: #888888;
+	text-align:left;
 }
-
+div.xwikiBoxSecondaryText{
+	color: #888888;
+	font-size:0.9em;
+	line-height:2em;
+	vertical-align: middle;
+}
+.xwikiBoxDetails {
+	color: #888888;
+	text-align:left;
+}
+table.xwikiBoxTable {
+	margin: 0;
+}
+table.xwikiBoxTable th, table.xwikiBoxTable td{
+	background-color: transparent;
+	border: 0;
+	text-align: left;
+	padding: 0;
+	margin: 0;
+}
+table.xwikiBoxTable th label{
+	color: #888888;
+	font-size:0.9em;
+	line-height:2em;
+}
+table.xwikiBoxTable input[type="checkbox"], table.xwikiBoxTable .buttonwrapper {
+	margin-left: 0;
+	padding-left:0;
+	margin-right:3px;
+}
+table.xwikiBoxTable input.inputTextPassword{
+	border: 1px solid #888;
+	width: 99%;
+}
+table.xwikiBoxSecondaryTable{
+	border-color: transparent;
+	border-style: none;
+	background-color: transparent;
+	text-align: left;
+	width: 100%;
+	margin-top: 5px;
+}
+table.xwikiBoxSecondaryTable thead th{
+	background-color: transparent;
+	color: #4D4D4D;
+	border: 0px;
+	border-bottom: 1px solid #DDDDDD;
+	font-size:100%;
+	text-align: left;
+	padding-left: 2px;
+	white-space:nowrap;
+}
+table.xwikiBoxSecondaryTable td, table.xwikiBoxSecondaryTable tr{
+	border: 0px;
+	padding-left: 2px;
+}
+.xwikiBoxMessage ul {
+	margin-left: 0;
+}
+.xwikiBoxMessage li{
+	font-weight: normal;
+	font-size:90%;
+}
+.xwikiBoxContainer span.buttonwrapper{ /* Primary Button*/
+	margin-left: 0px;
+}
 .button {
     font-family: Helvetica, sans-serif;
     font-weight: bold;
     text-align: center;
 }
-
+.primaryButton{
+	background:transparent url(images/buttons3.png) repeat-x scroll right top;
+	border:1px solid #8F908E;
+	color:#FFFFFF;
+	display:inline;
+	line-height:1.35em !important;
+	margin:0 !important;
+	min-height:24px !important;
+	white-space:nowrap;
+}
+.primaryButton:hover {
+	background:transparent url(images/buttons3.png) repeat-x scroll right 25%;
+	border-color:#94AD12;
+	color:#333333;
+}
+.secondaryButton{
+	background-color:transparent;
+	color:#00007E;
+	padding: 0;
+	border: 0;
+	margin-left: 10px;
+	font-weight: normal;
+}
+.secondaryButton:hover {
+	border-bottom: 1px solid #00007E;
+}
 /* @end */
 /* @group Comments, attachments, History...  */
 /*
Index: web/standard/src/main/webapp/resources/icons/xwiki/smallGreyBg.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: web\standard\src\main\webapp\resources\icons\xwiki\smallGreyBg.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: web/standard/src/main/webapp/templates/docdoesnotexist.vm
===================================================================
--- web/standard/src/main/webapp/templates/docdoesnotexist.vm	(revision 19522)
+++ web/standard/src/main/webapp/templates/docdoesnotexist.vm	(working copy)
@@ -11,7 +11,7 @@
 #xwikimessageboxstart($msg.get("notice") $msg.get("thispagedoesnotexist"))
 #if($hasEdit)
 #set($url = $doc.getURL("edit", $editparams))
-$xwiki.parseMessage("youcanclicktoedit")
+<div class="xwikiBoxText">$xwiki.parseMessage("youcanclicktoedit")</div>
 #end
 #template("recyclebinlist.vm")
 #xwikimessageboxend()
Index: web/standard/src/main/webapp/templates/edit.vm
===================================================================
--- web/standard/src/main/webapp/templates/edit.vm	(revision 19522)
+++ web/standard/src/main/webapp/templates/edit.vm	(working copy)
@@ -42,7 +42,7 @@
 #if (($tdoc.getLocked()==true)&&(!$force))
 <div class="layoutsection">
 #xwikimessageboxstart($msg.get("notice") "$msg.get('doclockedby') $xwiki.getLocalUserName($doc.getLockingUser())")
-<a href="$doc.getURL($context.action, "$!{request.getQueryString().replaceAll('&', '&amp;').replaceAll('&amp;amp;', '&amp;')}&amp;force=1")">$msg.get("forcelock")</a>
+<div class="xwikiBoxText"><a href="$doc.getURL($context.action, "$!{request.getQueryString().replaceAll('&', '&amp;').replaceAll('&amp;amp;', '&amp;')}&amp;force=1")">$msg.get("forcelock")</a></div>
 #xwikimessageboxend()
 </div>
 #else
Index: web/standard/src/main/webapp/templates/login.vm
===================================================================
--- web/standard/src/main/webapp/templates/login.vm	(revision 19522)
+++ web/standard/src/main/webapp/templates/login.vm	(working copy)
@@ -30,23 +30,63 @@
 <!-- previous login errors -->
 #error($message)
 #end
-<table class="xwikilogintable" summary="$msg.get("loginform")">
-<tr><th><label for="j_username">$msg.get("username"):</label></th>
-<td><input type="text" id="j_username" name="j_username" value=""/></td></tr>
-<tr><th><label for="j_password">$msg.get("password"):</label></th>
-<td><input type="password" id="j_password" name="j_password" value=""/></td></tr>
+<table class="xwikiBoxTable" summary="$msg.get("loginform")">
+<tr>
+	<th>
+		<label for="j_username">$msg.get("username")</label>
+	</th>
+</tr>
+<tr>
+	<td>
+		<input class="inputTextPassword" type="text" id="j_username" name="j_username" value=""/>
+	</td>
+</tr>
+<tr>
+	<th>
+		<label for="j_password">$msg.get("password")</label>
+	</th>
+</tr>
+<tr>
+	<td>
+		<input class="inputTextPassword" type="password" id="j_password" name="j_password" value=""/>
+	</td>
+</tr>
 #if(0)
-<tr><td colspan="2" style="text-align: left;"><input id="remembermeno" type="radio" name="j_rememberme" value="false" checked="checked"/><label for="remembermeno">$msg.get("dontrememberme")</label></td></tr>
-<tr><td colspan="2" style="text-align: left;"><input id="remembermeyes" type="radio" name="j_rememberme" value="true"/><label for="remembermeyes">$msg.get("rememberme")</label></td></tr>
+<tr>
+	<td colspan="2"><input id="remembermeno" type="radio" name="j_rememberme" value="false" checked="checked"/>
+		<label for="remembermeno">$msg.get("dontrememberme")</label>
+	</td>
+</tr>
+<tr>
+	<td colspan="2">
+		<input id="remembermeyes" type="radio" name="j_rememberme" value="true"/>
+		<label for="remembermeyes">$msg.get("rememberme")</label>
+	</td>
+</tr>
 #else
-<tr><td colspan="2" style="text-align: left;"><input id="rememberme" type="checkbox" name="j_rememberme" value="true"/><label for="rememberme">$msg.get("remembermeonthiscomp")</label></td></tr>
+<tr>
+	<td>
+	<div class="xwikiBoxSecondaryText">
+		<input id="rememberme" type="checkbox" name="j_rememberme" value="true"/>
+		<label for="rememberme">$msg.get("remembermeonthiscomp")</label>
+	</div>
+	</td>
+</tr>
 #end
+<tr>
+	<td>
+		<input type="submit" class="button primaryButton" value="$msg.get("login")"/>
+	</td>
+</tr>
+<tr>
+	<td>
+	## TODO: Replace this with an interface extension once IX are implemented
+	#if($xwiki.exists("XWiki.ResetPassword"))
+	  <div class="xwikiBoxSecondaryText" style="margin-top:20px;">Forgot your <a href="$xwiki.getURL('XWiki.ForgotUsername')">username</a> or <a href="$xwiki.getURL('XWiki.ResetPassword')">password</a>?</div>
+	#end
+	</td>
+</tr>
 </table>
-<div class="buttons"><input type="submit" class="button" value="$msg.get("login")"/></div>
-## TODO: Replace this with an interface extension once IX are implemented
-#if($xwiki.exists("XWiki.ResetPassword"))
-  <div style="font-size: 70%; margin-top: 2em;">Forgot your <a href="$xwiki.getURL('XWiki.ForgotUsername')">username</a> or <a href="$xwiki.getURL('XWiki.ResetPassword')">password</a>?</div>
-#end
 #xwikimessageboxend()
 </form>
 </div>
Index: web/standard/src/main/webapp/templates/macros.vm
===================================================================
--- web/standard/src/main/webapp/templates/macros.vm	(revision 19522)
+++ web/standard/src/main/webapp/templates/macros.vm	(working copy)
@@ -1138,20 +1138,28 @@
 ###    Message box
 ###
 #macro(xwikimessageboxstart $title $message)
-    <div class="centered">
-    <fieldset class="xwikimessage">
-      <legend>$title</legend>
-      <p class="xwikimessage">$message</p>
+   <div class="centered">
+    <div class="xwikiBox">
+      <div class="xwikiBoxTitle"><span>$title</span></div>
+	  <div class="xwikiBoxContainer">
+      <span class="xwikiBoxMessage">$message</span>
 #end
 #macro(xwikimessageboxend)
-    </fieldset>
+	  </div>
     </div>
+    </div>
 #end
 
 #macro(xwikimessagebox $title $message $urlyes $urlno $msgyes $msgno)
 #xwikimessageboxstart($title $message)
-      <div class="buttons"><a href="$urlyes"><input type="button" class="button" value="$msgyes" onclick="location='$urlyes'; return false;"/></a><a href="$urlno"><input type="button" class="button" value="$msgno" onclick="location='$urlno'; return false;"/></a></div>
-#xwikimessageboxend()
+<div class="buttons">
+		<span href="$urlyes">
+			<input type="button" class="button primaryButton" value="$msgyes" onclick="location='$urlyes'; return false;"/>
+		</span>
+		<span href="$urlno">
+			<input type="button" class="button secondaryButton" value="$msgno" onclick="location='$urlno'; return false;"/>
+		</span>
+	</div>#xwikimessageboxend()
 #end
 
 #macro(xwikimessageboxfield $fielddoc $fieldname $fieldtext $html)
Index: web/standard/src/main/webapp/templates/recyclebinlist.vm
===================================================================
--- web/standard/src/main/webapp/templates/recyclebinlist.vm	(revision 19522)
+++ web/standard/src/main/webapp/templates/recyclebinlist.vm	(working copy)
@@ -1,9 +1,9 @@
 ### Show list of deleted documents
 #set($dds=$xwiki.getDeletedDocuments($tdoc.getFullName(), $tdoc.getLanguage()))
 #if($dds && ($dds.size() > 0))
-<div class="centered">
-<p>$msg.get("core.recyclebin.showlistmsg")</p>
-<table class="centered">
+<div class="xwikiBoxDetails">
+<div>$msg.get("core.recyclebin.showlistmsg")</div>
+<table class="centered xwikiBoxSecondaryTable">
  <thead>
   <tr>
    <th>$msg.get("core.recyclebin.deleter")</td>