diff --git a/scss/modules.scss b/scss/modules.scss
index 71e14dcc92..bf0a462e47 100644
--- a/scss/modules.scss
+++ b/scss/modules.scss
@@ -86,9 +86,23 @@ a.mini-user:hover {
         font-style: italic;
         color: $gray;
     }
-    .auth-button, .account-delete {
-        float: right;
-        margin-top: 8px;
+
+    .account-action {
+        padding-right: 8px;
+        vertical-align: middle;
+        text-align: right;
+
+        .account-delete {
+            display: inline-block;
+        }
+    }
+
+    tr.has-avatar > .account-details {
+      vertical-align: bottom;
+    }
+
+    .email {
+        position: relative;
     }
     .toggle-bitcoin, .toggle-email {
         position: absolute;
@@ -96,13 +110,11 @@ a.mini-user:hover {
     }
     .toggle-bitcoin {
         margin-top: 8px;
+        right: 8px;
     }
     .account-type ~ .auth-button, .toggle-email {
         margin-top: -1.25em;
     }
-    td > div {
-        position: relative;
-    }
     table {
         width: 100%;
     }
@@ -156,9 +168,6 @@ a.mini-user:hover {
             }
         }
     }
-    tr.has-avatar > td {
-        vertical-align: bottom;
-    }
     div.account-type {
         font-size: 12px;
         color: $gray;
diff --git a/templates/account-row.html b/templates/account-row.html
index 17e87c2d64..81fdf398d4 100644
--- a/templates/account-row.html
+++ b/templates/account-row.html
@@ -14,11 +14,6 @@
         <td class="account-details">
             {% if account == None %}
                 <span class="none">None</span>
-                {% if not user.ANON and user.participant == participant %}
-                    {% call auth_button(platform.name, 'connect') %}
-                        + Add
-                    {% endcall %}
-                {% endif %}
             {% else %}
                 <a class="account-username" rel="me" href="{{ account.html_url|e }}"
                     >{{ account.user_name|e }}
@@ -26,15 +21,23 @@
                         ({{ account.display_name|e }})
                     {% endif %}
                 </a>
-                {% if user.participant == participant %}
+            {% endif %}
+
+            <div class="account-type">{{ platform.display_name }}</div>
+        </td>
+        <td class="account-action">
+            {% if user.participant == participant %}
+                {% if account == None %}
+                    {% call auth_button(platform.name, 'connect') %}
+                        + Add
+                    {% endcall %}
+                {% else %}
                     <div class="account-delete" title="Disconnect"
                             data-platform="{{ platform.name }}"
                             data-user_id="{{ account.user_id }}">
                     </div>
                 {% endif %}
             {% endif %}
-
-            <div class="account-type">{{ platform.display_name }}</div>
         </td>
     </tr>
 {% endmacro %}
diff --git a/templates/connected-accounts.html b/templates/connected-accounts.html
index 82a4c4b24b..77a6469f35 100644
--- a/templates/connected-accounts.html
+++ b/templates/connected-accounts.html
@@ -29,7 +29,7 @@ <h2>Other Giving Options</h2>
         <td class="account-type">
             <img src="{{ website.asset_url }}/bitcoin.png" />
         </td>
-        <td class="account-details">
+        <td class="account-details" colspan="2">
             {% if not user.ANON and own_account %}
                 <div class="bitcoin">
             {% else %}
@@ -70,7 +70,7 @@ <h2>Other Giving Options</h2>
     {% endif %}
 
     {% if accounts[website.platforms.venmo.name] or own_account %}
-        {{ account_row(website.platforms.venmo, accounts, auth_button) }}
+        {% include "templates/venmo-account.html" %}
     {% endif %}
 </table>
 
diff --git a/templates/venmo-account.html b/templates/venmo-account.html
new file mode 100644
index 0000000000..db7748289e
--- /dev/null
+++ b/templates/venmo-account.html
@@ -0,0 +1,49 @@
+{% from 'templates/avatar-url.html' import avatar_url with context %}
+
+{% set account = accounts.get('venmo', None) %}
+<tr class="{{ 'has-avatar' if account }}">
+    <td class="account-type">
+        <div class="sanity-preserving-wrapper">
+            {% if account != None %}
+                <img class="avatar" src="{{ avatar_url(account) }}"/>
+            {% endif %}
+          <img class="platform" src="{{ website.asset_url }}/venmo.png" />
+        </div>
+    </td>
+    <td class="account-details">
+        {% if account == None %}
+            <span class="none">None</span>
+        {% else %}
+            <a class="account-username" rel="me" href="{{ account.html_url|e }}"
+                >{{ account.user_name|e }}
+                {% if account.display_name and account.display_name != account.user_name %}
+                    ({{ account.display_name|e }})
+                {% endif %}
+            </a>
+        {% endif %}
+
+        <div class="account-type">Venmo</div>
+    </td>
+    <td class="account-action">
+        {% if account == None %}
+            {% if not user.ANON and user.participant == participant %}
+                {% call auth_button('venmo', 'connect') %}
+                    + Add
+                {% endcall %}
+            {% endif %}
+        {% else %}
+            {% if user.participant == participant %}
+                <div class="account-delete" title="Disconnect"
+                        data-platform="venmo"
+                        data-user_id="{{ account.user_id }}">
+                </div>
+            {% else %}
+                <div class="venmo-button">
+                    <a class="venmo-pay-button" data-recipient-id="{{account.user_id}}"></a>
+                </div>
+            {% endif %}
+        {% endif %}
+    </td>
+</tr>
+
+<script src="https://platform.venmo.com/sdk.js"></script>
diff --git a/www/%username/account/index.html.spt b/www/%username/account/index.html.spt
index 2ae34e2401..c83768b6fa 100644
--- a/www/%username/account/index.html.spt
+++ b/www/%username/account/index.html.spt
@@ -72,9 +72,14 @@ locked = False
                         <div class="account-type">Credit card</div>
                         {% if participant.last_bill_result != "" %}
                             <span class="none">None</span>
-                            <a class="button auth-button" href="/credit-card.html">+ Add</a>
                         {% else %}
                             <a class="account-username" href="/credit-card.html">Added</a>
+                        {% endif %}
+                    </td>
+                    <td class="account-action">
+                        {% if participant.last_bill_result != "" %}
+                            <a class="button auth-button" href="/credit-card.html">+ Add</a>
+                        {% else %}
                             <a class="button auth-button" href="/credit-card.html">Edit</a>
                         {% endif %}
                     </td>
@@ -100,9 +105,14 @@ locked = False
                         <div class="account-type">Bank account</div>
                         {% if participant.last_ach_result != "" %}
                             <span class="none">None</span>
-                            <a class="button auth-button" href="/bank-account.html">+ Add</a>
                         {% else %}
                             <a class="account-username" href="/bank-account.html">Added</a>
+                        {% endif %}
+                    </td>
+                    <td class="account-action">
+                        {% if participant.last_ach_result != "" %}
+                            <a class="button auth-button" href="/bank-account.html">+ Add</a>
+                        {% else %}
                             <a class="button auth-button" href="/bank-account.html">Edit</a>
                         {% endif %}
                     </td>