diff --git a/docs/_data/core-team.yml b/docs/_data/core-team.yml
deleted file mode 100644
index d1fd76320..000000000
--- a/docs/_data/core-team.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-- name: Mark Otto
-  user: mdo
-  gravatar: bc4ab438f7a4ce1c406aadc688427f2c
-
-- name: Jacob Thornton
-  user: fat
-  gravatar: a98244cbdacaf1c0b55499466002f7a8
-
-- name: Chris Rebert
-  user: cvrebert
-  gravatar: edec428c425453955f770095a7d26c50
-
-- name: Julian Thilo
-  user: juthilo
-  gravatar: 0f7dd3ce58a416be5685ea6194f82b11
-
-- name: XhmikosR
-  user: xhmikosr
-  gravatar: e37759b1ea0125d4e97b1e00b5eed26f
-
-- name: Heinrich Fenkart
-  user: hnrch02
-  gravatar: 0d53f5d3d3d28bd470f394d98f7ef48f
-
-- name: Patrick H. Lauke
-  user: patrickhlauke
-  gravatar: 357f279672db832fc41a5a2f36559fcb
diff --git a/docs/_data/team.yml b/docs/_data/team.yml
new file mode 100644
index 000000000..46e8bf4ac
--- /dev/null
+++ b/docs/_data/team.yml
@@ -0,0 +1,20 @@
+- name: Mark Otto
+  user: mdo
+
+- name: Jacob Thornton
+  user: fat
+
+- name: Chris Rebert
+  user: cvrebert
+
+- name: XhmikosR
+  user: xhmikosr
+
+- name: Patrick H. Lauke
+  user: patrickhlauke
+
+- name: Johann-S
+  user: johann-s
+
+- name: Andres Galante
+  user: andresgalante
diff --git a/docs/about.html b/docs/about.html
index b8dc2df63..95b3e5738 100644
--- a/docs/about.html
+++ b/docs/about.html
@@ -26,11 +26,10 @@ lead: "Learn about the project's history, meet the maintaining teams, and find o
 
   <h2 id="team-core">Core team</h2>
   <div class="list-group bs-team">
-    {% for member in site.data.core-team %}
+    {% for member in site.data.team %}
       <div class="list-group-item">
-        <iframe class="github-btn" src="https://ghbtns.com/github-btn.html?user={{ member.user }}&amp;type=follow"></iframe>
         <a class="team-member" href="https://github.com/{{ member.user }}">
-          <img src="https://secure.gravatar.com/avatar/{{ member.gravatar }}.jpg?s=32" alt="@{{ member.user }} avatar" width="32" height="32">
+          <img src="https://github.com/{{ member.user }}.png?s=64" alt="@{{ member.user }} avatar" width="32" height="32">
           <strong>{{ member.name }}</strong> <small>@{{ member.user }}</small>
         </a>
       </div>
@@ -42,9 +41,8 @@ lead: "Learn about the project's history, meet the maintaining teams, and find o
   <div class="list-group bs-team">
     {% for member in site.data.sass-team %}
       <div class="list-group-item">
-        <iframe class="github-btn" src="https://ghbtns.com/github-btn.html?user={{ member.user }}&amp;type=follow"></iframe>
         <a class="team-member" href="https://github.com/{{ member.user }}">
-          <img src="https://secure.gravatar.com/avatar/{{ member.gravatar }}.jpg?s=32" alt="@{{ member.user }} avatar" width="32" height="32">
+          <img src="https://github.com/{{ member.user }}.png?s=64" alt="@{{ member.user }} avatar" width="32" height="32">
           <strong>{{ member.name }}</strong> <small>@{{ member.user }}</small>
         </a>
       </div>