diff --git a/src/app/core/components/home/home.component.html b/src/app/core/components/home/home.component.html
index f5aff473..09bfd35c 100644
--- a/src/app/core/components/home/home.component.html
+++ b/src/app/core/components/home/home.component.html
@@ -53,7 +53,7 @@
 			<div class="top">
 				<button
 					id="close_dialog"
-					class="button no-outline cancel-button-reject pull-right"
+					class="button no-outline cancel-button-reject pull-right has-no-border"
 					(click)="focusOnCancelButton()"
 				>
 					{{ 'SENTENCES.Close' | translate }} <img class="icon fa" src="assets/icons/x_blue.svg" />
diff --git a/src/app/features/administration/form/steps/step-four/step-four.component.html b/src/app/features/administration/form/steps/step-four/step-four.component.html
index 1816b7f4..b829dc79 100644
--- a/src/app/features/administration/form/steps/step-four/step-four.component.html
+++ b/src/app/features/administration/form/steps/step-four/step-four.component.html
@@ -86,7 +86,7 @@
 			<div class="column is-narrow">
 				<button
 					id="close_dialog"
-					class="button cancel-button-reject pull-right has-text-right"
+					class="button cancel-button-reject pull-right has-text-right has-no-border"
 					(click)="closeModalAndFocusOnOpenModalButton()"
 				>
 					{{ 'SENTENCES.Close' | translate }} <img class="icon fa" src="assets/icons/x_blue.svg" />
diff --git a/src/app/features/administration/stepper/stepper.component.html b/src/app/features/administration/stepper/stepper.component.html
index 504c1865..81b51027 100644
--- a/src/app/features/administration/stepper/stepper.component.html
+++ b/src/app/features/administration/stepper/stepper.component.html
@@ -120,7 +120,7 @@
 			<div class="top">
 				<button
 					id="close_dialog"
-					class="button cancel-button-reject pull-right img-marged-left"
+					class="button cancel-button-reject pull-right img-marged-left has-no-border"
 					(click)="focusOnCancelButton()"
 				>
 					{{ 'SENTENCES.Close' | translate }}
diff --git a/src/app/shared/components/selectors/language-selector/language-selector.component.html b/src/app/shared/components/selectors/language-selector/language-selector.component.html
index 1bcb7856..b58a3f94 100644
--- a/src/app/shared/components/selectors/language-selector/language-selector.component.html
+++ b/src/app/shared/components/selectors/language-selector/language-selector.component.html
@@ -35,7 +35,7 @@
 						<div class="top">
 							<button
 								id="close_dialog{{ idSuffix }}"
-								class="button cancel-button-reject pull-right img-marged-left"
+								class="button cancel-button-reject pull-right img-marged-left has-no-border"
 								lang="{{ currentLang }}"
 								(click)="focusOnCancelButton()"
 							>
@@ -53,7 +53,7 @@
 					<div *ngFor="let language of availableLanguages" (click)="language_to_apply = language">
 						<label
 							[attr.for]="'#lang_' + language"
-							class="lang-element button"
+							class="lang-element button has-text-left"
 							[ngClass]="{
 								'is-primary': language_to_apply === language,
 								'is-current': language === currentLang
diff --git a/src/app/shared/components/selectors/language-selector/language-selector.component.scss b/src/app/shared/components/selectors/language-selector/language-selector.component.scss
index 0e728634..1dba291e 100644
--- a/src/app/shared/components/selectors/language-selector/language-selector.component.scss
+++ b/src/app/shared/components/selectors/language-selector/language-selector.component.scss
@@ -35,11 +35,11 @@
 .lang-element {
 	float: left;
 	margin: 0.5em;
-	min-width: 8em;
 	border: 0;
 	border-radius: 2rem;
 	padding: 0.5rem 0.25rem;
 	padding-right: 1rem;
+	min-width: 12em;
 
 	&:hover {
 		background: $primary_color;
diff --git a/src/app/shared/components/selectors/language-selector/language-selector.component.ts b/src/app/shared/components/selectors/language-selector/language-selector.component.ts
index 23213828..ef70741f 100644
--- a/src/app/shared/components/selectors/language-selector/language-selector.component.ts
+++ b/src/app/shared/components/selectors/language-selector/language-selector.component.ts
@@ -17,7 +17,7 @@ export class LanguageSelectorComponent implements OnInit {
 	public availableLanguages: any = ['FR', 'EN', 'ES'];
 	language: string;
 	language_to_apply: string;
-	display_lang_dialog: boolean = true;
+	display_lang_dialog: boolean = false;
 
 	constructor(
 		private languageService: LanguageService,
diff --git a/src/styles/partials/_forms.scss b/src/styles/partials/_forms.scss
index 16c22156..93ad4a95 100644
--- a/src/styles/partials/_forms.scss
+++ b/src/styles/partials/_forms.scss
@@ -96,6 +96,9 @@ textarea {
 	display: inline-block;
 	padding: 10px 30px;
 	height: auto;
+	&.has-no-border {
+		border: 0;
+	}
 }
 
 .button {