diff --git a/boot.php b/boot.php
index d7c00428fd..9826b3d8df 100644
--- a/boot.php
+++ b/boot.php
@@ -857,6 +857,14 @@ function profile_sidebar($profile, $block = 0) {
 	if((remote_user()) && ($_SESSION['visitor_visiting'] == $profile['uid']))
 		$connect = False; 
 
+
+	// show edit to yourself
+	if ($profile['uid'] == local_user()) {
+		$profile['edit'] = array($a->get_baseurl(). 'profiles', t('Profiles'),"", t('Manage/edit profiles'));
+	}
+
+
+
 	
 	if((x($profile,'address') == 1) 
 		|| (x($profile,'locality') == 1) 
@@ -890,6 +898,7 @@ function profile_sidebar($profile, $block = 0) {
 		$contact_block = contact_block();
 	}
 
+
 	$tpl = get_markup_template('profile_vcard.tpl');
 
 	$o .= replace_macros($tpl, array(
diff --git a/view/contact_block.tpl b/view/contact_block.tpl
index 00b97a6d88..eb46c6c43c 100644
--- a/view/contact_block.tpl
+++ b/view/contact_block.tpl
@@ -1,9 +1,11 @@
-<h4 class="contact-h4">$contacts</h4>
+<div id="contact-block">
+<h4 class="contact-block-h4">$contacts</h4>
 {{ if $micropro }}
-	<div id="contact-block">
+		<a class="allcontact-link" href="viewcontacts/$nickname">$viewcontacts</a>
+		<div class='contact-block-content'>
 		{{ for $micropro as $m }}
 			$m
 		{{ endfor }}
-	</div>
-	<div id="viewcontacts"><a id="viewcontacts-link" href="viewcontacts/$nickname">$viewcontacts</a></div>
+		</div>
 {{ endif }}
+</div>
diff --git a/view/profile_vcard.tpl b/view/profile_vcard.tpl
index 88111b0f14..08e2e2e3a0 100644
--- a/view/profile_vcard.tpl
+++ b/view/profile_vcard.tpl
@@ -1,6 +1,10 @@
 <div class="vcard">
 
-	<div class="fn">$profile.name</div>
+	<div class="tool">
+		<div class="fn label">$profile.name</div>
+		{{ if $profile.edit }}<a class="icon s16 edit" href="$profile.edit.0" title="$profile.edit.3"><span>$profile.edit.1</span></a>{{ endif }}
+	</div>
+	
 	{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
 	<div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="$profile.photo" alt="$profile.name"></div>