diff --git a/include/menu.php b/include/menu.php
index e9049bf8e..2f1719d0b 100644
--- a/include/menu.php
+++ b/include/menu.php
@@ -38,7 +38,7 @@ function menu_render($menu, $edit = false) {
 
 	return replace_macros(get_markup_template('usermenu.tpl'),array(
 		'$menu' => $menu['menu'],
-		'$edit' => $edit,
+		'$edit' => (($edit) ? t("Edit") : ''),
 		'$items' => $menu['items']
 	));
 }
diff --git a/mod/bookmarks.php b/mod/bookmarks.php
index 67208937d..c5be68b8e 100644
--- a/mod/bookmarks.php
+++ b/mod/bookmarks.php
@@ -57,7 +57,7 @@ function bookmarks_content(&$a) {
 	if($x) {
 		foreach($x as $xx) {
 			$y = menu_fetch($xx['menu_name'],local_user(),get_observer_hash());
-			$o .= menu_render($y);
+			$o .= menu_render($y,true);
 		}
 	}
 
@@ -69,7 +69,7 @@ function bookmarks_content(&$a) {
 	if($x) {
 		foreach($x as $xx) {
 			$y = menu_fetch($xx['menu_name'],local_user(),get_observer_hash());
-			$o .= menu_render($y);
+			$o .= menu_render($y,true);
 		}
 	}
 
diff --git a/mod/openid.php b/mod/openid.php
index aae8b17d3..6f97c6fb9 100644
--- a/mod/openid.php
+++ b/mod/openid.php
@@ -6,7 +6,7 @@ require_once('include/auth.php');
 
 function openid_content(&$a) {
 
-	$noid = get_config('system','no_openid');
+	$noid = get_config('system','disable_openid');
 	if($noid)
 		goaway(z_root());
 
diff --git a/version.inc b/version.inc
index ee51fad76..4551fa398 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2014-02-17.591
+2014-02-18.592
diff --git a/view/css/mod_mitem.css b/view/css/mod_mitem.css
new file mode 100644
index 000000000..377d164fe
--- /dev/null
+++ b/view/css/mod_mitem.css
@@ -0,0 +1,7 @@
+.menu-item-list {
+	list-style-type: none;
+}
+
+.mitem-edit {
+	margin-right: 15px;
+}
\ No newline at end of file
diff --git a/view/tpl/mitemlist.tpl b/view/tpl/mitemlist.tpl
index 057665d49..421b610f1 100644
--- a/view/tpl/mitemlist.tpl
+++ b/view/tpl/mitemlist.tpl
@@ -4,12 +4,13 @@
 <a href="menu/{{$menu_id}}" title="{{$hintmenu}}">{{$edmenu}}</a><br />
 <a href="mitem/{{$menu_id}}/new" title="{{$hintnew}}">{{$hintnew}}</a>
 
+<br />
 <br />
 
 {{if $mlist }}
-<ul id="mitemlist">
+<ul id="mitemlist" class="menu-item-list">
 {{foreach $mlist as $m }}
-<li><a href="mitem/{{$menu_id}}/{{$m.mitem_id}}" title="{{$hintedit}}">{{$edit}}</a> | <a href="mitem/{{$menu_id}}/{{$m.mitem_id}}/drop" title={{$hintdrop}}>{{$drop}}</a>&nbsp;&nbsp;&nbsp;&nbsp;<a href="mitem/{{$menu_id}}/{{$m.mitem_id}}" title="{{$hintcontent}}">{{$m.mitem_desc}}</a> ({{$m.mitem_link}})</li>
+<li><a href="mitem/{{$menu_id}}/{{$m.mitem_id}}" title="{{$hintedit}}"><i class="icon-pencil mitem-edit"></i></a><a href="mitem/{{$menu_id}}/{{$m.mitem_id}}/drop" title={{$hintdrop}}><i class="icon-remove"></i></a>&nbsp;&nbsp;&nbsp;&nbsp;<a href="mitem/{{$menu_id}}/{{$m.mitem_id}}" title="{{$hintcontent}}">{{$m.mitem_desc}}</a> ({{$m.mitem_link}})</li>
 {{/foreach}}
 </ul>
 {{/if}}
diff --git a/view/tpl/usermenu.tpl b/view/tpl/usermenu.tpl
index 3904f4696..80e160fdf 100644
--- a/view/tpl/usermenu.tpl
+++ b/view/tpl/usermenu.tpl
@@ -2,6 +2,9 @@
 {{if $menu.menu_desc}}
   <h3 class="pmenu-title">{{$menu.menu_desc}}</h3>
 {{/if}}
+{{if $edit}}
+<a href="mitem/{{$menu.menu_id}}" title="{{$edit}}"><i class="icon-pencil fakelink" title="{{$edit}}"></i></a>
+{{/if}}
 {{if $items }}
 <ul class="pmenu-body">
 {{foreach $items as $mitem }}