diff --git a/Zotlabs/Module/Cover_photo.php b/Zotlabs/Module/Cover_photo.php
index b911ac991..822cc8ef6 100644
--- a/Zotlabs/Module/Cover_photo.php
+++ b/Zotlabs/Module/Cover_photo.php
@@ -48,6 +48,16 @@ class Cover_photo extends \Zotlabs\Web\Controller {
 		$channel = \App::get_channel();
 		
 		check_form_security_token_redirectOnErr('/cover_photo', 'cover_photo');
+
+		// Remove cover photo
+		if(isset($_POST['remove'])) {
+			q("update photo set photo_usage = %d where photo_usage = %d and uid = %d",
+				intval(PHOTO_NORMAL),
+				intval(PHOTO_COVER),
+				intval(local_channel())
+			);
+			goaway(z_root() . '/cover_photo');
+		}
 	        
 		if((array_key_exists('cropfinal',$_POST)) && ($_POST['cropfinal'] == 1)) {
 	
diff --git a/view/tpl/cover_photo.tpl b/view/tpl/cover_photo.tpl
index 5a5bf2286..a1c4a922d 100755
--- a/view/tpl/cover_photo.tpl
+++ b/view/tpl/cover_photo.tpl
@@ -102,7 +102,8 @@
 			<br />
 			<br />
 			<div id="profile-photo-submit-wrapper">
-				<input type="submit" name="submit" id="profile-photo-submit" value="{{$submit}}">
+			    <button type="submit" class="btn btn-outline-primary" name="submit" id="profile-photo-submit">{{$submit}}</button>
+			    <button type="submit" class="btn btn-outline-danger" name="remove" id="profile-photo-remove">{{$remove}}</button>
 			</div>
 		</div>
 
diff --git a/view/tpl/profile_photo.tpl b/view/tpl/profile_photo.tpl
index 819502df5..b2190dda3 100755
--- a/view/tpl/profile_photo.tpl
+++ b/view/tpl/profile_photo.tpl
@@ -124,7 +124,7 @@
 			{{/if}}
 
 			<div id="profile-photo-submit-wrapper">
-				<input type="submit" name="submit" id="profile-photo-submit" value="{{$submit}}">
+			    <button type="submit" class="btn btn-outline-primary" name="submit" id="profile-photo-submit">{{$submit}}</button>
 			</div>
 		</div>