diff --git a/frontend/src/app/components/atoms/loader/loader.component.scss b/frontend/src/app/components/atoms/loader/loader.component.scss
index 9232199..e82eb7c 100644
--- a/frontend/src/app/components/atoms/loader/loader.component.scss
+++ b/frontend/src/app/components/atoms/loader/loader.component.scss
@@ -15,7 +15,6 @@
     height: 100vh;
     display: flex;
     flex-direction: column;
-    max-width: 428px;
     background-color: var(--background-black);
     margin: 0;
     padding: 0;
diff --git a/frontend/src/app/components/molecules/.gitkeep b/frontend/src/app/components/molecules/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/frontend/src/app/components/organisms/loginform/loginform.component.ts b/frontend/src/app/components/organisms/loginform/loginform.component.ts
index e71debc..12dedc4 100644
--- a/frontend/src/app/components/organisms/loginform/loginform.component.ts
+++ b/frontend/src/app/components/organisms/loginform/loginform.component.ts
@@ -20,8 +20,8 @@ export class LoginformComponent {
     this.showPassword = !this.showPassword;
     this.passwordFieldType = this.showPassword ? 'text' : 'password';
     this.img = this.showPassword
-      ? '../../../assets/ausblenden.png'
-      : '../../../assets/aussicht.png';
+      ? '../../../assets/icons/ausblenden.png'
+      : '../../../assets/icons/aussicht.png';
   }
 
   login()
diff --git a/frontend/src/app/components/organisms/signupform/signupform.component.ts b/frontend/src/app/components/organisms/signupform/signupform.component.ts
index 1ffc3fd..7dc17ca 100644
--- a/frontend/src/app/components/organisms/signupform/signupform.component.ts
+++ b/frontend/src/app/components/organisms/signupform/signupform.component.ts
@@ -15,7 +15,7 @@ export class SignupformComponent {
     this.showPassword = !this.showPassword;
     this.passwordFieldType = this.showPassword ? 'text' : 'password';
     this.img = this.showPassword
-      ? '../../../assets/ausblenden.png'
-      : '../../../assets/aussicht.png';
+      ? '../../../assets/icons/ausblenden.png'
+      : '../../../assets/icons/aussicht.png';
   }
 }
diff --git a/frontend/src/app/components/organisms/statistic-header/statistic-header.component.html b/frontend/src/app/components/organisms/statistic-header/statistic-header.component.html
index e311da7..04c25c2 100644
--- a/frontend/src/app/components/organisms/statistic-header/statistic-header.component.html
+++ b/frontend/src/app/components/organisms/statistic-header/statistic-header.component.html
@@ -18,7 +18,7 @@ <h2>{{ eventservice.steps }}</h2>
     </div>
 
     <div class="streak">
-      <img src="../../../../assets/f7--flame.svg" alt="Icon Streak" />
+      <img src="../../../../assets/icons/f7--flame.svg" alt="Icon Streak" />
       <h2>0000</h2>
     </div>
   </div>
diff --git a/frontend/src/app/components/organisms/statistic-header/statistic-header.component.scss b/frontend/src/app/components/organisms/statistic-header/statistic-header.component.scss
index 0f14dac..137b9a3 100644
--- a/frontend/src/app/components/organisms/statistic-header/statistic-header.component.scss
+++ b/frontend/src/app/components/organisms/statistic-header/statistic-header.component.scss
@@ -3,7 +3,6 @@
   padding: 0;
   background-color: var(--black-2);
   width: 100%;
-  max-width: 428px;
   height: 130px;
   position: fixed;
   top: 0;
diff --git a/frontend/src/app/components/pages/mainpage/mainpage.component.html b/frontend/src/app/components/pages/mainpage/mainpage.component.html
index 1c4079d..6cb6652 100644
--- a/frontend/src/app/components/pages/mainpage/mainpage.component.html
+++ b/frontend/src/app/components/pages/mainpage/mainpage.component.html
@@ -1,8 +1,6 @@
-
+<app-statistic-header></app-statistic-header>
 <div class="center-container">
   <div class="main">
-    <app-statistic-header></app-statistic-header>
     <app-roadmap></app-roadmap>
   </div>
-
 </div>
diff --git a/frontend/src/app/components/pages/mainpage/mainpage.component.scss b/frontend/src/app/components/pages/mainpage/mainpage.component.scss
index 58e5526..ef219f6 100644
--- a/frontend/src/app/components/pages/mainpage/mainpage.component.scss
+++ b/frontend/src/app/components/pages/mainpage/mainpage.component.scss
@@ -7,7 +7,7 @@
   flex-direction: column;
   width: 100%;
   height: 100vh;
-  background-color: lighten($color: #0f0f0f, $amount: 5%);
+  background-color: var(--background-black);
 
   .main {
     width: 100%;
diff --git a/frontend/src/app/components/templates/.gitkeep b/frontend/src/app/components/templates/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/frontend/src/assets/ausblenden.png b/frontend/src/assets/icons/ausblenden.png
similarity index 100%
rename from frontend/src/assets/ausblenden.png
rename to frontend/src/assets/icons/ausblenden.png
diff --git a/frontend/src/assets/aussicht.png b/frontend/src/assets/icons/aussicht.png
similarity index 100%
rename from frontend/src/assets/aussicht.png
rename to frontend/src/assets/icons/aussicht.png
diff --git a/frontend/src/assets/f7--flame.svg b/frontend/src/assets/icons/f7--flame.svg
similarity index 100%
rename from frontend/src/assets/f7--flame.svg
rename to frontend/src/assets/icons/f7--flame.svg
diff --git a/frontend/src/assets/Logo_3.svg b/frontend/src/assets/logo/Logo_3.svg
similarity index 100%
rename from frontend/src/assets/Logo_3.svg
rename to frontend/src/assets/logo/Logo_3.svg
diff --git a/frontend/src/index.html b/frontend/src/index.html
index 20e3213..ae73fb7 100644
--- a/frontend/src/index.html
+++ b/frontend/src/index.html
@@ -5,7 +5,7 @@
   <title>duogradus. | Sammle Schritte, Tritt gegen Freunde an und steig in der Liga auf</title>
   <base href="/">
   <meta name="viewport" content="width=device-width, initial-scale=1">
-  <link rel="icon" href="frontend\src\Logo_1_black.ico" type="image/x-icon">
+  <link rel="icon" type="image/x-icon" href="Logo_1_black.ico">
 </head>
 <body>
   <app-root></app-root>