diff --git a/src/front/Components/DesignSystem/Button/classes.module.scss b/src/front/Components/DesignSystem/Button/classes.module.scss
index 061818c4..84428234 100644
--- a/src/front/Components/DesignSystem/Button/classes.module.scss
+++ b/src/front/Components/DesignSystem/Button/classes.module.scss
@@ -14,6 +14,7 @@
 	user-select: none;
 	cursor: pointer;
 	font-family: var(--font-text-family);
+	border: 1px solid var(--button-contained-primary-default-border, rgba(0, 0, 0, 0));
 
 	svg {
 		width: 18px;
@@ -26,15 +27,15 @@
 
 	&[variant="primary"] {
 		color: var(--color-primary-500);
-		border: 1px solid var(--button-contained-primary-default-border, rgba(0, 0, 0, 0));
 		background: var(--button-contained-primary-default-background, #005bcb);
+		border-color: var(--button-contained-primary-default-border);
 
 		svg {
 			stroke: var(--button-contained-primary-default-contrast);
 		}
 
 		&:hover {
-			border: 1px solid var(--button-contained-primary-hovered-border, rgba(0, 0, 0, 0));
+			border-color: var(--button-contained-primary-hovered-border);
 			background: var(--button-contained-primary-hovered-background, #0040a4);
 
 			svg {
@@ -44,7 +45,7 @@
 
 		&:focus,
 		&:active {
-			border: 1px solid var(--button-contained-primary-pressed-border, rgba(0, 0, 0, 0));
+			border-color: var(--button-contained-primary-pressed-border);
 			background: var(--button-contained-primary-pressed-background, #013391);
 
 			svg {
@@ -53,12 +54,16 @@
 		}
 
 		&[styleType="outlined"] {
+			border-color: var(--button-outlined-primary-default-border);
+
 			svg {
 				stroke: var(--button-outlined-primary-default-contrast);
 			}
 
 			&:hover {
 				background-color: var(--color-primary-50);
+				border-color: var(--button-outlined-primary-hovered-border);
+
 				svg {
 					stroke: var(--button-outlined-primary-hovered-contrast);
 				}
@@ -68,7 +73,7 @@
 			&:active {
 				background-color: var(--color-primary-100);
 				color: var(--color-primary-700);
-				border-color: var(--color-primary-700);
+				border-color: var(--button-outlined-primary-pressed-border);
 
 				svg {
 					stroke: var(--button-outlined-primary-pressed-contrast);
@@ -83,6 +88,7 @@
 
 			&:hover {
 				background-color: transparent;
+				border-color: var(--button-outlined-primary-hovered-border);
 
 				svg {
 					stroke: var(--button-text-primary-hovered-contrast);