diff --git a/app/routes/team.coffee b/app/routes/team.coffee
index 5c3caa63..fd0ede97 100644
--- a/app/routes/team.coffee
+++ b/app/routes/team.coffee
@@ -12,8 +12,7 @@ Route = TravisRoute.extend
         handle: 'svenfuchs'
         nationality: 'germany'
         country: 'germany'
-        image: ''
-        gif: ''
+        image: 'sven'
       },
       {
         name: 'Josh Kalderimis'
@@ -21,8 +20,7 @@ Route = TravisRoute.extend
         handle: 'j2h'
         nationality: 'newzealand'
         country: 'germany'
-        image: ''
-        gif: ''
+        image: 'josh'
       },
       {
         name: 'Fritz Thielemann'
@@ -30,8 +28,7 @@ Route = TravisRoute.extend
         handle: 'fritzek'
         nationality: 'germany'
         country: 'germany'
-        image: ''
-        gif: ''
+        image: 'fritz'
       },
       {
         name: 'Konstantin Haase'
@@ -39,8 +36,7 @@ Route = TravisRoute.extend
         handle: 'konstantinhaase'
         nationality: 'germany'
         country: 'germany'
-        image: ''
-        gif: ''
+        image: 'konstantin'
       },
       {
         name: 'Mathias Meyer'
@@ -48,8 +44,7 @@ Route = TravisRoute.extend
         handle: 'roidrage'
         nationality: 'germany'
         country: 'germany'
-        image: ''
-        gif: ''
+        image: 'mathias'
       },
       {
         name: 'Piotr Sarnacki'
@@ -57,8 +52,7 @@ Route = TravisRoute.extend
         handle: 'drogus'
         nationality: 'poland'
         country: 'germany'
-        image: ''
-        gif: ''
+        image: 'piotr'
       },
       {
         name: 'Anika Lindtner'
@@ -66,8 +60,7 @@ Route = TravisRoute.extend
         handle: 'langziehohr'
         nationality: 'germany'
         country: 'germany'
-        image: ''
-        gif: ''
+        image: 'anika'
       },
       {
         name: 'Henrik Hodne'
@@ -75,8 +68,7 @@ Route = TravisRoute.extend
         handle: 'henrikhodne'
         nationality: 'norway'
         country: 'norway'
-        image: ''
-        gif: ''
+        image: 'henrik'
       },
       {
         name: 'Justine Arreche'
@@ -84,8 +76,7 @@ Route = TravisRoute.extend
         handle: 'saltinejustine'
         nationality: 'usa'
         country: 'usa'
-        image: ''
-        gif: ''
+        image: 'justine'
       },
       {
         name: 'Hiro Asari'
@@ -93,8 +84,7 @@ Route = TravisRoute.extend
         handle: 'hiro_asari'
         nationality: 'japan'
         country: 'usa'
-        image: ''
-        gif: ''
+        image: 'hiro'
       },
       {
         name: 'Dan Buch'
@@ -102,16 +92,14 @@ Route = TravisRoute.extend
         handle: 'meatballhat'
         nationality: 'usa'
         country: 'usa'
-        image: ''
-        gif: ''
+        image: 'dan'
       },
       {
         name: 'Lisa Passing'
         title: 'Queen of !important'
         nationality: 'germany'
         country: 'germany'
-        image: ''
-        gif: ''
+        image: 'lisa'
       },
       {
         name: 'Carla Drago'
@@ -119,8 +107,7 @@ Route = TravisRoute.extend
         handle: 'carlad'
         nationality: 'italy'
         country: 'germany'
-        image: ''
-        gif: ''
+        image: 'carla'
       },
       {
         name: 'Anja Reichmann'
@@ -128,8 +115,7 @@ Route = TravisRoute.extend
         handle: '_tyranja_'
         nationality: 'germany'
         country: 'germany'
-        image: ''
-        gif: ''
+        image: 'anja'
       },
       {
         name: 'Aly Fulton'
@@ -137,8 +123,7 @@ Route = TravisRoute.extend
         handle: 'sinthetix'
         nationality: 'usa'
         country: 'usa'
-        image: ''
-        gif: ''
+        image: 'aly'
       },
       {
         name: 'Amanda Quaranto'
@@ -146,8 +131,7 @@ Route = TravisRoute.extend
         handle: 'aquaranto'
         nationality: 'usa'
         country: 'usa'
-        image: ''
-        gif: ''
+        image: 'amanda'
       },
       {
         name: 'Jen Duke'
@@ -155,8 +139,7 @@ Route = TravisRoute.extend
         handle: 'dukeofberlin'
         nationality: 'usa'
         country: 'germany'
-        image: ''
-        gif: ''
+        image: 'jen'
       },
       {
         name: 'Brandon Burton'
@@ -164,8 +147,7 @@ Route = TravisRoute.extend
         handle: 'solarce'
         nationality: 'usa'
         country: 'usa'
-        image: ''
-        gif: ''
+        image: 'brandon'
       },
       {
         name: 'Emma Trimble'
@@ -173,8 +155,7 @@ Route = TravisRoute.extend
         handle: 'emdantrim'
         nationality: 'usa'
         country: 'usa'
-        image: ''
-        gif: ''
+        image: 'emma'
       },
       {
         name: 'María de Antón'
@@ -182,8 +163,7 @@ Route = TravisRoute.extend
         handle: 'amalulla'
         nationality: 'spain'
         country: 'spain'
-        image: ''
-        gif: ''
+        image: 'maria'
       },
       {
         name: 'Danish Khan'
@@ -191,8 +171,7 @@ Route = TravisRoute.extend
         handle: 'danishkhan'
         nationality: 'usa'
         country: 'usa'
-        image: ''
-        gif: ''
+        image: 'danish'
       },
       {
         name: 'Dominic Jodoin'
@@ -200,16 +179,14 @@ Route = TravisRoute.extend
         handle: 'cotsog'
         nationality: 'canada'
         country: 'canada'
-        image: ''
-        gif: ''
+        image: 'dominic'
       },
       {
         name: 'Liza Brisker'
         title: 'Brainy Trainee'
         nationality: 'russia'
         country: 'germany'
-        image: ''
-        gif: ''
+        image: 'liz'
       }
     ]
 
diff --git a/app/styles/app/layouts/home-pro.sass b/app/styles/app/layouts/home-pro.sass
index d00ec70f..fac3e586 100644
--- a/app/styles/app/layouts/home-pro.sass
+++ b/app/styles/app/layouts/home-pro.sass
@@ -526,7 +526,6 @@
   margin: auto
   overflow: hidden
   img
-    background-color: green
     display: block
     width: 100%
     height: 100%
diff --git a/app/templates/components/team-member.hbs b/app/templates/components/team-member.hbs
index 01b77f4d..f18e3a7d 100644
--- a/app/templates/components/team-member.hbs
+++ b/app/templates/components/team-member.hbs
@@ -1,6 +1,6 @@
 <figure class="team-image">
-  <img class="front" src="{{member.image}}" alt="">
-  <img class="back" src="{{member.gif}}" alt="">
+  <img class="front" src="../images/team/team-{{member.image}}.png" alt="">
+  <img class="back" src="../images/team/{{member.image}}-animated.gif" alt="">
 </figure>
 <h3 class="team-name">{{member.name}}</h3>
 <p class="team-title">{{member.title}}</p>
diff --git a/public/images/team/amanda-animated.gif b/public/images/team/amanda-animated.gif
new file mode 100644
index 00000000..b0f2ac66
Binary files /dev/null and b/public/images/team/amanda-animated.gif differ
diff --git a/public/images/team/anika-animated.gif b/public/images/team/anika-animated.gif
new file mode 100644
index 00000000..a5f0cb13
Binary files /dev/null and b/public/images/team/anika-animated.gif differ
diff --git a/public/images/team/anja-animated.gif b/public/images/team/anja-animated.gif
new file mode 100644
index 00000000..86385763
Binary files /dev/null and b/public/images/team/anja-animated.gif differ
diff --git a/public/images/team/brandon-animated.gif b/public/images/team/brandon-animated.gif
new file mode 100644
index 00000000..591ee6c9
Binary files /dev/null and b/public/images/team/brandon-animated.gif differ
diff --git a/public/images/team/carla-animated.gif b/public/images/team/carla-animated.gif
new file mode 100644
index 00000000..989c37fe
Binary files /dev/null and b/public/images/team/carla-animated.gif differ
diff --git a/public/images/team/dan-animated.gif b/public/images/team/dan-animated.gif
new file mode 100644
index 00000000..63f485ed
Binary files /dev/null and b/public/images/team/dan-animated.gif differ
diff --git a/public/images/team/danish-animated.gif b/public/images/team/danish-animated.gif
new file mode 100644
index 00000000..885c3d27
Binary files /dev/null and b/public/images/team/danish-animated.gif differ
diff --git a/public/images/team/dominic-animated.gif b/public/images/team/dominic-animated.gif
new file mode 100644
index 00000000..ae9e5170
Binary files /dev/null and b/public/images/team/dominic-animated.gif differ
diff --git a/public/images/team/fritz-animated.gif b/public/images/team/fritz-animated.gif
new file mode 100644
index 00000000..a28a9307
Binary files /dev/null and b/public/images/team/fritz-animated.gif differ
diff --git a/public/images/team/henrik-animated.gif b/public/images/team/henrik-animated.gif
new file mode 100644
index 00000000..0034afa0
Binary files /dev/null and b/public/images/team/henrik-animated.gif differ
diff --git a/public/images/team/hiro-animated.gif b/public/images/team/hiro-animated.gif
new file mode 100644
index 00000000..fa8e7a9f
Binary files /dev/null and b/public/images/team/hiro-animated.gif differ
diff --git a/public/images/team/jen-animated.gif b/public/images/team/jen-animated.gif
new file mode 100644
index 00000000..b41ab88f
Binary files /dev/null and b/public/images/team/jen-animated.gif differ
diff --git a/public/images/team/josh-animated.gif b/public/images/team/josh-animated.gif
new file mode 100644
index 00000000..7253a09e
Binary files /dev/null and b/public/images/team/josh-animated.gif differ
diff --git a/public/images/team/justine-animated.gif b/public/images/team/justine-animated.gif
new file mode 100644
index 00000000..8b929c31
Binary files /dev/null and b/public/images/team/justine-animated.gif differ
diff --git a/public/images/team/konstantin-animated.gif b/public/images/team/konstantin-animated.gif
new file mode 100644
index 00000000..437e6f9f
Binary files /dev/null and b/public/images/team/konstantin-animated.gif differ
diff --git a/public/images/team/lisa-animated.gif b/public/images/team/lisa-animated.gif
new file mode 100644
index 00000000..5481d1a3
Binary files /dev/null and b/public/images/team/lisa-animated.gif differ
diff --git a/public/images/team/liz-animated.gif b/public/images/team/liz-animated.gif
new file mode 100644
index 00000000..91743cce
Binary files /dev/null and b/public/images/team/liz-animated.gif differ
diff --git a/public/images/team/maria-animated.gif b/public/images/team/maria-animated.gif
new file mode 100644
index 00000000..8873ea7b
Binary files /dev/null and b/public/images/team/maria-animated.gif differ
diff --git a/public/images/team/mathias-animated.gif b/public/images/team/mathias-animated.gif
new file mode 100644
index 00000000..c3f89179
Binary files /dev/null and b/public/images/team/mathias-animated.gif differ
diff --git a/public/images/team/piotr-animated.gif b/public/images/team/piotr-animated.gif
new file mode 100644
index 00000000..061de4dc
Binary files /dev/null and b/public/images/team/piotr-animated.gif differ
diff --git a/public/images/team/sven-animated.gif b/public/images/team/sven-animated.gif
new file mode 100644
index 00000000..5ae40e51
Binary files /dev/null and b/public/images/team/sven-animated.gif differ
diff --git a/public/images/team/team-aly.png b/public/images/team/team-aly.png
new file mode 100644
index 00000000..2cdf4128
Binary files /dev/null and b/public/images/team/team-aly.png differ
diff --git a/public/images/team/team-amanda.png b/public/images/team/team-amanda.png
new file mode 100644
index 00000000..43c0ff39
Binary files /dev/null and b/public/images/team/team-amanda.png differ
diff --git a/public/images/team/team-anika.png b/public/images/team/team-anika.png
new file mode 100644
index 00000000..f89c38ab
Binary files /dev/null and b/public/images/team/team-anika.png differ
diff --git a/public/images/team/team-anja.png b/public/images/team/team-anja.png
new file mode 100644
index 00000000..69177196
Binary files /dev/null and b/public/images/team/team-anja.png differ
diff --git a/public/images/team/team-brandon.png b/public/images/team/team-brandon.png
new file mode 100644
index 00000000..e5fb781e
Binary files /dev/null and b/public/images/team/team-brandon.png differ
diff --git a/public/images/team/team-carla.png b/public/images/team/team-carla.png
new file mode 100644
index 00000000..7bc92ee9
Binary files /dev/null and b/public/images/team/team-carla.png differ
diff --git a/public/images/team/team-dan.png b/public/images/team/team-dan.png
new file mode 100644
index 00000000..ffbdc0db
Binary files /dev/null and b/public/images/team/team-dan.png differ
diff --git a/public/images/team/team-danish.png b/public/images/team/team-danish.png
new file mode 100644
index 00000000..7d87d6c3
Binary files /dev/null and b/public/images/team/team-danish.png differ
diff --git a/public/images/team/team-dominic.png b/public/images/team/team-dominic.png
new file mode 100644
index 00000000..1f273fbf
Binary files /dev/null and b/public/images/team/team-dominic.png differ
diff --git a/public/images/team/team-emma.png b/public/images/team/team-emma.png
new file mode 100644
index 00000000..2802d919
Binary files /dev/null and b/public/images/team/team-emma.png differ
diff --git a/public/images/team/team-fritz.png b/public/images/team/team-fritz.png
new file mode 100644
index 00000000..147b7d88
Binary files /dev/null and b/public/images/team/team-fritz.png differ
diff --git a/public/images/team/team-henrik.png b/public/images/team/team-henrik.png
new file mode 100644
index 00000000..ee3d01e4
Binary files /dev/null and b/public/images/team/team-henrik.png differ
diff --git a/public/images/team/team-hiro.png b/public/images/team/team-hiro.png
new file mode 100644
index 00000000..87447943
Binary files /dev/null and b/public/images/team/team-hiro.png differ
diff --git a/public/images/team/team-jen.png b/public/images/team/team-jen.png
new file mode 100644
index 00000000..04e6b252
Binary files /dev/null and b/public/images/team/team-jen.png differ
diff --git a/public/images/team/team-josh.png b/public/images/team/team-josh.png
new file mode 100644
index 00000000..69d3c2c3
Binary files /dev/null and b/public/images/team/team-josh.png differ
diff --git a/public/images/team/team-justine.png b/public/images/team/team-justine.png
new file mode 100644
index 00000000..0b45bf55
Binary files /dev/null and b/public/images/team/team-justine.png differ
diff --git a/public/images/team/team-konstantin.png b/public/images/team/team-konstantin.png
new file mode 100644
index 00000000..90a4a9f2
Binary files /dev/null and b/public/images/team/team-konstantin.png differ
diff --git a/public/images/team/team-lisa.png b/public/images/team/team-lisa.png
new file mode 100644
index 00000000..430b1452
Binary files /dev/null and b/public/images/team/team-lisa.png differ
diff --git a/public/images/team/team-liz.png b/public/images/team/team-liz.png
new file mode 100644
index 00000000..9b76e43e
Binary files /dev/null and b/public/images/team/team-liz.png differ
diff --git a/public/images/team/team-maria.png b/public/images/team/team-maria.png
new file mode 100644
index 00000000..b8164d0d
Binary files /dev/null and b/public/images/team/team-maria.png differ
diff --git a/public/images/team/team-mathias.png b/public/images/team/team-mathias.png
new file mode 100644
index 00000000..b9f9665e
Binary files /dev/null and b/public/images/team/team-mathias.png differ
diff --git a/public/images/team/team-piotr.png b/public/images/team/team-piotr.png
new file mode 100644
index 00000000..81dd1e05
Binary files /dev/null and b/public/images/team/team-piotr.png differ
diff --git a/public/images/team/team-sven.png b/public/images/team/team-sven.png
new file mode 100644
index 00000000..734b321a
Binary files /dev/null and b/public/images/team/team-sven.png differ