diff --git a/themes/seven/jquery.ui.theme.css b/themes/seven/jquery.ui.theme.css
index 88e6dd1..0221be2 100644
--- a/themes/seven/jquery.ui.theme.css
+++ b/themes/seven/jquery.ui.theme.css
@@ -79,14 +79,36 @@
   background-image: url(images/ui-icons-454545-256x240.png);
 }
 .ui-state-highlight .ui-icon {
-  background-image: url(images/ui-icons-800000-256x240.png);
+  background-image:url("../../misc/message-24-warning.png");
+  background-position: 0 0;
+  width: 24px;
+  height: 24px;
 }
 .ui-state-error .ui-icon,
 .ui-state-error-text .ui-icon {
-  background-image: url(images/ui-icons-ffffff-256x240.png);
+  background-image: url(../../misc/message-24-error.png);
+  background-position: 0 0;
+  width: 24px;
+  height: 24px;
+  padding-right: 18px;
 }
-.ui-widget p .ui-icon {
-  margin: 2px 3px 0 0;
+
+/* Use core message styles (with some tweaks to reflect the different markup) */
+.ui-state-highlight, 
+.ui-state-error  {
+  border: 1px solid;
+  padding: 0 8px; /* LTR */
+}
+.ui-state-error { 
+  border-color: #ed541d;
+  color: #8c2e0b;
+  background-color: #fef5f1;
+  color: #333;
+}
+.ui-state-highlight {
+  border-color: #ed5;
+  color: #840;
+  background-color: #fffce5;
 }
 
 /* positioning */
@@ -268,61 +290,69 @@
  * Accordion
  */
 .ui-accordion {
-  border: none;
+ border:1px solid #ccc;
 }
 .ui-accordion .ui-accordion-header {
-  border: solid 1px #ccc;
-  text-transform: uppercase;
+ text-transform: uppercase;
+ background-color: #f7f7f7;
 }
 .ui-accordion h3.ui-accordion-header,
 #block-system-main h3.ui-accordion-header {
-  font-size: 1.1em;
-  margin: 10px 0;
+ font-size: 1.1em;
+ margin: 0;
 }
 #block-system-main .ui-accordion h3.ui-state-active,
 .ui-accordion h3.ui-state-active {
-  margin-bottom: 0;
+ margin-bottom: 0;
 }
 .ui-accordion .ui-accordion-header a {
-  display: block;
+ display: block;
 }
-.ui-accordion .ui-accordion-content {
-  padding: 1em 2.2em;
-  border: solid 1px #ccc;
-  border-top: 0;
+.ui-accordion .ui-accordion-header.ui-state-active a {
+ background-color: #ddd;    
 }
+.ui-accordion .ui-accordion-content {
+ padding: 1em 2.2em;
+ border: none;
+ background-color: #fff;
+} 
 
 /**
  * Tabs
  */
 .ui-tabs {
-  padding: 0;
+ padding: 0;
 }
 .ui-tabs .ui-tabs-nav {
-  padding: 5px 10px 4px;
-  margin: 0;
-  line-height: 20px;
-  border-bottom: solid 1px #ccc;
-  -moz-border-radius-bottomleft: 0;
-  -webkit-border-bottom-left-radius: 0;
-  -moz-border-radius-bottomright: 0;
-  -webkit-border-bottom-right-radius: 0;
+ padding: 5px 10px 4px;
+ margin: 0;
+ line-height: 20px;
+ border-bottom: solid 1px #ccc;
+ background-color: #f7f7f7;
+ -moz-border-radius-bottomleft: 0;
+ -webkit-border-bottom-left-radius: 0;
+ -moz-border-radius-bottomright: 0;
+ -webkit-border-bottom-right-radius: 0;
 }
 .ui-tabs .ui-tabs-nav li {
-  padding: 0 1em 0 10px;
-  margin: 0;
-  list-style: none;
+ padding: 0 1em 0 10px;
+ margin: 0;
+ list-style: none;
 }
 .ui-tabs .ui-tabs-nav li a {
-  float: none;
-  padding: 0 10px;
-  -moz-border-radius: 10px;
-  -webkit-border-radius: 7px;  
+ float: none;
+ padding: 0 10px;
+ -moz-border-radius: 10px;
+ -webkit-border-radius: 7px;  
+}
+.ui-tabs .ui-tabs-nav li a:hover {
+ text-decoration:underline;
 }
 .ui-tabs .ui-tabs-nav li.ui-tabs-selected a {
-  color: #fff;
-  background: #666;
-  font-weight: normal;
+ color: #fff;
+ background: #666;
+ font-weight: normal;
+ text-decoration:none;
 }
 
 /**
@@ -351,7 +381,7 @@
 }
 .ui-dialog .ui-dialog-buttonpane button {
   cursor: pointer;
-  padding: 4px 17px;
+  padding: 4px 5px;
   color: #5a5a5a;
   text-align: center;
   font-family: "Lucida Grande", Verdana, sans-serif;
@@ -383,26 +413,26 @@
  * Slider
  */
 .ui-slider {
-  border: solid 1px #ccc;
+ border: solid 1px #ccc;
 }
 .ui-slider .ui-slider-range {
-  background: #e4e4e4;
+ background: #e4e4e4;
 }
 .ui-slider .ui-slider-handle {
-  border: 1px solid #e4e4e4;
-  border-bottom: 1px solid #b4b4b4;
-  border-left-color: #D2D2D2;
-  border-right-color: #D2D2D2;
-  background: url(images/buttons.png) 0 0 repeat-x;
-  border-radius: 4px;
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
+ border: 1px solid #e4e4e4;
+ border-bottom: 1px solid #b4b4b4;
+ border-left-color: #D2D2D2;
+ border-right-color: #D2D2D2;
+ background: url(images/buttons.png) 0 0 repeat-x;
+ border-radius: 4px;
+ -webkit-border-radius: 4px;
+ -moz-border-radius: 4px;
 }
 .ui-slider a.ui-state-active,
 .ui-slider .ui-slider-handle:active {
-  background: #666;
-  color: #fff;
-  border: solid 1px #555;
+ background: #bbb;
+ color: #fff;
+ border: solid 1px #ddd;
 }
 
 /**
@@ -430,4 +460,4 @@
   background: #E4E4E4;
   border-color: #D2D2D2;
   color: #000;
-}
+}
\ No newline at end of file