diff --git a/.changeset/friendly-dolls-raise.md b/.changeset/friendly-dolls-raise.md
new file mode 100644
index 00000000000..e8504c217f4
--- /dev/null
+++ b/.changeset/friendly-dolls-raise.md
@@ -0,0 +1,5 @@
+---
+"@spectrum-css/avatar": major
+---
+
+Adds support for new avatar-size tokens (avatar-size-800 to avatar-size-1500). Updates avatar component story to support new sizes. Adds support for avatar-border-color and avatar-border-thickness.
diff --git a/components/avatar/index.css b/components/avatar/index.css
index f26642d850f..abe36531cef 100644
--- a/components/avatar/index.css
+++ b/components/avatar/index.css
@@ -17,8 +17,8 @@ governing permissions and limitations under the License.
 	--spectrum-avatar-block-size: var(--spectrum-avatar-size-100);
 
 	--spectrum-avatar-border-radius: var(--spectrum-avatar-block-size);
-	--spectrum-avatar-border-thickness: var(--spectrum-avatar-border-thickness);
-	--spectrum-avatar-border-color: var(--spectrum-avatar-border-color);
+	--spectrum-avatar-border-thickness: var(--spectrum-avatar-border-width);
+	--spectrum-avatar-border-color: rgb(var(--spectrum-gray-25-rgb));
 
 	--spectrum-avatar-focus-indicator-thickness: var(--spectrum-focus-indicator-thickness);
 	--spectrum-avatar-focus-indicator-gap: var(--spectrum-focus-indicator-gap);