diff --git a/interface/resources/icons/checkmark-stroke.svg b/interface/resources/icons/checkmark-stroke.svg
new file mode 100644
index 0000000000..cc343c421b
--- /dev/null
+++ b/interface/resources/icons/checkmark-stroke.svg
@@ -0,0 +1,4 @@
+<svg width="149" height="150" viewBox="0 0 149 150" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M74.3055 0C115.543 0 149 33.5916 149 74.6047C149 116.008 115.543 149.6 74.3055 149.6C33.4569 149.6 0 116.008 0 74.6047C0 33.5916 33.4569 0 74.3055 0ZM74.3055 139.054C109.708 139.054 138.496 110.149 138.496 74.6047C138.496 39.4507 109.708 10.5462 74.3055 10.5462C39.2924 10.5462 10.5039 39.4507 10.5039 74.6047C10.5039 110.149 39.2924 139.054 74.3055 139.054Z" fill="#1FC6A6"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M65.3575 89.8376L106.595 43.3562C110.874 38.2784 119.044 45.3092 114.376 50.387L70.0259 100.384C68.0807 102.727 64.9684 102.727 63.0233 101.165L35.0128 78.9008C29.9554 74.6042 36.569 66.4016 41.6264 70.6982L65.3575 89.8376Z" fill="#1FC6A6"/>
+</svg>
diff --git a/interface/resources/icons/loader-snake-256-wf.gif b/interface/resources/icons/loader-snake-256-wf.gif
new file mode 100644
index 0000000000..c0d5eec1ef
Binary files /dev/null and b/interface/resources/icons/loader-snake-256-wf.gif differ
diff --git a/interface/resources/icons/loader-snake-256.gif b/interface/resources/icons/loader-snake-256.gif
new file mode 100644
index 0000000000..ebcbf54bd7
Binary files /dev/null and b/interface/resources/icons/loader-snake-256.gif differ
diff --git a/interface/resources/qml/hifi/avatarPackager/AvatarProject.qml b/interface/resources/qml/hifi/avatarPackager/AvatarProject.qml
index d4a67f31fb..babe3cda84 100644
--- a/interface/resources/qml/hifi/avatarPackager/AvatarProject.qml
+++ b/interface/resources/qml/hifi/avatarPackager/AvatarProject.qml
@@ -25,6 +25,8 @@ Item {
     anchors.fill: parent
     anchors.margins: 10
 
+    function reset() { hasSuccessfullyUploaded = false }
+
     property var footer: Item {
         anchors.fill: parent
 
@@ -41,10 +43,10 @@ Item {
 
                 visible: !AvatarPackagerCore.currentAvatarProject.fst.hasMarketplaceID && !root.hasSuccessfullyUploaded
                 enabled: Account.loggedIn
-                //width: parent.width
-                //anchors.bottom: parent.bottom
+
                 anchors.verticalCenter: parent.verticalCenter
                 anchors.right: parent.right
+
                 text: qsTr("Upload")
                 color: hifi.buttons.blue
                 colorScheme: root.colorScheme
@@ -130,6 +132,8 @@ Item {
 
                 width: 28
                 height: 28
+
+                white: true
             }
             RalewayRegular {
                 id: stepText
diff --git a/interface/resources/qml/hifi/avatarPackager/AvatarProjectCard.qml b/interface/resources/qml/hifi/avatarPackager/AvatarProjectCard.qml
index be1363850e..e31115efe5 100644
--- a/interface/resources/qml/hifi/avatarPackager/AvatarProjectCard.qml
+++ b/interface/resources/qml/hifi/avatarPackager/AvatarProjectCard.qml
@@ -78,6 +78,7 @@ Item {
             hoverEnabled: true
             onClicked: {
                 AvatarPackagerCore.openAvatarProject(path.text);
+                avatarProject.reset();
                 avatarPackager.state = "project";
             }
         }
diff --git a/interface/resources/qml/hifi/avatarPackager/AvatarProjectUpload.qml b/interface/resources/qml/hifi/avatarPackager/AvatarProjectUpload.qml
index e71d8a4f2f..f02dc5a218 100644
--- a/interface/resources/qml/hifi/avatarPackager/AvatarProjectUpload.qml
+++ b/interface/resources/qml/hifi/avatarPackager/AvatarProjectUpload.qml
@@ -72,7 +72,7 @@ Item {
                 }
             ]
 
-            LoadingCircle {
+            AnimatedImage {
                 id: uploadSpinner
 
                 visible: true
@@ -81,6 +81,12 @@ Item {
                     horizontalCenter: parent.horizontalCenter
                     verticalCenter: parent.verticalCenter
                 }
+
+                width: 164
+                height: 164
+
+                source: "../../../icons/loader-snake-256.gif"
+                playing: true
             }
 
             HiFiGlyphs {
@@ -94,23 +100,22 @@ Item {
                 }
 
                 size: 164
-                text: "w"
+                text: "+"
                 color: "#EA4C5F"
             }
 
-            HiFiGlyphs {
+            Image {
                 id: successIcon
 
                 visible: false
 
-                anchors {
-                    horizontalCenter: parent.horizontalCenter
-                    verticalCenter: parent.verticalCenter
-                }
+                anchors.verticalCenter: parent.verticalCenter
+                anchors.horizontalCenter: parent.horizontalCenter
 
-                size: 164
-                text: "\ue01a"
-                color: "#1FC6A6"
+                width: 148
+                height: 148
+
+                source: "../../../icons/checkmark-stroke.svg"
             }
         }
         Item {
diff --git a/interface/resources/qml/hifi/avatarPackager/AvatarUploadStatusItem.qml b/interface/resources/qml/hifi/avatarPackager/AvatarUploadStatusItem.qml
index d93afbd4e8..ca01e453e9 100644
--- a/interface/resources/qml/hifi/avatarPackager/AvatarUploadStatusItem.qml
+++ b/interface/resources/qml/hifi/avatarPackager/AvatarUploadStatusItem.qml
@@ -42,7 +42,7 @@ Item {
         width: 48
         height: parent.height
 
-        AnimatedImage {
+        LoadingCircle {
             id: runningImage
 
             visible: false
@@ -52,22 +52,19 @@ Item {
 
             width: 32
             height: 32
-
-            source: "../../../icons/loader-snake-64-w.gif"
-            playing: false
         }
-        HiFiGlyphs {
+        Image {
             id: successGlyph
 
             visible: false
 
-            width: implicitWidth
             anchors.verticalCenter: parent.verticalCenter
             anchors.horizontalCenter: parent.horizontalCenter
 
-            size: 48
-            text: "\ue01a"
-            color: "#1FC6A6"
+            width: 30
+            height: 30
+
+            source: "../../../icons/checkmark-stroke.svg"
         }
         HiFiGlyphs {
             id: failGlyph
diff --git a/interface/resources/qml/hifi/avatarPackager/LoadingCircle.qml b/interface/resources/qml/hifi/avatarPackager/LoadingCircle.qml
index f6ba81a96f..a1fac72ae4 100644
--- a/interface/resources/qml/hifi/avatarPackager/LoadingCircle.qml
+++ b/interface/resources/qml/hifi/avatarPackager/LoadingCircle.qml
@@ -3,18 +3,14 @@ import QtQuick.Controls 2.2
 import QtQuick.Layouts 1.3
 import QtGraphicalEffects 1.0
 
-Image {
+AnimatedImage {
     id: root
 
     width: 128
     height: 128
 
-    source: "../../../images/loader-snake-128.png"
+    property bool white: false
 
-    RotationAnimation on rotation {
-        duration: 2000
-        loops: Animation.Infinite
-        from: 0
-        to: 360
-    }
-}
\ No newline at end of file
+    source: white ? "../../../icons/loader-snake-256-wf.gif" : "../../../icons/loader-snake-256.gif"
+    playing: true
+}