diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7311676..2757435 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -66,8 +66,6 @@ unittest:
     reports:
       junit:
         - target/surefire-reports/TEST-*.xml
-        # TODO: Separate unit tests and integration tests
-        # - target/failsafe-reports/TEST-*.xml
 
 generate-coverage:
   stage: docs
diff --git a/README.md b/README.md
index 06647f4..5567dd7 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@ Probably tastes better than any Apple editor and NetBeans combined.
 <!---
 - [devicons/devicon](https://github.com/devicons/devicon) -> Icon languages
   -->
-- [icons8](https://icons8.com/) -> Filetree and language icons.
+- [Papirus](https://github.com/PapirusDevelopmentTeam/papirus-icon-theme) -> Icons for filetree
 - [StackOverflow/38278601](https://stackoverflow.com/questions/38278601/javafx-treeview-directory-listing) ->
   Example of how to generate and show a filetree recursively.
 - [Youtube/ProgrammingKnowledge](https://www.youtube.com/watch?v=RY_Rb2UVQKQ) -> Introduction to the fundamentals
diff --git a/src/main/java/app/controllers/ModelineController.java b/src/main/java/app/controllers/ModelineController.java
index 1432791..fc1cd6f 100644
--- a/src/main/java/app/controllers/ModelineController.java
+++ b/src/main/java/app/controllers/ModelineController.java
@@ -75,8 +75,6 @@ public class ModelineController implements Initializable, Controller {
    */
   @Subscribe
   public void handle(FileSaveStateChangedEvent event) {
-    // TODO: Add CSS styleclass for coloring the saveState label
-    //       whenever it changes
     this.saveState.setText(event.getIsSaved() ? "Saved!" : "Modified");
   }
 
diff --git a/src/main/java/app/service/FiletreeOperations.java b/src/main/java/app/service/FiletreeOperations.java
index 5d64efe..920f638 100644
--- a/src/main/java/app/service/FiletreeOperations.java
+++ b/src/main/java/app/service/FiletreeOperations.java
@@ -22,9 +22,6 @@ public class FiletreeOperations {
 
   private FiletreeOperations() {}
 
-  // TODO: Clean up code that is not in use
-  // TODO: Error check for recursiveness, and files without icons
-
   /**
    * The method to generate the fileTree recursively. If it is a directory a
    * CheckBoxStringItem is created and the method is called again. It goes through
diff --git a/src/main/resources/fxml/components/Menubar.fxml b/src/main/resources/fxml/components/Menubar.fxml
index ba0144a..2370cca 100644
--- a/src/main/resources/fxml/components/Menubar.fxml
+++ b/src/main/resources/fxml/components/Menubar.fxml
@@ -33,7 +33,6 @@
 
         <Menu mnemonicParsing="false" text="Change programming language">
           <items>
-            <!-- TODO: Generate buttons based on classes -->
             <RadioMenuItem text="Java"
                            fx:id="toggleJava"
                            onAction="#handleLanguageChange"
@@ -55,7 +54,6 @@
 
         <Menu mnemonicParsing="false" text="Change color theme">
           <items>
-            <!-- TODO: Generate buttons based on classes -->
             <RadioMenuItem text="Monokai"
                            fx:id="toggleMonokai"
                            onAction="#handleThemeChange"