diff --git a/src/app/app.component.html b/src/app/app.component.html
index 2f211c98..477450fe 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -6,10 +6,14 @@
 	<mat-sidenav-content>
 		<div id="big_container" [class]="themeClass">
 			<div class="container">
-				<mat-slide-toggle (change)="sidenav.toggle()">Dev Menu</mat-slide-toggle>
 				<app-header [appTitle]="appTitle" [appLogo]="appLogo"></app-header>
 				<main>
 					<router-outlet></router-outlet>
+					<div *ngIf="devModeEnabled">
+						<br />
+						<mat-slide-toggle (change)="sidenav.toggle()" label="dev menu"> </mat-slide-toggle> menu
+						développeur
+					</div>
 				</main>
 				<app-footer></app-footer>
 				<app-feedback></app-feedback>
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 3c89ed13..c4e0eb3d 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -18,20 +18,18 @@ export class AppComponent implements OnInit, OnDestroy {
 	public appLogo: string = environment.appLogo;
 	public themeClass: string;
 	public isSidebarOpened = false;
+	public devModeEnabled = !environment.production;
 	private themeSubscription: Subscription;
 
 	constructor(
 		private titleService: Title,
 		private themeService: ThemeService,
-		private languageService: LanguageService
-	) // private mockingService: MockingService
-	{}
+		private languageService: LanguageService // private mockingService: MockingService
+	) {}
 
 	ngOnInit(): void {
 		if (!environment.production) {
 			this.appTitle += ' [DEV]';
-			// TODO: to be removed
-			// this.mockingService.init();
 		}
 		this.titleService.setTitle(this.appTitle);
 		this.languageService.configureAndInitTranslations();
diff --git a/src/app/core/components/header/header.component.scss b/src/app/core/components/header/header.component.scss
index 2e30e421..61220d68 100644
--- a/src/app/core/components/header/header.component.scss
+++ b/src/app/core/components/header/header.component.scss
@@ -1,5 +1,8 @@
 :host {
 	header {
+		nav {
+			padding-right: 1em;
+		}
 		.container {
 			padding: 0;
 		}
diff --git a/src/app/features/user-profile/user-polls/user-polls.component.ts b/src/app/features/user-profile/user-polls/user-polls.component.ts
index ebe75b35..2d5a27ff 100644
--- a/src/app/features/user-profile/user-polls/user-polls.component.ts
+++ b/src/app/features/user-profile/user-polls/user-polls.component.ts
@@ -18,5 +18,7 @@ export class UserPollsComponent implements OnInit {
 
 	ngOnInit(): void {}
 
-	sendRetrieveEmail() {}
+	sendRetrieveEmail() {
+		alert('TODO');
+	}
 }