6 files changed, 76 insertions, 56 deletions
diff --git a/views/default/admin/appearance/profile_fields/list.php b/views/default/admin/appearance/profile_fields/list.php
index 493129583..16e34ffab 100644
--- a/views/default/admin/appearance/profile_fields/list.php
+++ b/views/default/admin/appearance/profile_fields/list.php
@@ -42,7 +42,7 @@ foreach ($items as $item) {
 	$type = elgg_echo($item->type);
 	echo <<<HTML
 <li id="$item->shortname" class="clearfix">
-	<span class="elgg-icon elgg-icon-dragger elgg-state-draggable"></span>
+	<span class="elgg-icon elgg-icon-drag-arrow elgg-state-draggable"></span>
 	<b><span id="elgg-profile-field-{$item->shortname}" class="elgg-state-editable">$item->translation</span></b> [$type] $url
 </li>
 HTML;
diff --git a/views/default/css/elements/chrome.php b/views/default/css/elements/chrome.php
index ab142707d..42fe910a5 100644
--- a/views/default/css/elements/chrome.php
+++ b/views/default/css/elements/chrome.php
@@ -87,6 +87,10 @@ h2 {
 	background-color: white;
 }
 
+.elgg-transition:hover {
+	opacity: .7;
+}
+
 .elgg-comments {
 	margin-top: 25px;
 }
@@ -100,6 +104,9 @@ h2 {
 .elgg-border-plain {
 	border: 1px solid #eeeeee;
 }
+.elgg-border-transition {
+	border: 1px solid #eeeeee;
+}
 .elgg-divide-top {
 	border-top: 1px solid #CCCCCC;
 }
diff --git a/views/default/css/elements/icons.php b/views/default/css/elements/icons.php
index 758de5756..bae905b40 100644
--- a/views/default/css/elements/icons.php
+++ b/views/default/css/elements/icons.php
@@ -28,88 +28,88 @@
 .elgg-icon-cursor-drag-arrow {
 	background-position: 0 -36px;
 }
-.elgg-icon-delete:hover {
+.elgg-icon-delete-alt:hover {
 	background-position: 0 -54px;
 }
-.elgg-icon-delete {
+.elgg-icon-delete-alt {
 	background-position: 0 -72px;
 }
-.elgg-icon-download {
+.elgg-icon-delete:hover {
 	background-position: 0 -90px;
 }
-.elgg-icon-facebook {
+.elgg-icon-delete {
 	background-position: 0 -108px;
 }
-.elgg-icon-home {
+.elgg-icon-download {
 	background-position: 0 -126px;
 }
-.elgg-icon-mail-empty {
+.elgg-icon-facebook {
 	background-position: 0 -144px;
 }
-.elgg-icon-mail-full {
+.elgg-icon-home {
 	background-position: 0 -162px;
 }
-.elgg-icon-print {
+.elgg-icon-mail-empty {
 	background-position: 0 -180px;
 }
-.elgg-icon-push-pin {
+.elgg-icon-mail-full {
 	background-position: 0 -198px;
 }
-.elgg-icon-redo {
+.elgg-icon-print {
 	background-position: 0 -216px;
 }
-.elgg-icon-refresh {
+.elgg-icon-push-pin {
 	background-position: 0 -234px;
 }
-.elgg-icon-round-arrow-left {
+.elgg-icon-redo {
 	background-position: 0 -252px;
 }
-.elgg-icon-round-arrow-right {
+.elgg-icon-refresh {
 	background-position: 0 -270px;
 }
-.elgg-icon-round-checkmark {
+.elgg-icon-round-arrow-left {
 	background-position: 0 -288px;
 }
-.elgg-icon-round-delete {
+.elgg-icon-round-arrow-right {
 	background-position: 0 -306px;
 }
-.elgg-icon-round-minus {
+.elgg-icon-round-checkmark {
 	background-position: 0 -324px;
 }
-.elgg-icon-round-plus {
+.elgg-icon-round-minus {
 	background-position: 0 -342px;
 }
-.elgg-icon-rss {
+.elgg-icon-round-plus {
 	background-position: 0 -360px;
 }
-.elgg-icon-search {
+.elgg-icon-rss {
 	background-position: 0 -378px;
 }
-.elgg-icon-settings-alt {
+.elgg-icon-search {
 	background-position: 0 -396px;
 }
-.elgg-icon-settings {
+.elgg-icon-settings-alt:hover {
 	background-position: 0 -414px;
 }
-.elgg-icon-shop-cart {
+.elgg-icon-settings-alt {
 	background-position: 0 -432px;
 }
-.elgg-icon-spechbubble-alt {
+.elgg-icon-settings {
 	background-position: 0 -450px;
 }
-.elgg-icon-spechbubble {
+.elgg-icon-shop-cart {
 	background-position: 0 -468px;
 }
-.elgg-icon-sq-down {
+.elgg-icon-speech-bubble-alt:hover {
 	background-position: 0 -486px;
 }
-.elgg-icon-sq-next {
+.elgg-icon-speech-bubble-alt {
 	background-position: 0 -504px;
 }
-.elgg-icon-sq-prev {
+.elgg-icon-speech-bubble:hover {
 	background-position: 0 -522px;
 }
-.elgg-icon-sq-up {
+.elgg-icon-speech-bubble {
 	background-position: 0 -540px;
 }
 .elgg-icon-star-fav-empty {
@@ -121,37 +121,46 @@
 .elgg-icon-tag {
 	background-position: 0 -594px;
 }
-.elgg-icon-thumbs-down {
+.elgg-icon-thumbs-down-alt:hover {
 	background-position: 0 -612px;
 }
-.elgg-icon-thumbs-up-alt,
-.elgg-icon-thumbs-up:hover {
+.elgg-icon-thumbs-down-alt {
 	background-position: 0 -630px;
 }
-.elgg-icon-thumbs-up-alt:hover {
+.elgg-icon-thumbs-down {
 	background-position: 0 -648px;
 }
-.elgg-icon-thumbs-up {
+.elgg-icon-thumbs-up-alt:hover {
 	background-position: 0 -666px;
 }
-.elgg-icon-trash {
+.elgg-icon-thumbs-up-alt,
+.elgg-icon-thumbs-up:hover {
 	background-position: 0 -684px;
 }
-.elgg-icon-twitter {
+.elgg-icon-thumbs-up {
 	background-position: 0 -702px;
 }
-.elgg-icon-undo {
+.elgg-icon-trash {
 	background-position: 0 -720px;
 }
-.elgg-icon-user {
+.elgg-icon-twitter {
 	background-position: 0 -738px;
 }
-.elgg-icon-users:hover {
+.elgg-icon-undo {
 	background-position: 0 -756px;
 }
-.elgg-icon-users {
+.elgg-icon-user:hover {
 	background-position: 0 -774px;
 }
+.elgg-icon-user {
+	background-position: 0 -792px;
+}
+.elgg-icon-users:hover {
+	background-position: 0 -810px;
+}
+.elgg-icon-users {
+	background-position: 0 -828px;
+}
 
 .elgg-avatar > .elgg-icon-hover-menu {
 	display: none;
diff --git a/views/default/css/elements/modules.php b/views/default/css/elements/modules.php
index bc30548b6..a5b907ddc 100644
--- a/views/default/css/elements/modules.php
+++ b/views/default/css/elements/modules.php
@@ -145,34 +145,40 @@
 	background-color: #ccc;
 }
 .elgg-module-widget > .elgg-head {
-	background-color: #dedede;
-	height: 30px;
-	line-height: 30px;
+	background-color: #eeeeee;
+	height: 26px;
 	overflow: hidden;
 }
 .elgg-module-widget > .elgg-head h3 {
 	float: left;
-	padding: 0 45px 0 20px;
-	color: #333;
+	padding: 4px 45px 0 20px;
+	color: #666;
 }
 .elgg-module-widget.elgg-state-draggable > .elgg-head {
 	cursor: move;
 }
 .elgg-module-widget > .elgg-head a {
 	position: absolute;
-	top: 5px;
+	top: 4px;
 	display: inline-block;
 	width: 18px;
 	height: 18px;
 	padding: 2px 2px 0 0;
-	border: 1px solid transparent;
 }
 a.elgg-widget-collapse-button {
 	left: 5px;
-	background:transparent url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png) no-repeat 0px -385px;
+	color: #c5c5c5;
+}
+a.elgg-widget-collapse-button:hover,
+a.elgg-widget-collapsed:hover {
+	color: #9d9d9d;
+	text-decoration: none;
 }
-a.elgg-widget-collapsed {
-	background-position: 0px -365px;
+a.elgg-widget-collapse-button:before {
+	content: "\25BC";
+}
+a.elgg-widget-collapsed:before {
+	content: "\25BA";
 }
 a.elgg-widget-delete-button {
 	right: 5px;
@@ -180,13 +186,11 @@ a.elgg-widget-delete-button {
 a.elgg-widget-edit-button {
 	right: 25px;
 }
-a.elgg-widget-edit-button:hover, a.elgg-widget-delete-button:hover {
-	border: 1px solid #ccc;
-}
 .elgg-module-widget > .elgg-body {
 	background-color: white;
 	width: 100%;
 	overflow: hidden;
+	border-top: 2px solid #dedede;
 }
 .elgg-widget-edit {
 	display: none;
diff --git a/views/default/css/elements/navigation.php b/views/default/css/elements/navigation.php
index e7c00b775..a3bd0bca8 100644
--- a/views/default/css/elements/navigation.php
+++ b/views/default/css/elements/navigation.php
@@ -167,7 +167,7 @@
 .elgg-menu-topbar > li > a {
 	padding: 2px 15px;
 	color: #eee;
-	margin-top: 2px;
+	margin-top: 1px;
 }
 
 .elgg-menu-topbar > li > a > span {
diff --git a/views/default/object/widget/elements/controls.php b/views/default/object/widget/elements/controls.php
index a421d4d41..83a2f5767 100644
--- a/views/default/object/widget/elements/controls.php
+++ b/views/default/object/widget/elements/controls.php
@@ -19,7 +19,7 @@ $collapse_link = elgg_view('output/url', $params);
 $delete_link = $edit_link = '';
 if ($widget->canEdit()) {
 	$params = array(
-		'text' => elgg_view_icon('delete'),
+		'text' => elgg_view_icon('delete-alt'),
 		'title' => elgg_echo('widget:delete', array($widget->getTitle())),
 		'href' => "action/widgets/delete?guid=$widget->guid",
 		'is_action' => true,
@@ -30,7 +30,7 @@ if ($widget->canEdit()) {
 
 	if ($show_edit) {
 		$params = array(
-			'text' => elgg_view_icon('gear'),
+			'text' => elgg_view_icon('settings-alt'),
 			'title' => elgg_echo('widget:edit'),
 			'href' => "#widget-edit-$widget->guid",
 			'class' => "elgg-toggler elgg-widget-edit-button",