diff --git a/css/style.css b/css/style.css
index eb18d02..6a14b46 100644
--- a/css/style.css
+++ b/css/style.css
@@ -782,13 +782,6 @@ button.light:hover, .light.show-more-followers:hover, a.button.light:hover {
   right: 35px;
 }
 
-.switch-mode {
-  cursor: pointer;
-  color: #A1B775;
-  position: absolute;
-  left: 0;
-}
-
 /* Composants */
 .twister-user {
   position: relative;
@@ -825,7 +818,7 @@ button.light:hover, .light.show-more-followers:hover, a.button.light:hover {
   -webkit-box-shadow: 0 8px 33px rgba(0, 0, 0, 0.3);
   box-shadow: 0 8px 33px rgba(0, 0, 0, 0.3);
 }
-.prompt-wrapper .modal-buttons, .prompt-wrapper .following-config-method-buttons {
+.prompt-wrapper .following-config-method-buttons {
   padding: 0 20px 20px 0;
   float: right;
 }
@@ -845,14 +838,24 @@ button.light:hover, .light.show-more-followers:hover, a.button.light:hover {
 .prompt-wrapper .modal-header h3 span:hover, .prompt-wrapper .modal-header .login .module p span span:hover, .login .module p .prompt-wrapper .modal-header span span:hover {
   cursor: default;
 }
+.prompt-wrapper .modal-buttons {
+  margin: 4px 0;
+  text-align: right;
+}
+.prompt-wrapper .switch-mode {
+  display: inline-block;
+  float: left;
+  margin: 12px 4px 4px;
+  color: #A1B775;
+  cursor: pointer;
+  font-size: 0.8rem;
+  line-height: 0.8rem;
+}
 
 /************ FOLLOWING-CONFIG MODAL ********* */
 .prompt-wrapper.following-config-modal {
   margin-top: -100px;
 }
-.prompt-wrapper.following-config-modal .modal-buttons {
-  display: none;
-}
 .prompt-wrapper.following-config-modal h2 {
   text-transform: none;
   display: inline-block !important;
@@ -883,7 +886,7 @@ button.light:hover, .light.show-more-followers:hover, a.button.light:hover {
 .prompt-wrapper.reply.prompt-wrapper {
   margin-top: -110px;
 }
-.prompt-wrapper.reply .modal-buttons, .prompt-wrapper.reply .post-expand, .prompt-wrapper.reply .post-interactions {
+.prompt-wrapper.reply .post-expand, .prompt-wrapper.reply .post-interactions {
   display: none;
 }
 .prompt-wrapper.reply .post-area {
@@ -1210,10 +1213,6 @@ button.light:hover, .light.show-more-followers:hover, a.button.light:hover {
   text-decoration: none;
 }
 
-.profile-modal .modal-buttons {
-  display: none;
-}
-
 /*************  TOP TEXTAREA ************ */
 #postboard-top {
   position: relative;
diff --git a/sass/layout/_modal.sass b/sass/layout/_modal.sass
index 9290485..d80db79 100644
--- a/sass/layout/_modal.sass
+++ b/sass/layout/_modal.sass
@@ -187,14 +187,6 @@ $header-modal-height : $menu-height
 
 
 
-.switch-mode
-	cursor: pointer 
-	color: $main-color-color
-	position: absolute 
-	left: 0
-	@extend .ion 
-	@extend .ion-shuffle
-
 /* Composants */
 
 .twister-user
diff --git a/sass/layout/_profile.sass b/sass/layout/_profile.sass
index c252dd7..6139b51 100644
--- a/sass/layout/_profile.sass
+++ b/sass/layout/_profile.sass
@@ -157,6 +157,3 @@ $modal-postboard-post-height: 100%
 		@extend .ion-tox
 		@extend .ion 
 
-.profile-modal .modal-buttons
-	display: none
-
diff --git a/sass/layout/_prompt.sass b/sass/layout/_prompt.sass
index 6e78c72..72b1106 100644
--- a/sass/layout/_prompt.sass
+++ b/sass/layout/_prompt.sass
@@ -10,7 +10,7 @@
 	width: 600px
 	margin-left: -300px
 	+box-shadow(0 8px 33px rgba(#000, .3))
-	.modal-buttons, .following-config-method-buttons
+	.following-config-method-buttons
 		padding: 0 20px 20px 0
 		float: right
 	.modal-content
@@ -27,15 +27,26 @@
 			color: white 
 			&:hover 
 				cursor: default
+	.modal-buttons
+		margin: 4px 0
+		text-align: right
+	.switch-mode
+		display: inline-block
+		float: left
+		margin: 12px 4px 4px
+		color: $main-color-color
+		cursor: pointer
+		font-size: .8rem
+		line-height: .8rem
+		@extend .ion
+		@extend .ion-shuffle
+
 
 
- 
 /************ FOLLOWING-CONFIG MODAL **********/
 
 .prompt-wrapper.following-config-modal
 	margin-top: -100px
-	.modal-buttons
-		display: none
 	h2
 		text-transform: none
 		display: inline-block!important
@@ -67,7 +78,7 @@
 .prompt-wrapper.reply
 	&.prompt-wrapper
 		margin-top: -110px
-	.modal-buttons, .post-expand, .post-interactions
+	.post-expand, .post-interactions
 		display: none
 	.post-area
 		padding-bottom: 6px