diff --git a/library/src/main/res/drawable/feedback_info_o2_new.xml b/library/src/main/res/drawable/feedback_info_o2_new.xml
new file mode 100644
index 000000000..1423f987f
--- /dev/null
+++ b/library/src/main/res/drawable/feedback_info_o2_new.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="64dp"
+    android:height="64dp"
+    android:viewportWidth="64"
+    android:viewportHeight="64">
+    <path
+        android:fillColor="?colorBrand"
+        android:pathData="M32 49.1392C30.7456 49.1392 29.7088 48.1152 29.7088 46.848V25.1392C29.7088 23.8848 30.7328 22.848 32 22.848C33.2544 22.848 34.2912 23.872 34.2912 25.1392V46.848C34.2912 48.1152 33.2544 49.1392 32 49.1392Z" />
+    <path
+        android:fillColor="?colorBrand"
+        android:pathData="M32 19.4304C33.5764 19.4304 34.8544 18.1524 34.8544 16.576C34.8544 14.9996 33.5764 13.7216 32 13.7216C30.4236 13.7216 29.1456 14.9996 29.1456 16.576C29.1456 18.1524 30.4236 19.4304 32 19.4304Z" />
+    <path
+        android:fillColor="?colorBrand"
+        android:pathData="M0 32C0 49.6 14.4 64 32 64C49.6 64 64 49.6 64 32C64 14.4 49.6 0 32 0C14.4 0 0 14.4 0 32ZM4.5696 32C4.5696 16.9088 16.9088 4.5696 32 4.5696C47.0912 4.5696 59.4304 16.9088 59.4304 32C59.4304 47.0912 47.0912 59.4304 32 59.4304C16.9088 59.4304 4.5696 47.0912 4.5696 32Z" />
+</vector>
\ No newline at end of file
diff --git a/library/src/main/res/raw/feedback_error_o2_new.json b/library/src/main/res/raw/feedback_error_o2_new.json
new file mode 100644
index 000000000..f07af56f8
--- /dev/null
+++ b/library/src/main/res/raw/feedback_error_o2_new.json
@@ -0,0 +1,317 @@
+{
+  "v": "4.8.0",
+  "meta": { "g": "LottieFiles AE 3.5.3", "a": "", "k": "", "d": "", "tc": "" },
+  "fr": 30,
+  "ip": 0,
+  "op": 56,
+  "w": 80,
+  "h": 64,
+  "nm": "O2New Error - Alternative",
+  "ddd": 0,
+  "assets": [
+    {
+      "id": "comp_0",
+      "layers": [
+        {
+          "ddd": 0,
+          "ind": 1,
+          "ty": 4,
+          "nm": "Alternative 2",
+          "sr": 1,
+          "ks": {
+            "o": { "a": 0, "k": 100, "ix": 11 },
+            "r": { "a": 0, "k": 0, "ix": 10 },
+            "p": {
+              "a": 1,
+              "k": [
+                {
+                  "i": { "x": 0.833, "y": 0.833 },
+                  "o": { "x": 0.167, "y": 0.167 },
+                  "t": 15,
+                  "s": [32, 32, 0],
+                  "to": [0, 0, 0],
+                  "ti": [0, 0, 0]
+                },
+                {
+                  "i": { "x": 0.833, "y": 0.833 },
+                  "o": { "x": 0.167, "y": 0.167 },
+                  "t": 16,
+                  "s": [29.5, 32, 0],
+                  "to": [0, 0, 0],
+                  "ti": [0, 0, 0]
+                },
+                {
+                  "i": { "x": 0.833, "y": 0.833 },
+                  "o": { "x": 0.167, "y": 0.167 },
+                  "t": 17,
+                  "s": [34.5, 32, 0],
+                  "to": [0, 0, 0],
+                  "ti": [0, 0, 0]
+                },
+                { "t": 18, "s": [32, 32, 0] }
+              ],
+              "ix": 2,
+              "x": "var $bm_rt;\nvar n, n, t, t, v, amp, freq, decay;\n$bm_rt = n = 0;\nif (numKeys > 0) {\n    $bm_rt = n = nearestKey(time).index;\n    if (key(n).time > time) {\n        n--;\n    }\n}\nif (n == 0) {\n    $bm_rt = t = 0;\n} else {\n    $bm_rt = t = $bm_sub(time, key(n).time);\n}\nif (n > 0 && t < 1) {\n    v = velocityAtTime($bm_sub(key(n).time, $bm_div(thisComp.frameDuration, 10)));\n    amp = 0.05;\n    freq = 4;\n    decay = 8;\n    $bm_rt = $bm_sum(value, $bm_div($bm_mul($bm_mul(v, amp), Math.sin($bm_mul($bm_mul($bm_mul(freq, t), 2), Math.PI))), Math.exp($bm_mul(decay, t))));\n} else {\n    $bm_rt = value;\n}"
+            },
+            "a": { "a": 0, "k": [0, 5, 0], "ix": 1 },
+            "s": {
+              "a": 1,
+              "k": [
+                {
+                  "i": { "x": [0.245, 0.245, 0.667], "y": [1, 1, 1] },
+                  "o": { "x": [0.763, 0.763, 0.333], "y": [0, 0, 0] },
+                  "t": 9,
+                  "s": [0, 0, 100]
+                },
+                { "t": 16, "s": [100, 100, 100] }
+              ],
+              "ix": 6
+            }
+          },
+          "ao": 0,
+          "shapes": [
+            {
+              "ind": 0,
+              "ty": "sh",
+              "ix": 1,
+              "ks": {
+                "a": 0,
+                "k": {
+                  "i": [
+                    [1.254, 0],
+                    [0, -1.267],
+                    [0, 0],
+                    [-1.267, 0],
+                    [0, 1.267],
+                    [0, 0]
+                  ],
+                  "o": [
+                    [-1.254, 0],
+                    [0, 0],
+                    [0, 1.254],
+                    [1.254, 0],
+                    [0, 0],
+                    [0, -1.267]
+                  ],
+                  "v": [
+                    [0, -13.146],
+                    [-2.291, -10.854],
+                    [-2.291, 10.854],
+                    [0, 13.146],
+                    [2.291, 10.854],
+                    [2.291, -10.854]
+                  ],
+                  "c": true
+                },
+                "ix": 2
+              },
+              "nm": "Trazado 1",
+              "mn": "ADBE Vector Shape - Group",
+              "hd": false
+            },
+            {
+              "ind": 1,
+              "ty": "sh",
+              "ix": 2,
+              "ks": {
+                "a": 0,
+                "k": {
+                  "i": [
+                    [-1.577, 0],
+                    [0, -1.576],
+                    [1.577, 0],
+                    [0, 1.577]
+                  ],
+                  "o": [
+                    [1.577, 0],
+                    [0, 1.577],
+                    [-1.577, 0],
+                    [0, -1.576]
+                  ],
+                  "v": [
+                    [0.021, 17.708],
+                    [2.875, 20.562],
+                    [0.021, 23.417],
+                    [-2.834, 20.562]
+                  ],
+                  "c": true
+                },
+                "ix": 2
+              },
+              "nm": "Trazado 2",
+              "mn": "ADBE Vector Shape - Group",
+              "hd": false
+            },
+            {
+              "ty": "fl",
+              "c": {
+                "a": 0,
+                "k": [0.921568627451, 0.235294117647, 0.490196078431, 1],
+                "ix": 4
+              },
+              "o": { "a": 0, "k": 100, "ix": 5 },
+              "r": 1,
+              "bm": 0,
+              "nm": "Relleno 1",
+              "mn": "ADBE Vector Graphic - Fill",
+              "hd": false
+            }
+          ],
+          "ip": 9,
+          "op": 63,
+          "st": 12,
+          "bm": 0
+        },
+        {
+          "ddd": 0,
+          "ind": 5,
+          "ty": 4,
+          "nm": "Capa de formas 2",
+          "sr": 1,
+          "ks": {
+            "o": { "a": 0, "k": 100, "ix": 11 },
+            "r": { "a": 0, "k": 180, "ix": 10 },
+            "p": { "a": 0, "k": [32, 32, 0], "ix": 2 },
+            "a": { "a": 0, "k": [0, 0, 0], "ix": 1 },
+            "s": { "a": 0, "k": [94, 94, 100], "ix": 6 }
+          },
+          "ao": 0,
+          "shapes": [
+            {
+              "ty": "gr",
+              "it": [
+                {
+                  "d": 1,
+                  "ty": "el",
+                  "s": { "a": 0, "k": [62, 62], "ix": 2 },
+                  "p": { "a": 0, "k": [0, 0], "ix": 3 },
+                  "nm": "Trazado elíptico 1",
+                  "mn": "ADBE Vector Shape - Ellipse",
+                  "hd": false
+                },
+                {
+                  "ty": "st",
+                  "c": {
+                    "a": 0,
+                    "k": [0.921568627451, 0.235294117647, 0.490196078431, 1],
+                    "ix": 3
+                  },
+                  "o": { "a": 0, "k": 100, "ix": 4 },
+                  "w": { "a": 0, "k": 4, "ix": 5 },
+                  "lc": 2,
+                  "lj": 1,
+                  "ml": 4,
+                  "bm": 0,
+                  "nm": "Trazo 1",
+                  "mn": "ADBE Vector Graphic - Stroke",
+                  "hd": false
+                },
+                {
+                  "ty": "tr",
+                  "p": { "a": 0, "k": [0, 0], "ix": 2 },
+                  "a": { "a": 0, "k": [0, 0], "ix": 1 },
+                  "s": { "a": 0, "k": [100, 100], "ix": 3 },
+                  "r": { "a": 0, "k": 0, "ix": 6 },
+                  "o": { "a": 0, "k": 100, "ix": 7 },
+                  "sk": { "a": 0, "k": 0, "ix": 4 },
+                  "sa": { "a": 0, "k": 0, "ix": 5 },
+                  "nm": "Transform"
+                }
+              ],
+              "nm": "Elipse 1",
+              "np": 3,
+              "cix": 2,
+              "bm": 0,
+              "ix": 1,
+              "mn": "ADBE Vector Group",
+              "hd": false
+            },
+            {
+              "ty": "tm",
+              "s": { "a": 0, "k": 0, "ix": 1 },
+              "e": {
+                "a": 1,
+                "k": [
+                  {
+                    "i": { "x": [0.236], "y": [1] },
+                    "o": { "x": [0.753], "y": [0] },
+                    "t": 0,
+                    "s": [0]
+                  },
+                  { "t": 15, "s": [100] }
+                ],
+                "ix": 2
+              },
+              "o": { "a": 0, "k": -34, "ix": 3 },
+              "m": 1,
+              "ix": 2,
+              "nm": "Recortar trazados 1",
+              "mn": "ADBE Vector Filter - Trim",
+              "hd": false
+            }
+          ],
+          "ip": 0,
+          "op": 61,
+          "st": 0,
+          "bm": 0
+        }
+      ]
+    }
+  ],
+  "layers": [
+    {
+      "ddd": 0,
+      "ind": 1,
+      "ty": 0,
+      "nm": "O2New Error",
+      "refId": "comp_0",
+      "sr": 1,
+      "ks": {
+        "o": { "a": 0, "k": 100, "ix": 11 },
+        "r": { "a": 0, "k": 0, "ix": 10 },
+        "p": {
+          "a": 1,
+          "k": [
+            {
+              "i": { "x": 0.833, "y": 0.833 },
+              "o": { "x": 0.167, "y": 0.167 },
+              "t": 14,
+              "s": [40, 32, 0],
+              "to": [0, 0, 0],
+              "ti": [0, 0, 0]
+            },
+            {
+              "i": { "x": 0.833, "y": 0.833 },
+              "o": { "x": 0.167, "y": 0.167 },
+              "t": 16,
+              "s": [37, 32, 0],
+              "to": [0, 0, 0],
+              "ti": [0, 0, 0]
+            },
+            {
+              "i": { "x": 0.833, "y": 0.833 },
+              "o": { "x": 0.167, "y": 0.167 },
+              "t": 18,
+              "s": [45.831, 32, 0],
+              "to": [0, 0, 0],
+              "ti": [0, 0, 0]
+            },
+            { "t": 20, "s": [40, 32, 0] }
+          ],
+          "ix": 2,
+          "x": "var $bm_rt;\nvar n, n, t, t, v, amp, freq, decay;\n$bm_rt = n = 0;\nif (numKeys > 0) {\n    $bm_rt = n = nearestKey(time).index;\n    if (key(n).time > time) {\n        n--;\n    }\n}\nif (n == 0) {\n    $bm_rt = t = 0;\n} else {\n    $bm_rt = t = $bm_sub(time, key(n).time);\n}\nif (n > 0 && t < 1) {\n    v = velocityAtTime($bm_sub(key(n).time, $bm_div(thisComp.frameDuration, 10)));\n    amp = 0.05;\n    freq = 4;\n    decay = 8;\n    $bm_rt = $bm_sum(value, $bm_div($bm_mul($bm_mul(v, amp), Math.sin($bm_mul($bm_mul($bm_mul(freq, t), 2), Math.PI))), Math.exp($bm_mul(decay, t))));\n} else {\n    $bm_rt = value;\n}"
+        },
+        "a": { "a": 0, "k": [32, 32, 0], "ix": 1 },
+        "s": { "a": 0, "k": [100, 100, 100], "ix": 6 }
+      },
+      "ao": 0,
+      "w": 64,
+      "h": 64,
+      "ip": 0,
+      "op": 150,
+      "st": 0,
+      "bm": 0
+    }
+  ],
+  "markers": []
+}
diff --git a/library/src/main/res/raw/feedback_success_o2_new.json b/library/src/main/res/raw/feedback_success_o2_new.json
new file mode 100644
index 000000000..0b23b7a5a
--- /dev/null
+++ b/library/src/main/res/raw/feedback_success_o2_new.json
@@ -0,0 +1,203 @@
+{
+  "v": "4.8.0",
+  "meta": { "g": "LottieFiles AE 3.5.3", "a": "", "k": "", "d": "", "tc": "" },
+  "fr": 30,
+  "ip": 0,
+  "op": 59,
+  "w": 64,
+  "h": 64,
+  "nm": "O2New Success",
+  "ddd": 0,
+  "assets": [],
+  "layers": [
+    {
+      "ddd": 0,
+      "ind": 1,
+      "ty": 4,
+      "nm": "Capa de formas 4",
+      "sr": 1,
+      "ks": {
+        "o": {
+          "a": 1,
+          "k": [
+            {
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
+              "t": 10,
+              "s": [0]
+            },
+            { "t": 15, "s": [100] }
+          ],
+          "ix": 11
+        },
+        "r": { "a": 0, "k": 0, "ix": 10 },
+        "p": { "a": 0, "k": [32, 32, 0], "ix": 2 },
+        "a": { "a": 0, "k": [0, 0, 0], "ix": 1 },
+        "s": { "a": 0, "k": [100, 100, 100], "ix": 6 }
+      },
+      "ao": 0,
+      "shapes": [
+        {
+          "ind": 0,
+          "ty": "sh",
+          "ix": 1,
+          "ks": {
+            "a": 0,
+            "k": {
+              "i": [
+                [0, 0],
+                [0, 0],
+                [0, 0]
+              ],
+              "o": [
+                [0, 0],
+                [0, 0],
+                [0, 0]
+              ],
+              "v": [
+                [-14.316, 0.249],
+                [-4.447, 10.289],
+                [17.504, -11.07]
+              ],
+              "c": false
+            },
+            "ix": 2
+          },
+          "nm": "Trazado 1",
+          "mn": "ADBE Vector Shape - Group",
+          "hd": false
+        },
+        {
+          "ty": "tm",
+          "s": {
+            "a": 1,
+            "k": [
+              {
+                "i": { "x": [0.187], "y": [1] },
+                "o": { "x": [0.813], "y": [0] },
+                "t": 10,
+                "s": [0]
+              },
+              { "t": 25, "s": [100] }
+            ],
+            "ix": 1
+          },
+          "e": { "a": 0, "k": 0, "ix": 2 },
+          "o": { "a": 0, "k": 0, "ix": 3 },
+          "m": 1,
+          "ix": 2,
+          "nm": "Recortar trazados 1",
+          "mn": "ADBE Vector Filter - Trim",
+          "hd": false
+        },
+        {
+          "ty": "st",
+          "c": { "a": 0, "k": [1, 1, 1, 1], "ix": 3 },
+          "o": { "a": 0, "k": 100, "ix": 4 },
+          "w": { "a": 0, "k": 4, "ix": 5 },
+          "lc": 2,
+          "lj": 1,
+          "ml": 4,
+          "bm": 0,
+          "nm": "Trazo 1",
+          "mn": "ADBE Vector Graphic - Stroke",
+          "hd": false
+        }
+      ],
+      "ip": 10,
+      "op": 78.2,
+      "st": 17,
+      "bm": 0
+    },
+    {
+      "ddd": 0,
+      "ind": 2,
+      "ty": 4,
+      "nm": "Capa de formas 2",
+      "sr": 1,
+      "ks": {
+        "o": { "a": 0, "k": 100, "ix": 11 },
+        "r": { "a": 0, "k": 0, "ix": 10 },
+        "p": { "a": 0, "k": [32, 32, 0], "ix": 2 },
+        "a": { "a": 0, "k": [0, 0, 0], "ix": 1 },
+        "s": { "a": 0, "k": [94, 94, 100], "ix": 6 }
+      },
+      "ao": 0,
+      "shapes": [
+        {
+          "ty": "gr",
+          "it": [
+            {
+              "d": 1,
+              "ty": "el",
+              "s": { "a": 0, "k": [62, 62], "ix": 2 },
+              "p": { "a": 0, "k": [0, 0], "ix": 3 },
+              "nm": "Trazado elíptico 1",
+              "mn": "ADBE Vector Shape - Ellipse",
+              "hd": false
+            },
+            {
+              "ty": "st",
+              "c": { "a": 0, "k": [1, 1, 1, 1], "ix": 3 },
+              "o": { "a": 0, "k": 100, "ix": 4 },
+              "w": { "a": 0, "k": 4, "ix": 5 },
+              "lc": 2,
+              "lj": 1,
+              "ml": 4,
+              "bm": 0,
+              "nm": "Trazo 1",
+              "mn": "ADBE Vector Graphic - Stroke",
+              "hd": false
+            },
+            {
+              "ty": "tr",
+              "p": { "a": 0, "k": [0, 0], "ix": 2 },
+              "a": { "a": 0, "k": [0, 0], "ix": 1 },
+              "s": { "a": 0, "k": [100, 100], "ix": 3 },
+              "r": { "a": 0, "k": 0, "ix": 6 },
+              "o": { "a": 0, "k": 100, "ix": 7 },
+              "sk": { "a": 0, "k": 0, "ix": 4 },
+              "sa": { "a": 0, "k": 0, "ix": 5 },
+              "nm": "Transform"
+            }
+          ],
+          "nm": "Elipse 1",
+          "np": 3,
+          "cix": 2,
+          "bm": 0,
+          "ix": 1,
+          "mn": "ADBE Vector Group",
+          "hd": false
+        },
+        {
+          "ty": "tm",
+          "s": { "a": 0, "k": 0, "ix": 1 },
+          "e": {
+            "a": 1,
+            "k": [
+              {
+                "i": { "x": [0.236], "y": [1] },
+                "o": { "x": [0.753], "y": [0] },
+                "t": 0,
+                "s": [0]
+              },
+              { "t": 15, "s": [100] }
+            ],
+            "ix": 2
+          },
+          "o": { "a": 0, "k": 146, "ix": 3 },
+          "m": 1,
+          "ix": 2,
+          "nm": "Recortar trazados 1",
+          "mn": "ADBE Vector Filter - Trim",
+          "hd": false
+        }
+      ],
+      "ip": 0,
+      "op": 61,
+      "st": 0,
+      "bm": 0
+    }
+  ],
+  "markers": []
+}
diff --git a/library/src/main/res/values/themes_o2New.xml b/library/src/main/res/values/themes_o2New.xml
index bf83331bd..ca687c0d4 100644
--- a/library/src/main/res/values/themes_o2New.xml
+++ b/library/src/main/res/values/themes_o2New.xml
@@ -5,12 +5,12 @@
 		<!-- Feedbacks -->
 		<item name="feedbackScreenSuccessWithGradient">true</item>
 		<item name="feedbackScreenSuccessInverse">true</item>
-		<item name="feedbackScreenSuccessAnimation">@raw/feedback_success_o2</item>
-		<item name="feedbackScreenErrorAnimation">@raw/feedback_error_o2</item>
-		<item name="feedbackScreenInfoIcon">@drawable/feedback_info_o2</item>
+		<item name="feedbackScreenSuccessAnimation">@raw/feedback_success_o2_new</item>
+		<item name="feedbackScreenErrorAnimation">@raw/feedback_error_o2_new</item>
+		<item name="feedbackScreenInfoIcon">@drawable/feedback_info_o2_new</item>
 
 		<!-- Stepper -->
-		<item name="stepperFinishedStepAnimation">@raw/feedback_success_o2</item>
+		<item name="stepperFinishedStepAnimation">@raw/feedback_success_o2_new</item>
 
 		<!-- Compose -->
 		<item name="composeBrand">o2New</item>