diff --git a/src/app/about-window/about-window.component.html b/src/app/about-window/about-window.component.html
index ba4dff2..6203978 100644
--- a/src/app/about-window/about-window.component.html
+++ b/src/app/about-window/about-window.component.html
@@ -1,5 +1,5 @@
 <div class="window">
-  <app-window-title-bar iconPath="assets/icons/about.png" title="About XPQuiz"></app-window-title-bar>
+  <app-window-title-bar iconPath="about.png" title="About XPQuiz"></app-window-title-bar>
   <div class="window-body">
     <label><b>XPQuiz</b>&nbsp;- Version 1.0.1</label>
     <label class="main">Created by&nbsp;<b><a href="https://isahann.github.io">Isahann Hanacleto</a></b></label>
@@ -13,7 +13,7 @@
       href="https://www.deviantart.com/marchmountain/art/Windows-XP-High-Resolution-Icon-Pack-916042853">marchmountain
       at DeviantArt</a></b></label>
 
-    <app-icon-button iconPath="assets/icons/home.png" title="Return to home"
+    <app-icon-button iconPath="home.png" title="Return to home"
                      (onButtonClick)="this.returnHome()"></app-icon-button>
   </div>
 </div>
diff --git a/src/app/common/icon-button/icon-button.component.html b/src/app/common/icon-button/icon-button.component.html
index 7d0c3bc..5bc91f2 100644
--- a/src/app/common/icon-button/icon-button.component.html
+++ b/src/app/common/icon-button/icon-button.component.html
@@ -1,6 +1,6 @@
 <button [disabled]="this.disabled" (click)="this.onClick()">
   <img
-    [ngSrc]="this.iconPath" [ngClass]="this.disabled ? 'disabled' : ''"
+    [ngSrc]="'assets/icons/20x20/' + this.iconPath" [ngClass]="this.disabled ? 'disabled' : ''"
     alt="" [height]="this.iconSize" [width]="this.iconSize"/>
   {{this.title}}
 </button>
diff --git a/src/app/common/window-title-bar/window-title-bar.component.html b/src/app/common/window-title-bar/window-title-bar.component.html
index 99daec4..3e91e8a 100644
--- a/src/app/common/window-title-bar/window-title-bar.component.html
+++ b/src/app/common/window-title-bar/window-title-bar.component.html
@@ -1,7 +1,7 @@
 <div class="title-bar">
   <div class="title-bar-text">
     <img
-      [ngSrc]="this.iconPath"
+      [ngSrc]="'assets/icons/15x15/' + this.iconPath"
       alt="" [height]="this.iconSize" [width]="this.iconSize" />
     {{this.title}}
   </div>
diff --git a/src/app/correct-answer-window/correct-answer-window.component.html b/src/app/correct-answer-window/correct-answer-window.component.html
index aab3ecb..1c629d4 100644
--- a/src/app/correct-answer-window/correct-answer-window.component.html
+++ b/src/app/correct-answer-window/correct-answer-window.component.html
@@ -1,5 +1,5 @@
 <div class="window">
-  <app-window-title-bar iconPath="assets/icons/success.png" title="You did it!"></app-window-title-bar>
+  <app-window-title-bar iconPath="success.png" title="You did it!"></app-window-title-bar>
   <div class="window-body">
     <div class="window-body_title">
       <label><b>Congratulations!</b></label>
@@ -7,7 +7,7 @@
       <label>Come back in 3 hours for another question!</label>
     </div>
 
-    <app-icon-button iconPath="assets/icons/home.png" title="Return to home"
+    <app-icon-button iconPath="home.png" title="Return to home"
                      (onButtonClick)="this.returnHome()"></app-icon-button>
   </div>
 </div>
diff --git a/src/app/main-window/main-window.component.html b/src/app/main-window/main-window.component.html
index 163175b..ba575a8 100644
--- a/src/app/main-window/main-window.component.html
+++ b/src/app/main-window/main-window.component.html
@@ -1,5 +1,5 @@
 <div class="window">
-  <app-window-title-bar iconPath="assets/icons/home.png" title="Welcome!"></app-window-title-bar>
+  <app-window-title-bar iconPath="home.png" title="Welcome!"></app-window-title-bar>
   <div class="window-body">
     <label>Welcome to &nbsp;<b>XPQuiz</b>!</label>
 
@@ -11,12 +11,12 @@
     </ng-container>
 
     <div class="window-body_buttons">
-      <app-icon-button iconPath="assets/icons/quiz.png" title="New quiz"
+      <app-icon-button iconPath="quiz.png" title="New quiz"
                        (onButtonClick)="this.redirectTo(PathsEnum.QUIZ)"
                        [disabled]="!this.quizCanBeAnswered"></app-icon-button>
-      <app-icon-button iconPath="assets/icons/score.png" title="My score"
+      <app-icon-button iconPath="score.png" title="My score"
                        (onButtonClick)="this.redirectTo(PathsEnum.SCORES)"></app-icon-button>
-      <app-icon-button iconPath="assets/icons/about.png" title="About"
+      <app-icon-button iconPath="about.png" title="About"
                        (onButtonClick)="this.redirectTo(PathsEnum.ABOUT)"></app-icon-button>
     </div>
   </div>
diff --git a/src/app/question-window/question-window.component.html b/src/app/question-window/question-window.component.html
index 2d4104e..228c080 100644
--- a/src/app/question-window/question-window.component.html
+++ b/src/app/question-window/question-window.component.html
@@ -1,6 +1,6 @@
 <div class="host">
   <div class="window window_question">
-    <app-window-title-bar iconPath="assets/icons/question.png" title="Question!"></app-window-title-bar>
+    <app-window-title-bar iconPath="question.png" title="Question!"></app-window-title-bar>
     <div class="window-body window_question_body">
       <ng-container *ngIf="!this.questionLoaded">
         <div class="window_question_body_loading">
@@ -27,7 +27,7 @@
 
   <ng-container *ngIf="this.selectedAnswer">
     <div class="window window_check-answer">
-      <app-window-title-bar iconPath="assets/icons/check-question.png"
+      <app-window-title-bar iconPath="check-question.png"
                             title="Check your answer!"></app-window-title-bar>
       <div class="window-body window_check-answer_body">
         <div class="window_check-answer_body_image">
@@ -42,9 +42,9 @@
           <ng-container *ngIf="!this.confirmedAnswer">
             <label class="window_check-answer_body_question_title">Are you sure about that?</label>
             <div class="window_check-answer_body_question_buttons">
-              <app-icon-button iconPath="assets/icons/success.png" title="Yes!"
+              <app-icon-button iconPath="yes.png" title="Yes!"
                                (onButtonClick)="this.confirmAnswer()"></app-icon-button>
-              <app-icon-button iconPath="assets/icons/critical.png" title="No..."
+              <app-icon-button iconPath="no.png" title="No..."
                                (onButtonClick)="this.validateAnswer()"></app-icon-button>
             </div>
           </ng-container>
diff --git a/src/app/score-window/score-window.component.html b/src/app/score-window/score-window.component.html
index ba2ebf8..5de6b3c 100644
--- a/src/app/score-window/score-window.component.html
+++ b/src/app/score-window/score-window.component.html
@@ -1,11 +1,11 @@
 <div class="window">
-  <app-window-title-bar iconPath="assets/icons/score.png" title="Score"></app-window-title-bar>
+  <app-window-title-bar iconPath="score.png" title="Score"></app-window-title-bar>
   <div class="window-body">
     <div class="window-body_title">
       <label>You currently have &nbsp;<b>[{{this.score}}]</b>&nbsp; points!</label>
     </div>
 
-    <app-icon-button iconPath="assets/icons/home.png" title="Return to home"
+    <app-icon-button iconPath="home.png" title="Return to home"
                      (onButtonClick)="this.returnHome()"></app-icon-button>
   </div>
 </div>
diff --git a/src/app/wrong-answer-window/wrong-answer-window.component.html b/src/app/wrong-answer-window/wrong-answer-window.component.html
index ecf4c49..c2f5ace 100644
--- a/src/app/wrong-answer-window/wrong-answer-window.component.html
+++ b/src/app/wrong-answer-window/wrong-answer-window.component.html
@@ -1,12 +1,12 @@
 <div class="window">
-  <app-window-title-bar iconPath="assets/icons/critical.png" title="Oh no!"></app-window-title-bar>
+  <app-window-title-bar iconPath="critical.png" title="Oh no!"></app-window-title-bar>
   <div class="window-body">
     <div class="window-body_title">
       <label>That was not the right answer! The answer was &nbsp;<b>[{{this.correctAnswer}}]</b></label>
       <label>Come back in 3 hours for another question!</label>
     </div>
 
-    <app-icon-button iconPath="assets/icons/home.png" title="Return to home"
+    <app-icon-button iconPath="home.png" title="Return to home"
                      (onButtonClick)="this.returnHome()"></app-icon-button>
   </div>
 </div>
diff --git a/src/assets/icons/15x15/about.png b/src/assets/icons/15x15/about.png
new file mode 100644
index 0000000..a83b948
Binary files /dev/null and b/src/assets/icons/15x15/about.png differ
diff --git a/src/assets/icons/15x15/check-question.png b/src/assets/icons/15x15/check-question.png
new file mode 100644
index 0000000..7384e96
Binary files /dev/null and b/src/assets/icons/15x15/check-question.png differ
diff --git a/src/assets/icons/15x15/critical.png b/src/assets/icons/15x15/critical.png
new file mode 100644
index 0000000..d6e7258
Binary files /dev/null and b/src/assets/icons/15x15/critical.png differ
diff --git a/src/assets/icons/15x15/home.png b/src/assets/icons/15x15/home.png
new file mode 100644
index 0000000..daea06a
Binary files /dev/null and b/src/assets/icons/15x15/home.png differ
diff --git a/src/assets/icons/15x15/question.png b/src/assets/icons/15x15/question.png
new file mode 100644
index 0000000..1876a76
Binary files /dev/null and b/src/assets/icons/15x15/question.png differ
diff --git a/src/assets/icons/15x15/score.png b/src/assets/icons/15x15/score.png
new file mode 100644
index 0000000..693739a
Binary files /dev/null and b/src/assets/icons/15x15/score.png differ
diff --git a/src/assets/icons/15x15/success.png b/src/assets/icons/15x15/success.png
new file mode 100644
index 0000000..157862d
Binary files /dev/null and b/src/assets/icons/15x15/success.png differ
diff --git a/src/assets/icons/20x20/about.png b/src/assets/icons/20x20/about.png
new file mode 100644
index 0000000..1d3335e
Binary files /dev/null and b/src/assets/icons/20x20/about.png differ
diff --git a/src/assets/icons/20x20/home.png b/src/assets/icons/20x20/home.png
new file mode 100644
index 0000000..73367fa
Binary files /dev/null and b/src/assets/icons/20x20/home.png differ
diff --git a/src/assets/icons/20x20/no.png b/src/assets/icons/20x20/no.png
new file mode 100644
index 0000000..2d7d64f
Binary files /dev/null and b/src/assets/icons/20x20/no.png differ
diff --git a/src/assets/icons/20x20/quiz.png b/src/assets/icons/20x20/quiz.png
new file mode 100644
index 0000000..c91f0e2
Binary files /dev/null and b/src/assets/icons/20x20/quiz.png differ
diff --git a/src/assets/icons/20x20/score.png b/src/assets/icons/20x20/score.png
new file mode 100644
index 0000000..171cb3c
Binary files /dev/null and b/src/assets/icons/20x20/score.png differ
diff --git a/src/assets/icons/20x20/yes.png b/src/assets/icons/20x20/yes.png
new file mode 100644
index 0000000..1ad3c00
Binary files /dev/null and b/src/assets/icons/20x20/yes.png differ
diff --git a/src/assets/icons/about.png b/src/assets/icons/about.png
deleted file mode 100644
index 868c544..0000000
Binary files a/src/assets/icons/about.png and /dev/null differ
diff --git a/src/assets/icons/alert.png b/src/assets/icons/alert.png
index eb30bd9..22aae60 100644
Binary files a/src/assets/icons/alert.png and b/src/assets/icons/alert.png differ
diff --git a/src/assets/icons/check-question.png b/src/assets/icons/check-question.png
deleted file mode 100644
index 2dcb8b9..0000000
Binary files a/src/assets/icons/check-question.png and /dev/null differ
diff --git a/src/assets/icons/critical.png b/src/assets/icons/critical.png
deleted file mode 100644
index 799c227..0000000
Binary files a/src/assets/icons/critical.png and /dev/null differ
diff --git a/src/assets/icons/home.png b/src/assets/icons/home.png
deleted file mode 100644
index 739a895..0000000
Binary files a/src/assets/icons/home.png and /dev/null differ
diff --git a/src/assets/icons/loading.png b/src/assets/icons/loading.png
index 73507d0..0cd50fd 100644
Binary files a/src/assets/icons/loading.png and b/src/assets/icons/loading.png differ
diff --git a/src/assets/icons/question.png b/src/assets/icons/question.png
deleted file mode 100644
index 3bc1af1..0000000
Binary files a/src/assets/icons/question.png and /dev/null differ
diff --git a/src/assets/icons/quiz.png b/src/assets/icons/quiz.png
deleted file mode 100644
index bb366ab..0000000
Binary files a/src/assets/icons/quiz.png and /dev/null differ
diff --git a/src/assets/icons/score.png b/src/assets/icons/score.png
deleted file mode 100644
index 44be27b..0000000
Binary files a/src/assets/icons/score.png and /dev/null differ
diff --git a/src/assets/icons/success.png b/src/assets/icons/success.png
deleted file mode 100644
index c12cc35..0000000
Binary files a/src/assets/icons/success.png and /dev/null differ