4 files changed, 45 insertions, 34 deletions
diff --git a/views/default/css.php b/views/default/css.php
index e0be90b2b..4e38aadc0 100644
--- a/views/default/css.php
+++ b/views/default/css.php
@@ -931,16 +931,34 @@ li.navigation_more ul li {
 	list-style: none;
 }
 .widget_title li {
-	margin: 0 4px;
+	margin: 5px 2px;
+}
+.widget_title li a {
+	display: block;
+	width: 18px;
+	height: 18px;
+	border: 1px solid transparent;
+}
+.widget_title li a:hover {
+	border: 1px solid #cccccc;
+}
+a.widget_edit_button {
+	background:transparent url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png) no-repeat -300px -1px;
+}
+a.widget_delete_button {
+	background:transparent url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png) no-repeat -198px 3px;
+}
+.widget_container {
+	background-color: white;
+	width: 100%;
 }
 .widget_edit {
 	display: none;
-	margin-bottom:2px;
-	padding: 8px;
-	background-color: white;
+	width: 96%;
+	padding: 2%;
+	border-bottom: 2px solid #dedede;
 }
 .widget_content {
-	background-color: #ffffff;
 	padding: 10px;
 }
 .drag_handle {
@@ -1754,6 +1772,8 @@ p.elgg_likes_owner {
 *************************************** */
 #dashboard_info {
 	float: left;
-	width: 66%;
-	margin-bottom: 15px;
+	width: 625px;
+	margin: 0 5px 15px;
+	padding: 5px;
+	border: 2px solid #dedede;
 }
 \ No newline at end of file
diff --git a/views/default/dashboard/blurb.php b/views/default/dashboard/blurb.php
index 40b5b70a4..9450d2676 100644
--- a/views/default/dashboard/blurb.php
+++ b/views/default/dashboard/blurb.php
@@ -1,22 +1,12 @@
 <?php
 /**
- * Elgg comments add form
+ * Elgg dashboard blurb
  *
- * @package Elgg
- *
- * @uses $vars['entity']
  */
 ?>
 
 <div id="dashboard_info">
-<p>
-<?php
-
-	echo elgg_echo("dashboard:nowidgets");
-
-?>
-</p>
-<p>
-	<a href="<?php echo elgg_get_site_url(); ?>pages/dashboard/latest.php"><?php echo elgg_echo('content:latest:blurb'); ?></a>
-</p>
+	<p>
+		<?php echo elgg_echo("dashboard:nowidgets"); ?>
+	</p>
 </div>
 \ No newline at end of file
diff --git a/views/default/widgets/controls.php b/views/default/widgets/controls.php
index 891a53595..4336a3506 100644
--- a/views/default/widgets/controls.php
+++ b/views/default/widgets/controls.php
@@ -9,7 +9,8 @@
 $widget = $vars['widget'];
 
 $params = array(
-	'text' => 'delete',
+	'text' => ' ',
+	'title' => elgg_echo('widget:delete', array($widget->getTitle())),
 	'href' => elgg_get_site_url() . "action/widgets/delete?guid=$widget->guid",
 	'is_action' => true,
 	'class' => 'widget_delete_button',
@@ -18,7 +19,8 @@ $params = array(
 $delete_link = elgg_view('output/url', $params);
 
 $params = array(
-	'text' => 'edit',
+	'text' => ' ',
+	'title' => elgg_echo('widget:edit'),
 	'href' => "#",
 	'class' => 'widget_edit_button',
 	'internalid' => "widget_edit_button_$widget->guid"
diff --git a/views/default/widgets/wrapper.php b/views/default/widgets/wrapper.php
index a8651e666..8d589aabd 100644
--- a/views/default/widgets/wrapper.php
+++ b/views/default/widgets/wrapper.php
@@ -16,10 +16,7 @@ $widgettypes = elgg_get_widget_types('all');
 
 $handler = $widget->handler;
 
-$title = $widget->title;
-if (!$title) {
-	$title = $widgettypes[$handler]->name;
-}
+$title = $widget->getTitle();
 
 $can_edit = $widget->canEdit();
 
@@ -36,12 +33,14 @@ $widget_instance = "widget_instance_$handler";
 		}
 		?>
 	</div>
-	<?php
-	if ($can_edit) {
-		echo elgg_view('widgets/settings', array('widget' => $widget));
-	}
-	?>
-	<div class="widget_content">
-		<?php echo elgg_view("widgets/$handler/view", $vars); ?>
+	<div class="widget_container">
+		<?php
+		if ($can_edit) {
+			echo elgg_view('widgets/settings', array('widget' => $widget));
+		}
+		?>
+		<div class="widget_content">
+			<?php echo elgg_view("widgets/$handler/view", $vars); ?>
+		</div>
 	</div>
 </div>