diff --git a/ivatar/ivataraccount/templates/profile.html b/ivatar/ivataraccount/templates/profile.html
index 5b6d878..4c1e369 100644
--- a/ivatar/ivataraccount/templates/profile.html
+++ b/ivatar/ivataraccount/templates/profile.html
@@ -66,56 +66,59 @@ outline: inherit;
     display: contents;
   }
 }
+.panel-heading{
+  background: #70768682;
+}
 </style>
 
 {% if user.confirmedemail_set.count or user.confirmedopenid_set.count %}
 <h3>{% trans 'You have the following confirmed identities:' %}</h3>
 <div class="row profileid">
-    {% for email in user.confirmedemail_set.all %}
-        <form action="{% url 'remove_confirmed_email' email.id %}" method="post">
+{% for email in user.confirmedemail_set.all %}
+<form action="{% url 'remove_confirmed_email' email.id %}" method="post">
 {% csrf_token %}
 <div>
   <div class="panel-heading" style="padding-right:0">
     <h3 class="panel-title" title="{{ email.email }}" style="display:inline-flex">
-      <a href="{% url 'assign_photo_email' email.id %}">
-        <i class="fa fa-edit"></i>
-      </a>&nbsp;
-<button type="submit" class="nobutton" onclick="return confirm('{% trans 'Are you sure that you want to delete this email address?' %}')">
-  <i class="fa fa-trash"></i>
-</button>&nbsp;
-{{ email.email }}</h3>
+      {{ email.email }}
+    </h3>
 </div>
-<div class="panel-body profile" style="height:130px">
+<div class="panel-body profile">
   <img title="{% trans 'Access count' %}: {{ email.access_count }}" style="max-height:100px;max-width:100px" src="{% if email.photo %}{% url 'raw_image' email.photo.id %}{% else %}{% static '/img/nobody/80.png' %}{% endif %}">
   <div class="profile-edit">
     <a href="{% url 'assign_photo_email' email.id %}">
-      <p>
-        <i class="fa fa-edit">Change Profile Picture</i>
-      </p>
+      Change Profile Picture
     </a>
   </div>
   <div class="email-delete">
     <button type="submit" class="nobutton" onclick="return confirm('{% trans 'Are you sure that you want to delete this email address?' %}')">
-      <p>
-        <i class="fa fa-trash"></i>
         Delete Profile Picture
-      </p>
     </button>
   </div>
 </div>
 </div>
-        </form>
+</form>
     {% endfor %}
     {% for openid in user.confirmedopenid_set.all %}
         <form action="{% url 'remove_confirmed_openid' openid.id %}" method="post">{% csrf_token %}
 <div>
   <div class="panel-heading" style="padding-right:0">
     <h3 class="panel-title" title="{{ openid.openid }}" style="display:inline-flex"><a href="{% url 'assign_photo_openid' openid.pk %}"><i class="fa fa-edit"></i></a>&nbsp;
-<button type="submit" class="nobutton" onclick="return confirm('{% trans 'Are you sure that you want to delete this OpenID?' %}')"><i class="fa fa-trash"></i></button>&nbsp;
 {{ openid.openid|cut:"http://"|cut:"https://"|truncatechars:12 }}</h3>
 </div>
-<div class="panel-body" style="height:130px">
+<div class="panel-body profile">
   <img title="{% trans 'Access count' %}: {{ openid.access_count }}" style="max-height:100px;max-width:100px" src="{% if openid.photo %}{% url 'raw_image' openid.photo.id %}{% else %}{% static '/img/nobody/80.png' %}{% endif %}">
+  <div class="profile-edit">
+    <a href="{% url 'assign_photo_openid' openid.pk %}">
+      Change OpenID Picture
+    </a>
+  </div>
+  <div class="email-delete">
+    <button type="submit" class="nobutton" onclick="return confirm('{% trans 'Are you sure that you want to delete this OpenID?' %}')">
+      Delete OpenID
+    </button>
+
+  </div>
 </div>
 </div>
 </form>
diff --git a/ivatar/static/css/libravatar_base.css b/ivatar/static/css/libravatar_base.css
index 4c063b5..21ac912 100644
--- a/ivatar/static/css/libravatar_base.css
+++ b/ivatar/static/css/libravatar_base.css
@@ -745,5 +745,5 @@ color:#335ECF;
 }
 
 .panel-body.profile > div, .panel-body.profile > img {
-  text-align: center;
+  text-align: left;
 }