diff --git a/boot.php b/boot.php
index 707ca1988..0b03a20c8 100644
--- a/boot.php
+++ b/boot.php
@@ -823,6 +823,13 @@ function profile_load(&$a, $nickname, $profile = 0) {
 	if(! (x($a->page,'aside')))
 		$a->page['aside'] = '';
 
+	if(local_user() && local_user() == $a->profile['uid']) {
+		$a->page['aside'] .= replace_macros(get_markup_template('profile_edlink.tpl'),array(
+			'$editprofile' => t('Edit profile'),
+			'$profid' => $a->profile['id']
+		));
+	}
+
 	$block = (((get_config('system','block_public')) && (! local_user()) && (! remote_user())) ? true : false);
 
 	$a->page['aside'] .= profile_sidebar($a->profile, $block);
diff --git a/view/profile_edlink.tpl b/view/profile_edlink.tpl
new file mode 100644
index 000000000..ea787b9f5
--- /dev/null
+++ b/view/profile_edlink.tpl
@@ -0,0 +1,2 @@
+<div class="profile-edit-side-div"><a class="profile-edit-side-link icon edit" title="$editprofile" href="profiles/$profid" ></a></div>
+<div class="clear"></div>
\ No newline at end of file
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index d595c7495..eb73bfb97 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -517,6 +517,17 @@ input#dfrn-url {
 #profile-edit-links li {
 	margin-top: 10px;
 }
+.profile-edit-side-div {
+	float: right;
+}
+.profile-edit-side-link {
+	opacity: 0.3;
+	filter:alpha(opacity=30);
+}
+.profile-edit-side-link:hover {
+	opacity: 1.0;
+	filter:alpha(opacity=100);
+}
 
 .view-contact-wrapper {
 	margin-top: 20px;
diff --git a/view/theme/loozah/style.css b/view/theme/loozah/style.css
index 42b99b08c..c978e140a 100644
--- a/view/theme/loozah/style.css
+++ b/view/theme/loozah/style.css
@@ -623,6 +623,10 @@ input#dfrn-url {
 	margin-top: 10px;
 }
 
+.profile-edit-side-div {
+	float: right;
+}
+
 .view-contact-wrapper {
 	margin-top: 20px;
 	float: left;
diff --git a/view/theme/testbubble/style.css b/view/theme/testbubble/style.css
index 9c04ec4ba..91920e84d 100644
--- a/view/theme/testbubble/style.css
+++ b/view/theme/testbubble/style.css
@@ -1244,6 +1244,12 @@ div[id$="wrapper"] br { clear: left; }
 	background-color: #b20202;	
 }
 
+.profile-edit-side-div {
+	margin-top: 5px;
+	margin-right: 30px;
+	float: right;
+}
+
 #cropimage-wrapper { float:left; }
 #crop-image-form { clear:both; }