diff --git a/app/src/main/res/animator/followers_lefty.xml b/app/src/main/res/animator/followers_lefty.xml
deleted file mode 100644
index ff16cbfb7..000000000
--- a/app/src/main/res/animator/followers_lefty.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright 2016 Google Inc.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<set
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:interpolator="@android:interpolator/fast_out_slow_in">
-
-    <objectAnimator
-        android:propertyName="translateX"
-        android:valueTo="-16"
-        android:duration="300" />
-
-    <objectAnimator
-        android:propertyName="translateY"
-        android:valueTo="4"
-        android:duration="250" />
-
-    <objectAnimator
-        android:propertyName="translateX"
-        android:valueTo="0"
-        android:startOffset="550"
-        android:duration="0" />
-
-    <objectAnimator
-        android:propertyName="translateY"
-        android:valueTo="0"
-        android:startOffset="550"
-        android:duration="0" />
-
-</set>
diff --git a/app/src/main/res/animator/followers_righty.xml b/app/src/main/res/animator/followers_righty.xml
deleted file mode 100644
index fd7c145c1..000000000
--- a/app/src/main/res/animator/followers_righty.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright 2016 Google Inc.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<set
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:interpolator="@android:interpolator/fast_out_slow_in">
-
-    <objectAnimator
-        android:propertyName="translateX"
-        android:valueTo="-8"
-        android:duration="550" />
-
-    <objectAnimator
-        android:propertyName="translateX"
-        android:valueFrom="16"
-        android:valueTo="0"
-        android:startOffset="550"
-        android:duration="300" />
-
-    <objectAnimator
-        android:propertyName="translateY"
-        android:valueFrom="-4"
-        android:valueTo="0"
-        android:startOffset="550"
-        android:duration="250" />
-
-</set>
diff --git a/app/src/main/res/animator/heartbeat.xml b/app/src/main/res/animator/heartbeat.xml
deleted file mode 100644
index 25212c162..000000000
--- a/app/src/main/res/animator/heartbeat.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright 2016 Google Inc.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<set
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:interpolator="@android:interpolator/accelerate_quad">
-
-    <!-- beat 1 -->
-    <objectAnimator
-        android:propertyName="scaleX"
-        android:valueTo="1.2"
-        android:duration="100" />
-
-    <objectAnimator
-        android:propertyName="scaleY"
-        android:valueTo="1.2"
-        android:duration="100" />
-
-    <objectAnimator
-        android:propertyName="scaleX"
-        android:valueTo="1"
-        android:startOffset="100"
-        android:duration="150" />
-
-    <objectAnimator
-        android:propertyName="scaleY"
-        android:valueTo="1"
-        android:startOffset="100"
-        android:duration="150" />
-
-    <!-- beat 2 -->
-    <objectAnimator
-        android:propertyName="scaleX"
-        android:valueTo="1.2"
-        android:startOffset="500"
-        android:duration="100" />
-
-    <objectAnimator
-        android:propertyName="scaleY"
-        android:valueTo="1.2"
-        android:startOffset="500"
-        android:duration="100" />
-
-    <objectAnimator
-        android:propertyName="scaleX"
-        android:valueTo="1"
-        android:startOffset="600"
-        android:duration="150" />
-
-    <objectAnimator
-        android:propertyName="scaleY"
-        android:valueTo="1"
-        android:startOffset="600"
-        android:duration="150" />
-
-</set>
diff --git a/app/src/main/res/animator/look_around.xml b/app/src/main/res/animator/look_around.xml
deleted file mode 100644
index 5ba98aacb..000000000
--- a/app/src/main/res/animator/look_around.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright 2016 Google Inc.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<set
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:interpolator="@android:interpolator/fast_out_slow_in">
-
-    <objectAnimator
-        android:propertyName="translateX"
-        android:valueTo="2"
-        android:duration="150" />
-
-    <objectAnimator
-        android:propertyName="translateY"
-        android:valueTo="-2"
-        android:duration="100" />
-
-    <objectAnimator
-        android:propertyName="translateX"
-        android:valueTo="-2"
-        android:startOffset="800"
-        android:duration="150" />
-
-    <objectAnimator
-        android:propertyName="translateX"
-        android:valueTo="0"
-        android:startOffset="1800"
-        android:duration="150" />
-
-    <objectAnimator
-        android:propertyName="translateY"
-        android:valueTo="0"
-        android:startOffset="1800"
-        android:duration="100" />
-
-</set>
diff --git a/app/src/main/res/animator/share_dots.xml b/app/src/main/res/animator/share_dots.xml
deleted file mode 100644
index 54268df59..000000000
--- a/app/src/main/res/animator/share_dots.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright 2016 Google Inc.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<set
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:interpolator="@android:interpolator/fast_out_slow_in">
-
-    <objectAnimator
-        android:propertyName="pathData"
-        android:valueFrom="@string/path_share_dots"
-        android:valueTo="@string/path_share_dots_collapsed"
-        android:duration="@integer/share_duration_collapse"
-        android:valueType="pathType" />
-
-    <objectAnimator
-        android:propertyName="pathData"
-        android:valueFrom="@string/path_share_dots_collapsed"
-        android:valueTo="@string/path_share_dots_mid_expand"
-        android:startOffset="@integer/share_delay_start_expand"
-        android:duration="@integer/share_duration_mid_expand"
-        android:valueType="pathType" />
-
-    <objectAnimator
-        android:propertyName="pathData"
-        android:valueFrom="@string/path_share_dots_mid_expand"
-        android:valueTo="@string/path_share_dots"
-        android:startOffset="@integer/share_delay_full_expand"
-        android:duration="@integer/share_duration_full_expand"
-        android:valueType="pathType" />
-
-</set>
diff --git a/app/src/main/res/animator/share_lines.xml b/app/src/main/res/animator/share_lines.xml
deleted file mode 100644
index 114aaaa46..000000000
--- a/app/src/main/res/animator/share_lines.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright 2016 Google Inc.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<set
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:interpolator="@android:interpolator/fast_out_slow_in">
-
-    <objectAnimator
-        android:propertyName="pathData"
-        android:valueFrom="@string/path_share_lines"
-        android:valueTo="@string/path_share_lines_collapsed"
-        android:duration="@integer/share_duration_collapse"
-        android:valueType="pathType" />
-
-    <objectAnimator
-        android:propertyName="pathData"
-        android:valueFrom="@string/path_share_lines_collapsed"
-        android:valueTo="@string/path_share_lines_mid_expand"
-        android:startOffset="@integer/share_delay_start_expand"
-        android:duration="@integer/share_duration_mid_expand"
-        android:valueType="pathType" />
-
-    <objectAnimator
-        android:propertyName="pathData"
-        android:valueFrom="@string/path_share_lines_mid_expand"
-        android:valueTo="@string/path_share_lines"
-        android:startOffset="@integer/share_delay_full_expand"
-        android:duration="@integer/share_duration_full_expand"
-        android:valueType="pathType" />
-
-</set>
diff --git a/app/src/main/res/animator/shots_below_morph.xml b/app/src/main/res/animator/shots_below_morph.xml
deleted file mode 100644
index f7dbf0cad..000000000
--- a/app/src/main/res/animator/shots_below_morph.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright 2016 Google Inc.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<set
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:interpolator="@android:interpolator/linear">
-
-    <objectAnimator
-        android:propertyName="pathData"
-        android:valueFrom="@string/path_image_mountains"
-        android:valueTo="@string/path_image_arrow_up"
-        android:duration="300"
-        android:valueType="pathType" />
-
-    <objectAnimator
-        android:propertyName="pathData"
-        android:valueFrom="@string/path_image_arrow_down"
-        android:valueTo="@string/path_image_mountains"
-        android:startOffset="1000"
-        android:duration="300"
-        android:valueType="pathType" />
-
-</set>
diff --git a/app/src/main/res/animator/shots_below_move.xml b/app/src/main/res/animator/shots_below_move.xml
deleted file mode 100644
index ca650ba5c..000000000
--- a/app/src/main/res/animator/shots_below_move.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright 2016 Google Inc.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<set
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:interpolator="@android:interpolator/fast_out_slow_in">
-
-    <!-- move up, scale down and rotate while the path is morphing -->
-    <objectAnimator
-        android:propertyName="translateY"
-        android:valueTo="-3"
-        android:duration="250" />
-
-    <objectAnimator
-        android:propertyName="scaleX"
-        android:valueTo="0.8"
-        android:duration="250" />
-
-    <objectAnimator
-        android:propertyName="scaleY"
-        android:valueTo="0.8"
-        android:duration="250" />
-
-    <objectAnimator
-        android:propertyName="rotation"
-        android:valueTo="-180"
-        android:duration="250" />
-
-    <!-- move the arrow down & restore scale -->
-    <objectAnimator
-        android:propertyName="translateY"
-        android:valueTo="0"
-        android:startOffset="250"
-        android:duration="150" />
-
-    <objectAnimator
-        android:propertyName="scaleX"
-        android:valueTo="1"
-        android:startOffset="250"
-        android:duration="150" />
-
-    <objectAnimator
-        android:propertyName="scaleY"
-        android:valueTo="1"
-        android:startOffset="250"
-        android:duration="150" />
-
-    <!-- bounce back up -->
-    <objectAnimator
-        android:propertyName="translateY"
-        android:valueTo="-2"
-        android:startOffset="400"
-        android:duration="150" />
-
-    <!-- bounce down -->
-    <objectAnimator
-        android:propertyName="translateY"
-        android:valueTo="0"
-        android:startOffset="550"
-        android:duration="150" />
-
-    <!-- instantaneously restore the rotation in preparation for the morph
-         back from arrow to the standard icon -->
-    <objectAnimator
-        android:propertyName="rotation"
-        android:valueTo="0"
-        android:startOffset="1000"
-        android:duration="0" />
-
-</set>
diff --git a/app/src/main/res/drawable/avd_followers.xml b/app/src/main/res/drawable/avd_followers.xml
index 8369c1623..a11c9a6f8 100644
--- a/app/src/main/res/drawable/avd_followers.xml
+++ b/app/src/main/res/drawable/avd_followers.xml
@@ -17,14 +17,92 @@
 
 <animated-vector
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:drawable="@drawable/ic_followers">
+    xmlns:aapt="http://schemas.android.com/aapt">
 
-    <target
-        android:name="lefty"
-        android:animation="@animator/followers_lefty" />
+    <aapt:attr name="android:drawable">
+        <vector
+            android:width="24dp"
+            android:height="24dp"
+            android:viewportHeight="24"
+            android:viewportWidth="24">
+            <group android:name="righty">
+                <path
+                    android:pathData="M17,11.999C14.339,11.999 9.006,13.559 9.006,16.667L9.006,20.001L24.994,20.001L24.994,16.667C24.994,13.559 19.661,11.999 17,11.999L17,11.999Z"
+                    android:fillColor="@color/inline_action_icon"
+                    android:strokeColor="@color/background_light"
+                    android:strokeWidth="2"/>
+                <path
+                    android:pathData="M17.002,12.004C19.217,12.004 20.992,10.216 20.992,8C20.992,5.784 19.217,3.996 17.002,3.996C14.786,3.996 12.998,5.784 12.998,8C12.998,10.216 14.786,12.004 17.002,12.004L17.002,12.004Z"
+                    android:fillColor="@color/inline_action_icon"
+                    android:strokeColor="@color/background_light"
+                    android:strokeWidth="2"/>
+            </group>
+            <group android:name="lefty">
+                <path
+                    android:pathData="M9,11.999C6.339,11.999 1.006,13.559 1.006,16.667L1.006,20.001L16.994,20.001L16.994,16.667C16.994,13.559 11.661,11.999 9,11.999L9,11.999Z"
+                    android:fillColor="@color/inline_action_icon"
+                    android:strokeColor="@color/background_light"
+                    android:strokeWidth="2"/>
+                <path
+                    android:pathData="M9.002,12.004C11.217,12.004 12.992,10.216 12.992,8C12.992,5.784 11.217,3.996 9.002,3.996C6.786,3.996 4.998,5.784 4.998,8C4.998,10.216 6.786,12.004 9.002,12.004L9.002,12.004Z"
+                    android:fillColor="@color/inline_action_icon"
+                    android:strokeColor="@color/background_light"
+                    android:strokeWidth="2"/>
+            </group>
+        </vector>
+    </aapt:attr>
 
-    <target
-        android:name="righty"
-        android:animation="@animator/followers_righty" />
+    <target android:name="lefty">
+        <aapt:attr name="android:animation">
+            <set android:interpolator="@android:interpolator/fast_out_slow_in">
+                <objectAnimator
+                    android:propertyName="translateX"
+                    android:valueFrom="0"
+                    android:valueTo="-16"
+                    android:duration="300" />
+                <objectAnimator
+                    android:propertyName="translateY"
+                    android:valueFrom="0"
+                    android:valueTo="4"
+                    android:duration="250" />
+                <objectAnimator
+                    android:propertyName="translateX"
+                    android:valueFrom="-16"
+                    android:valueTo="0"
+                    android:startOffset="550"
+                    android:duration="0" />
+                <objectAnimator
+                    android:propertyName="translateY"
+                    android:valueFrom="4"
+                    android:valueTo="0"
+                    android:startOffset="550"
+                    android:duration="0" />
+            </set>
+        </aapt:attr>
+    </target>
+
+    <target android:name="righty">
+        <aapt:attr name="android:animation">
+            <set android:interpolator="@android:interpolator/fast_out_slow_in">
+                <objectAnimator
+                    android:propertyName="translateX"
+                    android:valueFrom="0"
+                    android:valueTo="-8"
+                    android:duration="550" />
+                <objectAnimator
+                    android:propertyName="translateX"
+                    android:valueFrom="16"
+                    android:valueTo="0"
+                    android:startOffset="550"
+                    android:duration="300" />
+                <objectAnimator
+                    android:propertyName="translateY"
+                    android:valueFrom="-4"
+                    android:valueTo="0"
+                    android:startOffset="550"
+                    android:duration="250" />
+            </set>
+        </aapt:attr>
+    </target>
 
 </animated-vector>
diff --git a/app/src/main/res/drawable/avd_likes.xml b/app/src/main/res/drawable/avd_likes.xml
index a9142c1a5..ea34fbe8a 100644
--- a/app/src/main/res/drawable/avd_likes.xml
+++ b/app/src/main/res/drawable/avd_likes.xml
@@ -17,10 +17,78 @@
 
 <animated-vector
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:drawable="@drawable/ic_heart_full_24dp_grey">
+    xmlns:aapt="http://schemas.android.com/aapt">
 
-    <target
-        android:name="heart"
-        android:animation="@animator/heartbeat" />
+    <aapt:attr name="android:drawable">
+        <vector
+            android:width="24dp"
+            android:height="24dp"
+            android:viewportWidth="24"
+            android:viewportHeight="24">
+            <group
+                android:name="heart"
+                android:pivotX="12"
+                android:pivotY="12">
+                <path
+                    android:pathData="@string/heart_full_path_24dp"
+                    android:fillColor="@color/inline_action_icon" />
+            </group>
+        </vector>
+    </aapt:attr>
+
+    <target android:name="heart">
+        <aapt:attr name="android:animation">
+            <set android:interpolator="@android:interpolator/accelerate_quad">
+                <!-- beat 1 -->
+                <objectAnimator
+                    android:propertyName="scaleX"
+                    android:valueFrom="1"
+                    android:valueTo="1.2"
+                    android:duration="100" />
+                <objectAnimator
+                    android:propertyName="scaleY"
+                    android:valueFrom="1"
+                    android:valueTo="1.2"
+                    android:duration="100" />
+                <objectAnimator
+                    android:propertyName="scaleX"
+                    android:valueFrom="1.2"
+                    android:valueTo="1"
+                    android:startOffset="100"
+                    android:duration="150" />
+                <objectAnimator
+                    android:propertyName="scaleY"
+                    android:valueFrom="1.2"
+                    android:valueTo="1"
+                    android:startOffset="100"
+                    android:duration="150" />
+                <!-- beat 2 -->
+                <objectAnimator
+                    android:propertyName="scaleX"
+                    android:valueFrom="1"
+                    android:valueTo="1.2"
+                    android:startOffset="500"
+                    android:duration="100" />
+                <objectAnimator
+                    android:propertyName="scaleY"
+                    android:valueFrom="1"
+                    android:valueTo="1.2"
+                    android:startOffset="500"
+                    android:duration="100" />
+                <objectAnimator
+                    android:propertyName="scaleX"
+                    android:valueFrom="1.2"
+                    android:valueTo="1"
+                    android:startOffset="600"
+                    android:duration="150"  />
+                <objectAnimator
+                    android:propertyName="scaleY"
+                    android:valueFrom="1.2"
+                    android:valueTo="1"
+                    android:startOffset="600"
+                    android:duration="150" />
+            </set>
+        </aapt:attr>
+    </target>
 
 </animated-vector>
diff --git a/app/src/main/res/drawable/avd_share.xml b/app/src/main/res/drawable/avd_share.xml
index 168148c01..e5ff38f78 100644
--- a/app/src/main/res/drawable/avd_share.xml
+++ b/app/src/main/res/drawable/avd_share.xml
@@ -17,14 +17,81 @@
 
 <animated-vector
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:drawable="@drawable/ic_share_avd">
+    xmlns:aapt="http://schemas.android.com/aapt">
 
-    <target
-        android:name="@string/name_dots"
-        android:animation="@animator/share_dots" />
+    <aapt:attr name="android:drawable">
+        <vector
+            android:width="24dp"
+            android:height="24dp"
+            android:viewportHeight="24"
+            android:viewportWidth="24">
+            <path
+                android:name="@string/name_dots"
+                android:pathData="@string/path_share_dots"
+                android:fillColor="@color/inline_action_icon" />
+            <path
+                android:name="@string/name_lines"
+                android:pathData="@string/path_share_lines"
+                android:strokeColor="@color/inline_action_icon"
+                android:strokeLineCap="square"
+                android:strokeWidth="2" />
+        </vector>
+    </aapt:attr>
 
-    <target
-        android:name="@string/name_lines"
-        android:animation="@animator/share_lines" />
+    <target android:name="@string/name_dots">
+        <aapt:attr name="android:animation">
+            <set android:interpolator="@android:interpolator/fast_out_slow_in">
+                <objectAnimator
+                    android:propertyName="pathData"
+                    android:valueFrom="@string/path_share_dots"
+                    android:valueTo="@string/path_share_dots_collapsed"
+                    android:duration="@integer/share_duration_collapse"
+                    android:valueType="pathType" />
+                <objectAnimator
+                    android:propertyName="pathData"
+                    android:valueFrom="@string/path_share_dots_collapsed"
+                    android:valueTo="@string/path_share_dots_mid_expand"
+                    android:startOffset="@integer/share_delay_start_expand"
+                    android:duration="@integer/share_duration_mid_expand"
+                    android:valueType="pathType" />
+                <objectAnimator
+                    android:propertyName="pathData"
+                    android:valueFrom="@string/path_share_dots_mid_expand"
+                    android:valueTo="@string/path_share_dots"
+                    android:startOffset="@integer/share_delay_full_expand"
+                    android:duration="@integer/share_duration_full_expand"
+                    android:valueType="pathType" />
+            </set>
+        </aapt:attr>
+    </target>
+
+    <target android:name="@string/name_lines">
+        <aapt:attr name="android:animation">
+            <set
+                xmlns:android="http://schemas.android.com/apk/res/android"
+                android:interpolator="@android:interpolator/fast_out_slow_in">
+                <objectAnimator
+                    android:propertyName="pathData"
+                    android:valueFrom="@string/path_share_lines"
+                    android:valueTo="@string/path_share_lines_collapsed"
+                    android:duration="@integer/share_duration_collapse"
+                    android:valueType="pathType" />
+                <objectAnimator
+                    android:propertyName="pathData"
+                    android:valueFrom="@string/path_share_lines_collapsed"
+                    android:valueTo="@string/path_share_lines_mid_expand"
+                    android:startOffset="@integer/share_delay_start_expand"
+                    android:duration="@integer/share_duration_mid_expand"
+                    android:valueType="pathType" />
+                <objectAnimator
+                    android:propertyName="pathData"
+                    android:valueFrom="@string/path_share_lines_mid_expand"
+                    android:valueTo="@string/path_share_lines"
+                    android:startOffset="@integer/share_delay_full_expand"
+                    android:duration="@integer/share_duration_full_expand"
+                    android:valueType="pathType" />
+            </set>
+        </aapt:attr>
+    </target>
 
 </animated-vector>
diff --git a/app/src/main/res/drawable/avd_shots.xml b/app/src/main/res/drawable/avd_shots.xml
index 55bc2aa82..9151c5fdb 100644
--- a/app/src/main/res/drawable/avd_shots.xml
+++ b/app/src/main/res/drawable/avd_shots.xml
@@ -17,14 +17,99 @@
 
 <animated-vector
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
     android:drawable="@drawable/ic_images">
 
-    <target
-        android:name="image"
-        android:animation="@animator/shots_below_morph" />
+    <target android:name="image">
+        <aapt:attr name="android:animation">
+            <set android:interpolator="@android:interpolator/linear">
+                <objectAnimator
+                    android:propertyName="pathData"
+                    android:valueFrom="@string/path_image_mountains"
+                    android:valueTo="@string/path_image_arrow_up"
+                    android:duration="300"
+                    android:valueType="pathType" />
+                <objectAnimator
+                    android:propertyName="pathData"
+                    android:valueFrom="@string/path_image_arrow_down"
+                    android:valueTo="@string/path_image_mountains"
+                    android:startOffset="1000"
+                    android:duration="300"
+                    android:valueType="pathType" />
+            </set>
+        </aapt:attr>
+    </target>
 
-    <target
-        android:name="image_group"
-        android:animation="@animator/shots_below_move" />
+    <target android:name="image_group">
+        <aapt:attr name="android:animation">
+            <set android:interpolator="@android:interpolator/fast_out_slow_in">
+                <!-- move up, scale down and rotate while the path is morphing -->
+                <objectAnimator
+                    android:propertyName="translateY"
+                    android:valueFrom="0"
+                    android:valueTo="-3"
+                    android:duration="250" />
+                <objectAnimator
+                    android:propertyName="scaleX"
+                    android:valueFrom="1"
+                    android:valueTo="0.8"
+                    android:duration="250" />
+                <objectAnimator
+                    android:propertyName="scaleY"
+                    android:valueFrom="1"
+                    android:valueTo="0.8"
+                    android:duration="250" />
+                <objectAnimator
+                    android:propertyName="rotation"
+                    android:valueFrom="0"
+                    android:valueTo="-180"
+                    android:duration="250" />
+
+                <!-- move the arrow down & restore scale -->
+                <objectAnimator
+                    android:propertyName="translateY"
+                    android:valueFrom="-3"
+                    android:valueTo="0"
+                    android:startOffset="250"
+                    android:duration="150" />
+                <objectAnimator
+                    android:propertyName="scaleX"
+                    android:valueFrom="0.8"
+                    android:valueTo="1"
+                    android:startOffset="250"
+                    android:duration="150" />
+                <objectAnimator
+                    android:propertyName="scaleY"
+                    android:valueFrom="0.8"
+                    android:valueTo="1"
+                    android:startOffset="250"
+                    android:duration="150" />
+
+                <!-- bounce back up -->
+                <objectAnimator
+                    android:propertyName="translateY"
+                    android:valueFrom="0"
+                    android:valueTo="-2"
+                    android:startOffset="400"
+                    android:duration="150" />
+                <!-- bounce down -->
+                <objectAnimator
+                    android:propertyName="translateY"
+                    android:valueFrom="-2"
+                    android:valueTo="0"
+                    android:startOffset="550"
+                    android:duration="150" />
+
+                <!-- instantaneously restore the rotation in preparation for the morph
+                     back from arrow to the standard icon -->
+                <objectAnimator
+                    android:propertyName="rotation"
+                    android:valueFrom="-180"
+                    android:valueTo="0"
+                    android:startOffset="1000"
+                    android:duration="0" />
+            </set>
+        </aapt:attr>
+    </target>
 
 </animated-vector>
diff --git a/app/src/main/res/drawable/avd_views.xml b/app/src/main/res/drawable/avd_views.xml
index 363e4352c..ce29f1114 100644
--- a/app/src/main/res/drawable/avd_views.xml
+++ b/app/src/main/res/drawable/avd_views.xml
@@ -17,10 +17,61 @@
 
 <animated-vector
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:drawable="@drawable/ic_views">
+    xmlns:aapt="http://schemas.android.com/aapt">
 
-    <target
-        android:name="pupil"
-        android:animation="@animator/look_around" />
+    <aapt:attr name="android:drawable">
+        <vector
+            android:width="24dp"
+            android:height="24dp"
+            android:viewportHeight="24"
+            android:viewportWidth="24">
+            <path
+                android:name="eye"
+                android:pathData="M12,4.5 C7,4.5 2.73,7.61 1,12 C2.73,16.39 7,19.5 12,19.5 C17,19.5 21.27,16.39 23,12 C21.27,7.61 17,4.5 12,4.5 Z M12,17 C9.24,17 7,14.76 7,12 C7,9.24 9.24,7 12,7 C14.76,7 17,9.24 17,12 C17,14.76 14.76,17 12,17 Z"
+                android:fillColor="@color/inline_action_icon" />
+            <group android:name="pupil">
+                <path
+                    android:pathData="M12,9 C10.34,9 9,10.34 9,12 C9,13.66 10.34,15 12,15 C13.66,15 15,13.66 15,12 C15,10.34 13.66,9 12,9 L12,9 Z"
+                    android:fillColor="@color/inline_action_icon" />
+            </group>
+        </vector>
+    </aapt:attr>
+
+    <target android:name="pupil">
+        <aapt:attr name="android:animation">
+            <set
+                xmlns:android="http://schemas.android.com/apk/res/android"
+                android:interpolator="@android:interpolator/fast_out_slow_in">
+                <objectAnimator
+                    android:propertyName="translateX"
+                    android:valueFrom="0"
+                    android:valueTo="2"
+                    android:duration="150" />
+                <objectAnimator
+                    android:propertyName="translateY"
+                    android:valueFrom="0"
+                    android:valueTo="-2"
+                    android:duration="100" />
+                <objectAnimator
+                    android:propertyName="translateX"
+                    android:valueFrom="2"
+                    android:valueTo="-2"
+                    android:startOffset="800"
+                    android:duration="150" />
+                <objectAnimator
+                    android:propertyName="translateX"
+                    android:valueFrom="-2"
+                    android:valueTo="0"
+                    android:startOffset="1800"
+                    android:duration="150" />
+                <objectAnimator
+                    android:propertyName="translateY"
+                    android:valueFrom="-2"
+                    android:valueTo="0"
+                    android:startOffset="1800"
+                    android:duration="100" />
+            </set>
+        </aapt:attr>
+    </target>
 
 </animated-vector>
diff --git a/app/src/main/res/drawable/ic_followers.xml b/app/src/main/res/drawable/ic_followers.xml
deleted file mode 100644
index 581ba75a0..000000000
--- a/app/src/main/res/drawable/ic_followers.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright 2016 Google Inc.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
-
-    <group android:name="righty">
-
-        <path
-            android:fillColor="@color/inline_action_icon"
-            android:pathData="M17,11.999C14.339,11.999 9.006,13.559 9.006,16.667L9.006,20.001L24.994,20.001L24.994,16.667C24.994,13.559 19.661,11.999 17,11.999L17,11.999Z"
-            android:strokeColor="@color/background_light"
-            android:strokeWidth="2"/>
-        <path
-            android:fillColor="@color/inline_action_icon"
-            android:pathData="M17.002,12.004C19.217,12.004 20.992,10.216 20.992,8C20.992,5.784 19.217,3.996 17.002,3.996C14.786,3.996 12.998,5.784 12.998,8C12.998,10.216 14.786,12.004 17.002,12.004L17.002,12.004Z"
-            android:strokeColor="@color/background_light"
-            android:strokeWidth="2"/>
-
-    </group>
-
-    <group android:name="lefty">
-
-        <path
-            android:fillColor="@color/inline_action_icon"
-            android:pathData="M9,11.999C6.339,11.999 1.006,13.559 1.006,16.667L1.006,20.001L16.994,20.001L16.994,16.667C16.994,13.559 11.661,11.999 9,11.999L9,11.999Z"
-            android:strokeColor="@color/background_light"
-            android:strokeWidth="2"/>
-        <path
-            android:fillColor="@color/inline_action_icon"
-            android:pathData="M9.002,12.004C11.217,12.004 12.992,10.216 12.992,8C12.992,5.784 11.217,3.996 9.002,3.996C6.786,3.996 4.998,5.784 4.998,8C4.998,10.216 6.786,12.004 9.002,12.004L9.002,12.004Z"
-            android:strokeColor="@color/background_light"
-            android:strokeWidth="2"/>
-
-    </group>
-
-</vector>
diff --git a/app/src/main/res/drawable/ic_heart_full_24dp_grey.xml b/app/src/main/res/drawable/ic_heart_full_24dp_grey.xml
deleted file mode 100644
index b021ef6f5..000000000
--- a/app/src/main/res/drawable/ic_heart_full_24dp_grey.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright 2015 Google Inc.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
-    <group
-        android:name="heart"
-        android:pivotX="12"
-        android:pivotY="12">
-
-        <path
-            android:pathData="@string/heart_full_path_24dp"
-            android:fillColor="@color/inline_action_icon" />
-
-    </group>
-
-</vector>
diff --git a/app/src/main/res/drawable/ic_share_avd.xml b/app/src/main/res/drawable/ic_share_avd.xml
deleted file mode 100644
index c810fe3e9..000000000
--- a/app/src/main/res/drawable/ic_share_avd.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright 2016 Google Inc.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
-
-    <path
-        android:name="@string/name_dots"
-        android:pathData="@string/path_share_dots"
-        android:fillColor="@color/inline_action_icon" />
-
-    <path
-        android:name="@string/name_lines"
-        android:pathData="@string/path_share_lines"
-        android:strokeColor="@color/inline_action_icon"
-        android:strokeLineCap="square"
-        android:strokeWidth="2" />
-
-</vector>
diff --git a/app/src/main/res/drawable/ic_views.xml b/app/src/main/res/drawable/ic_views.xml
deleted file mode 100644
index 9cc380137..000000000
--- a/app/src/main/res/drawable/ic_views.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright 2016 Google Inc.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
-
-    <path
-        android:name="eye"
-        android:pathData="M12,4.5 C7,4.5 2.73,7.61 1,12 C2.73,16.39 7,19.5 12,19.5 C17,19.5 21.27,16.39 23,12 C21.27,7.61 17,4.5 12,4.5 Z M12,17 C9.24,17 7,14.76 7,12 C7,9.24 9.24,7 12,7 C14.76,7 17,9.24 17,12 C17,14.76 14.76,17 12,17 Z"
-        android:fillColor="@color/inline_action_icon" />
-
-    <group android:name="pupil">
-
-        <path
-            android:pathData="M12,9 C10.34,9 9,10.34 9,12 C9,13.66 10.34,15 12,15 C13.66,15 15,13.66 15,12 C15,10.34 13.66,9 12,9 L12,9 Z"
-            android:fillColor="@color/inline_action_icon" />
-
-    </group>
-
-</vector>