diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9baf7bac..36be446b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-## 0.2.1
+## 0.2.2
 
 - [DSButton] Removed border color when `borderColor` property is not informed.
 
diff --git a/lib/src/widgets/buttons/ds_button.widget.dart b/lib/src/widgets/buttons/ds_button.widget.dart
index 45d96f8c..d74c913d 100644
--- a/lib/src/widgets/buttons/ds_button.widget.dart
+++ b/lib/src/widgets/buttons/ds_button.widget.dart
@@ -73,7 +73,7 @@ class DSButton extends StatelessWidget {
             ? BorderSide(
                 color: borderColor!,
               )
-            : null,
+            : BorderSide.none,
       ),
       child: DSAnimatedSize(
         child: Row(
diff --git a/pubspec.yaml b/pubspec.yaml
index 7889a319..8eb35b17 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: blip_ds
 description: Blip Design System for Flutter.
-version: 0.2.1
+version: 0.2.2
 homepage: https://github.com/takenet/blip-ds-flutter#readme
 repository: https://github.com/takenet/blip-ds-flutter
 
diff --git a/test/widgets/buttons/goldens/ds_button/disabled/ds_button_disabled.png b/test/widgets/buttons/goldens/ds_button/disabled/ds_button_disabled.png
index 25f87c04..aac2e405 100644
Binary files a/test/widgets/buttons/goldens/ds_button/disabled/ds_button_disabled.png and b/test/widgets/buttons/goldens/ds_button/disabled/ds_button_disabled.png differ
diff --git a/test/widgets/buttons/goldens/ds_button/disabled/loading/ds_button_disabled_loading_step_0.png b/test/widgets/buttons/goldens/ds_button/disabled/loading/ds_button_disabled_loading_step_0.png
index 8e06fbbf..175e3be2 100644
Binary files a/test/widgets/buttons/goldens/ds_button/disabled/loading/ds_button_disabled_loading_step_0.png and b/test/widgets/buttons/goldens/ds_button/disabled/loading/ds_button_disabled_loading_step_0.png differ
diff --git a/test/widgets/buttons/goldens/ds_button/disabled/loading/ds_button_disabled_loading_step_1.png b/test/widgets/buttons/goldens/ds_button/disabled/loading/ds_button_disabled_loading_step_1.png
index d2d48955..934878e4 100644
Binary files a/test/widgets/buttons/goldens/ds_button/disabled/loading/ds_button_disabled_loading_step_1.png and b/test/widgets/buttons/goldens/ds_button/disabled/loading/ds_button_disabled_loading_step_1.png differ
diff --git a/test/widgets/buttons/goldens/ds_button/disabled/loading/ds_button_disabled_loading_step_2.png b/test/widgets/buttons/goldens/ds_button/disabled/loading/ds_button_disabled_loading_step_2.png
index e3bb4733..05b365c9 100644
Binary files a/test/widgets/buttons/goldens/ds_button/disabled/loading/ds_button_disabled_loading_step_2.png and b/test/widgets/buttons/goldens/ds_button/disabled/loading/ds_button_disabled_loading_step_2.png differ
diff --git a/test/widgets/buttons/goldens/ds_button/disabled/loading/ds_button_disabled_loading_step_3.png b/test/widgets/buttons/goldens/ds_button/disabled/loading/ds_button_disabled_loading_step_3.png
index 49ed2cc5..f2896a3a 100644
Binary files a/test/widgets/buttons/goldens/ds_button/disabled/loading/ds_button_disabled_loading_step_3.png and b/test/widgets/buttons/goldens/ds_button/disabled/loading/ds_button_disabled_loading_step_3.png differ
diff --git a/test/widgets/buttons/goldens/ds_button/enabled/ds_button_enabled.png b/test/widgets/buttons/goldens/ds_button/enabled/ds_button_enabled.png
index 5c744639..372e4f73 100644
Binary files a/test/widgets/buttons/goldens/ds_button/enabled/ds_button_enabled.png and b/test/widgets/buttons/goldens/ds_button/enabled/ds_button_enabled.png differ
diff --git a/test/widgets/buttons/goldens/ds_button/enabled/loading/ds_button_enabled_loading_step_0.png b/test/widgets/buttons/goldens/ds_button/enabled/loading/ds_button_enabled_loading_step_0.png
index a8a5ecdc..6083aadd 100644
Binary files a/test/widgets/buttons/goldens/ds_button/enabled/loading/ds_button_enabled_loading_step_0.png and b/test/widgets/buttons/goldens/ds_button/enabled/loading/ds_button_enabled_loading_step_0.png differ
diff --git a/test/widgets/buttons/goldens/ds_button/enabled/loading/ds_button_enabled_loading_step_1.png b/test/widgets/buttons/goldens/ds_button/enabled/loading/ds_button_enabled_loading_step_1.png
index 0dc0e793..0665a651 100644
Binary files a/test/widgets/buttons/goldens/ds_button/enabled/loading/ds_button_enabled_loading_step_1.png and b/test/widgets/buttons/goldens/ds_button/enabled/loading/ds_button_enabled_loading_step_1.png differ
diff --git a/test/widgets/buttons/goldens/ds_button/enabled/loading/ds_button_enabled_loading_step_2.png b/test/widgets/buttons/goldens/ds_button/enabled/loading/ds_button_enabled_loading_step_2.png
index 5ebd2557..74afff19 100644
Binary files a/test/widgets/buttons/goldens/ds_button/enabled/loading/ds_button_enabled_loading_step_2.png and b/test/widgets/buttons/goldens/ds_button/enabled/loading/ds_button_enabled_loading_step_2.png differ
diff --git a/test/widgets/buttons/goldens/ds_button/enabled/loading/ds_button_enabled_loading_step_3.png b/test/widgets/buttons/goldens/ds_button/enabled/loading/ds_button_enabled_loading_step_3.png
index 8172d4fc..47a91c87 100644
Binary files a/test/widgets/buttons/goldens/ds_button/enabled/loading/ds_button_enabled_loading_step_3.png and b/test/widgets/buttons/goldens/ds_button/enabled/loading/ds_button_enabled_loading_step_3.png differ
diff --git a/test/widgets/buttons/goldens/ds_primary_button/disabled/ds_primary_button_disabled.png b/test/widgets/buttons/goldens/ds_primary_button/disabled/ds_primary_button_disabled.png
index c576e187..eaafb87c 100644
Binary files a/test/widgets/buttons/goldens/ds_primary_button/disabled/ds_primary_button_disabled.png and b/test/widgets/buttons/goldens/ds_primary_button/disabled/ds_primary_button_disabled.png differ
diff --git a/test/widgets/buttons/goldens/ds_primary_button/disabled/loading/ds_primary_button_disabled_loading_step_0.png b/test/widgets/buttons/goldens/ds_primary_button/disabled/loading/ds_primary_button_disabled_loading_step_0.png
index 6d324a36..81ac9107 100644
Binary files a/test/widgets/buttons/goldens/ds_primary_button/disabled/loading/ds_primary_button_disabled_loading_step_0.png and b/test/widgets/buttons/goldens/ds_primary_button/disabled/loading/ds_primary_button_disabled_loading_step_0.png differ
diff --git a/test/widgets/buttons/goldens/ds_primary_button/disabled/loading/ds_primary_button_disabled_loading_step_1.png b/test/widgets/buttons/goldens/ds_primary_button/disabled/loading/ds_primary_button_disabled_loading_step_1.png
index c3ce1d50..ab382a20 100644
Binary files a/test/widgets/buttons/goldens/ds_primary_button/disabled/loading/ds_primary_button_disabled_loading_step_1.png and b/test/widgets/buttons/goldens/ds_primary_button/disabled/loading/ds_primary_button_disabled_loading_step_1.png differ
diff --git a/test/widgets/buttons/goldens/ds_primary_button/disabled/loading/ds_primary_button_disabled_loading_step_2.png b/test/widgets/buttons/goldens/ds_primary_button/disabled/loading/ds_primary_button_disabled_loading_step_2.png
index 561674d7..7dfcfe0e 100644
Binary files a/test/widgets/buttons/goldens/ds_primary_button/disabled/loading/ds_primary_button_disabled_loading_step_2.png and b/test/widgets/buttons/goldens/ds_primary_button/disabled/loading/ds_primary_button_disabled_loading_step_2.png differ
diff --git a/test/widgets/buttons/goldens/ds_primary_button/disabled/loading/ds_primary_button_disabled_loading_step_3.png b/test/widgets/buttons/goldens/ds_primary_button/disabled/loading/ds_primary_button_disabled_loading_step_3.png
index 2afa54fe..98ede715 100644
Binary files a/test/widgets/buttons/goldens/ds_primary_button/disabled/loading/ds_primary_button_disabled_loading_step_3.png and b/test/widgets/buttons/goldens/ds_primary_button/disabled/loading/ds_primary_button_disabled_loading_step_3.png differ
diff --git a/test/widgets/buttons/goldens/ds_primary_button/enabled/ds_primary_button_enabled.png b/test/widgets/buttons/goldens/ds_primary_button/enabled/ds_primary_button_enabled.png
index ed13c6e0..95e58d31 100644
Binary files a/test/widgets/buttons/goldens/ds_primary_button/enabled/ds_primary_button_enabled.png and b/test/widgets/buttons/goldens/ds_primary_button/enabled/ds_primary_button_enabled.png differ
diff --git a/test/widgets/buttons/goldens/ds_primary_button/enabled/loading/ds_primary_button_enabled_loading_step_0.png b/test/widgets/buttons/goldens/ds_primary_button/enabled/loading/ds_primary_button_enabled_loading_step_0.png
index 683c0e22..713be5e1 100644
Binary files a/test/widgets/buttons/goldens/ds_primary_button/enabled/loading/ds_primary_button_enabled_loading_step_0.png and b/test/widgets/buttons/goldens/ds_primary_button/enabled/loading/ds_primary_button_enabled_loading_step_0.png differ
diff --git a/test/widgets/buttons/goldens/ds_primary_button/enabled/loading/ds_primary_button_enabled_loading_step_1.png b/test/widgets/buttons/goldens/ds_primary_button/enabled/loading/ds_primary_button_enabled_loading_step_1.png
index 268c914b..480ada05 100644
Binary files a/test/widgets/buttons/goldens/ds_primary_button/enabled/loading/ds_primary_button_enabled_loading_step_1.png and b/test/widgets/buttons/goldens/ds_primary_button/enabled/loading/ds_primary_button_enabled_loading_step_1.png differ
diff --git a/test/widgets/buttons/goldens/ds_primary_button/enabled/loading/ds_primary_button_enabled_loading_step_2.png b/test/widgets/buttons/goldens/ds_primary_button/enabled/loading/ds_primary_button_enabled_loading_step_2.png
index c2e5588c..9e86812f 100644
Binary files a/test/widgets/buttons/goldens/ds_primary_button/enabled/loading/ds_primary_button_enabled_loading_step_2.png and b/test/widgets/buttons/goldens/ds_primary_button/enabled/loading/ds_primary_button_enabled_loading_step_2.png differ
diff --git a/test/widgets/buttons/goldens/ds_primary_button/enabled/loading/ds_primary_button_enabled_loading_step_3.png b/test/widgets/buttons/goldens/ds_primary_button/enabled/loading/ds_primary_button_enabled_loading_step_3.png
index a010c589..ac6d088f 100644
Binary files a/test/widgets/buttons/goldens/ds_primary_button/enabled/loading/ds_primary_button_enabled_loading_step_3.png and b/test/widgets/buttons/goldens/ds_primary_button/enabled/loading/ds_primary_button_enabled_loading_step_3.png differ