diff --git a/package-lock.json b/package-lock.json
index d2133f51..5925721c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -16299,15 +16299,6 @@
       "integrity": "sha1-WPcc7jvVGbWdSyqEO2x95krAR2Q=",
       "dev": true
     },
-    "svg-to-vue": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/svg-to-vue/-/svg-to-vue-0.7.0.tgz",
-      "integrity": "sha512-Tg2nMmf3BQorYCAjxbtTkYyWPVSeox5AZUFvfy4MoWK/5tuQlnA/h3LAlTjV3sEvOC5FtUNovRSj3p784l4KOA==",
-      "dev": true,
-      "requires": {
-        "svgo": "^1.3.2"
-      }
-    },
     "svgo": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/svgo/-/svgo-1.3.2.tgz",
@@ -18427,16 +18418,6 @@
         }
       }
     },
-    "vue-svg-loader": {
-      "version": "0.16.0",
-      "resolved": "https://registry.npmjs.org/vue-svg-loader/-/vue-svg-loader-0.16.0.tgz",
-      "integrity": "sha512-2RtFXlTCYWm8YAEO2qAOZ2SuIF2NvLutB5muc3KDYoZq5ZeCHf8ggzSan3ksbbca7CJ/Aw57ZnDF4B7W/AkGtw==",
-      "dev": true,
-      "requires": {
-        "loader-utils": "^1.2.3",
-        "svg-to-vue": "^0.7.0"
-      }
-    },
     "vue-template-compiler": {
       "version": "2.6.12",
       "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.6.12.tgz",
diff --git a/package.json b/package.json
index 048606ee..6255769e 100644
--- a/package.json
+++ b/package.json
@@ -87,7 +87,6 @@
     "vue-cli-plugin-electron-builder": "^2.0.0-rc.4",
     "vue-cli-plugin-styleguidist": "^4.2.3",
     "vue-cli-plugin-vuetify": "^0.6.3",
-    "vue-svg-loader": "^0.16.0",
     "vue-template-compiler": "^2.6.12",
     "vuetify-loader": "^1.2.2",
     "worker-loader": "^3.0.2"
diff --git a/src/assets/icons/test_multiple.svg b/src/assets/icons/test_multiple.svg
index 702220b6..b13bc9b0 100644
--- a/src/assets/icons/test_multiple.svg
+++ b/src/assets/icons/test_multiple.svg
@@ -1,110 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:version="1.0 (4035a4f, 2020-05-01)"
-   height="57"
-   width="56"
-   sodipodi:docname="test_multiple.svg"
-   id="svg44"
-   xml:space="preserve"
-   enable-background="new 0 0 64 64"
-   viewBox="0 0 56 57"
-   y="0px"
-   x="0px"
-   version="1.1"><metadata
-     id="metadata50"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
-     id="defs48" /><sodipodi:namedview
-     inkscape:current-layer="svg44"
-     inkscape:window-maximized="0"
-     inkscape:window-y="286"
-     inkscape:window-x="968"
-     inkscape:cy="26.857143"
-     inkscape:cx="7.047619"
-     inkscape:zoom="9.1875"
-     fit-margin-bottom="0"
-     fit-margin-right="0"
-     fit-margin-left="0"
-     fit-margin-top="0"
-     showgrid="false"
-     id="namedview46"
-     inkscape:window-height="910"
-     inkscape:window-width="1223"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     guidetolerance="10"
-     gridtolerance="10"
-     objecttolerance="10"
-     borderopacity="1"
-     bordercolor="#666666"
-     pagecolor="#ffffff" /><g
-     transform="translate(-4,-4)"
-     id="g38"><path
-       id="path10"
-       d="M 18.071,11 19.268,6 H 4.887 l 1.196,5 H 5 4 v 2 h 1 v 40 c 0,3.86 3.141,7 7,7 3.859,0 7,-3.14 7,-7 V 13 h 1 V 11 H 19 Z M 7.1,15.25 C 7.628,17.458 9.675,19 12.077,19 14.419,19 16.411,17.529 17,15.41 V 29 H 7 V 14.833 Z M 8.618,13 h 6.917 l -0.427,1.785 C 14.802,16.068 13.526,17 12.077,17 10.627,17 9.351,16.068 9.045,14.784 Z M 7.422,8 h 9.311 l -0.718,3 H 8.14 Z M 12,58 C 9.243,58 7,55.757 7,53 V 31 h 10 v 22 c 0,2.757 -2.243,5 -5,5 z" /><rect
-       id="rect12"
-       height="2"
-       width="2"
-       y="33"
-       x="10" /><rect
-       id="rect14"
-       height="2"
-       width="2"
-       y="42"
-       x="12" /><rect
-       id="rect16"
-       height="2"
-       width="2"
-       y="45"
-       x="8" /><path
-       id="path18"
-       d="m 45,12 h -1 v 2 h 1 v 40 c 0,3.86 3.141,7 7,7 3.859,0 7,-3.14 7,-7 V 14 h 1 v -2 h -1 z m 12,42 c 0,2.757 -2.243,5 -5,5 -2.757,0 -5,-2.243 -5,-5 V 37 H 57 Z M 57,35 H 47 V 14 h 10 z" /><path
-       id="path20"
-       d="M 26.5,4 H 24 v 2 h 1 v 40 c 0,3.86 3.141,7 7,7 3.859,0 7,-3.14 7,-7 V 6 h 1 V 4 H 37.5 Z M 32,51 c -2.757,0 -5,-2.243 -5,-5 V 19 h 10 v 27 c 0,2.757 -2.243,5 -5,5 z M 37,17 H 27 V 6 h 10 z" /><rect
-       id="rect22"
-       height="2"
-       width="2"
-       y="21"
-       x="30" /><rect
-       id="rect24"
-       height="2"
-       width="2"
-       y="30"
-       x="33" /><rect
-       id="rect26"
-       height="2"
-       width="2"
-       y="26"
-       x="28" /><rect
-       id="rect28"
-       height="2"
-       width="2"
-       y="42"
-       x="54" /><rect
-       id="rect30"
-       height="2"
-       width="2"
-       y="46"
-       x="49" /><rect
-       id="rect32"
-       height="2"
-       width="2"
-       y="51"
-       x="53" /><rect
-       id="rect34"
-       height="2"
-       width="2"
-       y="6"
-       x="55" /><rect
-       id="rect36"
-       height="2"
-       width="2"
-       y="9"
-       x="50" /></g></svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">c
diff --git a/src/components/icons/IconTestMultiple.vue b/src/components/icons/IconTestMultiple.vue
new file mode 100644
index 00000000..c3c8decb
--- /dev/null
+++ b/src/components/icons/IconTestMultiple.vue
@@ -0,0 +1,20 @@
+<template>
+    <!-- eslint-disable-next-line -->
+    <svg width="100%" height="100%" viewBox="0 0 300 300" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;"><path d="M15.3,5.86l0,24.74l12.37,0l0,173.18c0,27.144 22.336,49.48 49.48,49.48c27.144,0 49.48,-22.336 49.48,-49.48l0,-173.18l12.37,0l0,-24.74l-123.7,0m49.48,173.18c-7.422,0 -12.37,-4.948 -12.37,-12.37c0,-7.422 4.948,-12.37 12.37,-12.37c7.422,0 12.37,4.948 12.37,12.37c0,7.422 -4.948,12.37 -12.37,12.37m24.74,-49.48c-7.422,0 -12.37,-4.948 -12.37,-12.37c0,-7.422 4.948,-12.37 12.37,-12.37c7.422,0 12.37,4.948 12.37,12.37c0,7.422 -4.948,12.37 -12.37,12.37m12.37,-61.85l-49.48,0l0,-37.11l49.48,0l0,37.11Z" style="fill-rule:nonzero;"/><path d="M160.3,42.97l123.7,0l0,24.74l-12.37,0l0,173.18c0,27.144 -22.336,49.48 -49.48,49.48c-27.144,0 -49.48,-22.336 -49.48,-49.48l0,-173.18l-12.37,0l0,-24.74m86.59,24.74l-49.48,0l0,173.18c0,13.572 11.168,24.74 24.74,24.74c13.572,0 24.74,-11.168 24.74,-24.74l0,-173.18Z" style="fill-rule:nonzero;"/></svg>
+</template>
+
+<script lang="ts">
+import Vue from "vue";
+import Component from "vue-class-component";
+import { Prop } from "vue-property-decorator";
+
+@Component
+export default class IconTestMultiple extends Vue {
+}
+</script>
+
+<style scoped>
+    svg {
+        fill: currentColor;
+    }
+</style>
diff --git a/src/components/navigation-drawers/Toolbar.vue b/src/components/navigation-drawers/Toolbar.vue
index 35e79051..82ba960b 100644
--- a/src/components/navigation-drawers/Toolbar.vue
+++ b/src/components/navigation-drawers/Toolbar.vue
@@ -27,7 +27,7 @@
                         link
                         @click="navigate('/analysis/single', true)">
                         <v-list-item-icon>
-                            <v-icon>mdi-bacteria</v-icon>
+                            <v-icon>mdi-test-tube</v-icon>
                         </v-list-item-icon>
                         <v-list-item-content>
                             <v-list-item-title>Single assay analysis</v-list-item-title>
@@ -54,7 +54,7 @@
                         link
                         @click="navigate('/peptide/single', false)">
                         <v-list-item-icon>
-                            <v-icon>mdi-test-tube</v-icon>
+                            <v-icon>mdi-bacteria</v-icon>
                         </v-list-item-icon>
                         <v-list-item-content>
                             <v-list-item-title>Single peptide analysis</v-list-item-title>
@@ -216,10 +216,14 @@ export default class Toolbar extends Vue {
     }
 
     .navigation-toolbar .v-list-item .v-icon:hover {
-        color: #2196F3;
+        color: #2196f3;
     }
 
     .v-list-item--disabled .v-icon {
-        color: rgba(0, 0, 0, 0.15);
+        color: rgb(170, 170, 170) !important;
+    }
+
+    .v-list-item:hover .v-icon {
+        color: #2196f3;
     }
 </style>
diff --git a/src/components/pages/ComparativeAnalysisPage.vue b/src/components/pages/ComparativeAnalysisPage.vue
index 2a42c612..1c37ce54 100644
--- a/src/components/pages/ComparativeAnalysisPage.vue
+++ b/src/components/pages/ComparativeAnalysisPage.vue
@@ -2,7 +2,7 @@
     <v-container fluid>
         <v-row>
             <v-col>
-                <div style="max-width: 1200px; margin: auto;">
+                <div style="margin: auto;">
                     <collapsable-card>
                         <template v-slot:title><span>Data selection</span></template>
                         <template v-slot:content>
diff --git a/src/plugins/vuetify.ts b/src/plugins/vuetify.ts
index e279e434..1cda89f6 100644
--- a/src/plugins/vuetify.ts
+++ b/src/plugins/vuetify.ts
@@ -1,8 +1,7 @@
 import Vue from "vue";
 import Vuetify from "vuetify/lib";
 import { Ripple } from "vuetify/lib/directives"
-// @ts-ignore
-import IconTestMultiple from "@/assets/icons/test_multiple.svg";
+import IconTestMultiple from "@/components/icons/IconTestMultiple.vue";
 
 Vue.use(Vuetify, {
     directives: {
diff --git a/vue.config.js b/vue.config.js
index bd4b3bd5..e6b63fbd 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -11,17 +11,6 @@ module.exports = {
             }
         ]);
         config.output.globalObject("this");
-
-
-        const svgRule = config.module.rule("svg");
-        svgRule.uses.clear();
-
-        svgRule
-            .use("babel-loader")
-            .loader("babel-loader")
-            .end()
-            .use("vue-svg-loader")
-            .loader("vue-svg-loader");
     },
     pluginOptions: {
         electronBuilder: {