diff --git a/app/configurations/config.joensuu.js b/app/configurations/config.joensuu.js
index 11fd004959..7132015880 100644
--- a/app/configurations/config.joensuu.js
+++ b/app/configurations/config.joensuu.js
@@ -23,6 +23,8 @@ export default configMerger(walttiConfig, {
 
   title: APP_TITLE,
 
+  favicon: './app/configurations/images/joensuu/favicon.png',
+
   // Navbar logo
   logo: 'joensuu/jojo-logo.png',
 
diff --git a/app/configurations/config.jyvaskyla.js b/app/configurations/config.jyvaskyla.js
index a9b01e6f16..c5a0aad82a 100644
--- a/app/configurations/config.jyvaskyla.js
+++ b/app/configurations/config.jyvaskyla.js
@@ -56,6 +56,8 @@ export default configMerger(walttiConfig, {
 
   title: APP_TITLE,
 
+  favicon: './app/configurations/images/jyvaskyla/favicon.png',
+
   // Navbar logo
   logo: 'jyvaskyla/favicon.png',
 
diff --git a/app/configurations/config.lahti.js b/app/configurations/config.lahti.js
index 66df027d6c..988586e46e 100644
--- a/app/configurations/config.lahti.js
+++ b/app/configurations/config.lahti.js
@@ -33,6 +33,8 @@ export default configMerger(walttiConfig, {
 
   title: APP_TITLE,
 
+  favicon: './app/configurations/images/lahti/favicon.png',
+
   // Navbar logo
   logo: 'lahti/lahti-logo.png',
   secondaryLogo: 'lahti/secondary-lahti-logo.png',
diff --git a/app/configurations/config.oulu.js b/app/configurations/config.oulu.js
index 41be25b6da..fd31132f9a 100644
--- a/app/configurations/config.oulu.js
+++ b/app/configurations/config.oulu.js
@@ -34,6 +34,8 @@ export default configMerger(walttiConfig, {
 
   title: APP_TITLE,
 
+  favicon: './app/configurations/images/oulu/favicon.png',
+
   // Navbar logo
   logo: 'oulu/oulu-logo.png',
   secondaryLogo: 'oulu/secondary-oulu-logo.png',
diff --git a/app/configurations/config.pori.js b/app/configurations/config.pori.js
index 7334dfb4ab..13c7c147a9 100644
--- a/app/configurations/config.pori.js
+++ b/app/configurations/config.pori.js
@@ -31,7 +31,7 @@ export default configMerger(walttiConfig, {
 
   title: APP_TITLE,
 
-  favicon: 'pori/favicon.svg',
+  favicon: './app/configurations/images/pori/favicon.png',
 
   // Navbar logo
   logo: 'pori/pori_logo.svg',
diff --git a/app/configurations/config.rovaniemi.js b/app/configurations/config.rovaniemi.js
index f4544ac752..feba311baf 100644
--- a/app/configurations/config.rovaniemi.js
+++ b/app/configurations/config.rovaniemi.js
@@ -29,6 +29,7 @@ export default configMerger(walttiConfig, {
   },
 
   title: APP_TITLE,
+  favicon: './app/configurations/images/rovaniemi/favicon.png',
   // Navbar logo
   logo: 'rovaniemi/rovaniemi-logo.svg',
   feedIds: ['Rovaniemi'],
diff --git a/app/configurations/config.tampere.js b/app/configurations/config.tampere.js
index a8814546ad..87402e63fe 100644
--- a/app/configurations/config.tampere.js
+++ b/app/configurations/config.tampere.js
@@ -38,7 +38,7 @@ export default configMerger(walttiConfig, {
   // Navbar logo
   logo: 'tampere/tampere-logo.png',
 
-  favicon: './sass/themes/tampere/favicon.png',
+  favicon: './app/configurations/images/tampere/favicon.png',
 
   feedIds: ['tampere', 'digitraffic', 'tampereDRT'],
 
diff --git a/app/configurations/config.turku.js b/app/configurations/config.turku.js
index 09ad655408..b2c494a952 100644
--- a/app/configurations/config.turku.js
+++ b/app/configurations/config.turku.js
@@ -79,6 +79,8 @@ export default configMerger(walttiConfig, {
 
   title: APP_TITLE,
 
+  favicon: './app/configurations/images/turku/favicon.png',
+
   // Navbar logo
   logo: 'turku/foli-logo.png',
 
diff --git a/sass/themes/default/favicon.png b/sass/themes/default/favicon.png
deleted file mode 100644
index bef94ee02a..0000000000
Binary files a/sass/themes/default/favicon.png and /dev/null differ
diff --git a/sass/themes/hameenlinna/favicon.png b/sass/themes/hameenlinna/favicon.png
deleted file mode 100644
index e020697a3d..0000000000
Binary files a/sass/themes/hameenlinna/favicon.png and /dev/null differ
diff --git a/sass/themes/hsl/icon_favicon-reittiopas.svg b/sass/themes/hsl/icon_favicon-reittiopas.svg
deleted file mode 100644
index f1bdc1d15c..0000000000
--- a/sass/themes/hsl/icon_favicon-reittiopas.svg
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 283.465 283.632" enable-background="new 0 0 283.465 283.632" xml:space="preserve">
-<g id="bkg" display="none">
-</g>
-<g id="picto">
-	<rect x="-0.118" y="0.084" fill="#F092CD" width="283.582" height="283.582"/>
-	<g>
-		<path fill="#FFFFFF" d="M245.197,141.816c0,9.11-8.46,15.618-19.847,15.618c-0.325,0-9.11-0.326-15.617-6.507l-13.34,32.211
-			c8.785,0.325,15.292,6.507,15.617,6.832c8.134,8.134,9.11,18.546,2.929,24.728c-6.507,6.507-16.919,5.206-25.053-2.603
-			c-0.326-0.326-6.507-6.507-6.833-15.943l-31.885,13.34c6.182,6.832,6.182,15.617,6.182,15.943
-			c0,11.388-6.507,19.847-15.617,19.847s-15.618-8.459-15.618-19.847c0-0.326,0-9.11,6.507-15.943l-32.536-13.34
-			c0,9.435-6.182,15.617-6.507,15.943c-8.134,7.809-18.546,9.11-25.053,2.603c-6.507-6.182-5.206-16.594,2.929-24.728
-			c0.325-0.325,6.507-6.507,15.617-6.832l-13.34-32.211c-6.507,6.182-15.292,6.507-15.618,6.507
-			c-11.713,0-19.847-6.507-19.847-15.618c0-9.11,8.134-15.617,19.847-15.617c0.326,0,9.11,0,15.618,6.182l13.34-31.885
-			c-9.11-0.651-15.292-6.507-15.617-6.832c-8.134-8.134-9.436-18.546-2.929-25.053s16.919-5.206,25.053,2.928
-			c0.326,0.326,6.507,6.507,6.507,15.618l32.536-13.34c-6.507-6.507-6.507-15.292-6.507-15.617c0-11.713,6.507-19.847,15.618-19.847
-			s15.617,8.134,15.617,19.847c0,0.325,0,9.11-6.182,15.617l31.885,13.34c0.326-9.11,6.507-15.292,6.833-15.618
-			c8.134-8.134,18.546-9.435,25.053-2.928c6.182,6.507,5.206,16.919-2.929,25.053c-0.325,0.325-6.832,6.182-15.617,6.832
-			l13.34,31.885c6.507-6.182,15.292-6.182,15.617-6.182C236.737,126.199,245.197,132.706,245.197,141.816z M69.828,141.816
-			c-3.904-6.507-11.388-6.832-11.713-6.832c-6.507,0-10.737,2.928-10.737,6.832c0,3.905,4.229,6.507,10.737,6.507
-			C58.44,148.323,65.924,147.998,69.828,141.816z M77.961,87.156c0.326,0.325,5.532,5.531,13.015,3.904
-			c1.627-7.483-3.579-12.689-3.904-13.34c-4.23-4.23-9.435-5.532-12.363-2.603C72.105,77.72,73.407,82.926,77.961,87.156z
-			 M90.976,192.572c-7.483-1.952-12.689,3.254-13.015,3.579c-4.555,4.555-5.856,9.76-3.253,12.363
-			c2.928,2.603,8.134,1.627,12.363-2.928C87.397,205.261,92.928,199.73,90.976,192.572z M185.656,185.414l17.895-43.598
-			l-17.895-43.924l-43.924-18.22l-43.924,18.22l-18.22,43.924l18.22,43.598l43.924,18.22L185.656,185.414z M135.225,58.199
-			c0,0.325,0,7.809,6.507,11.713c6.182-3.904,6.507-11.388,6.507-11.713c0-6.507-2.603-10.737-6.507-10.737
-			S135.225,51.691,135.225,58.199z M148.24,225.434c0-0.326-0.326-8.134-6.507-11.713c-6.507,3.579-6.507,11.387-6.507,11.713
-			c0,6.182,2.603,10.737,6.507,10.737S148.24,231.615,148.24,225.434z M192.489,91.06c7.158,1.627,12.689-3.579,13.014-3.904
-			c4.555-4.23,5.857-9.435,2.929-12.038c-2.603-2.929-7.809-1.627-12.364,2.603C195.742,78.371,190.862,83.577,192.489,91.06z
-			 M205.503,196.151c-0.325-0.326-5.856-5.531-13.014-3.579c-1.627,7.158,3.253,12.689,3.579,13.015
-			c4.555,4.555,9.761,5.531,12.364,2.928C211.359,205.912,210.058,200.706,205.503,196.151z M236.087,141.816
-			c0-3.904-4.555-6.832-10.737-6.832c-0.325,0-7.809,0.326-11.713,6.832c3.904,6.182,11.388,6.507,11.713,6.507
-			C231.532,148.323,236.087,145.721,236.087,141.816z"/>
-	</g>
-</g>
-</svg>
diff --git a/sass/themes/joensuu/favicon.png b/sass/themes/joensuu/favicon.png
deleted file mode 100644
index 2224ab9a6b..0000000000
Binary files a/sass/themes/joensuu/favicon.png and /dev/null differ
diff --git a/sass/themes/jyvaskyla/favicon.png b/sass/themes/jyvaskyla/favicon.png
deleted file mode 100644
index 9b240aa5da..0000000000
Binary files a/sass/themes/jyvaskyla/favicon.png and /dev/null differ
diff --git a/sass/themes/kouvola/favicon.png b/sass/themes/kouvola/favicon.png
deleted file mode 100644
index 3d15961dca..0000000000
Binary files a/sass/themes/kouvola/favicon.png and /dev/null differ
diff --git a/sass/themes/kuopio/favicon.png b/sass/themes/kuopio/favicon.png
deleted file mode 100644
index 09cb619a51..0000000000
Binary files a/sass/themes/kuopio/favicon.png and /dev/null differ
diff --git a/sass/themes/lahti/favicon.png b/sass/themes/lahti/favicon.png
deleted file mode 100644
index 76fcc8a434..0000000000
Binary files a/sass/themes/lahti/favicon.png and /dev/null differ
diff --git a/sass/themes/lappeenranta/bussi_fin.jpeg b/sass/themes/lappeenranta/bussi_fin.jpeg
deleted file mode 100644
index 1fd9bba882..0000000000
Binary files a/sass/themes/lappeenranta/bussi_fin.jpeg and /dev/null differ
diff --git a/sass/themes/matka/icon_favicon-matkafi.svg b/sass/themes/matka/icon_favicon-matkafi.svg
deleted file mode 100644
index 139bedde1f..0000000000
--- a/sass/themes/matka/icon_favicon-matkafi.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 283.46 283.46" enable-background="new 0 0 283.46 283.46" xml:space="preserve">
-<g id="bkg" display="none">
-</g>
-<g id="picto">
-	<path fill="#00AFFF" d="M241.015,283.465H42.589c-23.483,0-42.52-19.037-42.52-42.52V42.52C0.07,19.037,19.106,0,42.589,0h198.425
-		c23.483,0,42.52,19.037,42.52,42.52v198.425C283.534,264.428,264.497,283.465,241.015,283.465z"/>
-	<circle fill="#FFFFFF" cx="141.73" cy="141.73" r="85.039"/>
-</g>
-</svg>
diff --git a/sass/themes/oulu/favicon.png b/sass/themes/oulu/favicon.png
deleted file mode 100644
index 8a5c8fa79c..0000000000
Binary files a/sass/themes/oulu/favicon.png and /dev/null differ
diff --git a/sass/themes/rovaniemi/favicon.png b/sass/themes/rovaniemi/favicon.png
deleted file mode 100644
index 5c5100015e..0000000000
Binary files a/sass/themes/rovaniemi/favicon.png and /dev/null differ
diff --git a/sass/themes/tampere/favicon.png b/sass/themes/tampere/favicon.png
deleted file mode 100644
index 4d1f677d96..0000000000
Binary files a/sass/themes/tampere/favicon.png and /dev/null differ
diff --git a/sass/themes/turku/favicon.png b/sass/themes/turku/favicon.png
deleted file mode 100644
index a13f2f12a3..0000000000
Binary files a/sass/themes/turku/favicon.png and /dev/null differ
diff --git a/sass/themes/varely/favicon.png b/sass/themes/varely/favicon.png
deleted file mode 100644
index 833f1a211b..0000000000
Binary files a/sass/themes/varely/favicon.png and /dev/null differ