diff --git a/README.md b/README.md
index 30d2c59..bb0dc34 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,6 @@ The result apk file will be placed in ```app/build/outputs/apk/```.
 * [Moshi](https://github.com/square/moshi) by Square, Inc.
 * [Kotlin Standard Library](https://github.com/JetBrains/kotlin) by JetBrains s.r.o. and Kotlin Programming Language contributors
 * [kotlinx.coroutines](https://github.com/Kotlin/kotlinx.coroutines) by JetBrains s.r.o.
-* [PhotoView](https://github.com/chrisbanes/PhotoView) by Chris Banes, Marek Sebera and John Carlson
 
 ## Contributors
 
diff --git a/app/build.gradle b/app/build.gradle
index 1b439d5..5de9a2b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -99,5 +99,4 @@ dependencies {
     }
     implementation 'com.squareup.okio:okio:2.10.0'
     implementation 'com.squareup.moshi:moshi:1.12.0'
-    implementation 'com.github.chrisbanes:PhotoView:2.3.0'
 }
diff --git a/app/src/main/java/org/matomocamp/companion/activities/MainActivity.kt b/app/src/main/java/org/matomocamp/companion/activities/MainActivity.kt
index 36f9086..3e7a816 100644
--- a/app/src/main/java/org/matomocamp/companion/activities/MainActivity.kt
+++ b/app/src/main/java/org/matomocamp/companion/activities/MainActivity.kt
@@ -36,7 +36,6 @@ import org.matomocamp.companion.api.MatomoCampUrls
 import org.matomocamp.companion.db.ScheduleDao
 import org.matomocamp.companion.fragments.BookmarksListFragment
 import org.matomocamp.companion.fragments.LiveFragment
-import org.matomocamp.companion.fragments.MapFragment
 import org.matomocamp.companion.fragments.PersonsListFragment
 import org.matomocamp.companion.fragments.TracksFragment
 import org.matomocamp.companion.model.DownloadScheduleResult
diff --git a/app/src/main/java/org/matomocamp/companion/fragments/MapFragment.kt b/app/src/main/java/org/matomocamp/companion/fragments/MapFragment.kt
deleted file mode 100644
index 6579cb6..0000000
--- a/app/src/main/java/org/matomocamp/companion/fragments/MapFragment.kt
+++ /dev/null
@@ -1,79 +0,0 @@
-package org.matomocamp.companion.fragments
-
-import android.content.ActivityNotFoundException
-import android.content.Intent
-import android.net.Uri
-import android.os.Bundle
-import android.view.Menu
-import android.view.MenuInflater
-import android.view.MenuItem
-import android.view.View
-import android.widget.ImageView
-import androidx.browser.customtabs.CustomTabsIntent
-import androidx.core.net.toUri
-import androidx.fragment.app.Fragment
-import org.matomocamp.companion.R
-import org.matomocamp.companion.api.MatomoCampUrls.localNavigation
-import org.matomocamp.companion.utils.configureToolbarColors
-import org.matomocamp.companion.utils.invertImageColors
-import org.matomocamp.companion.utils.isLightTheme
-
-class MapFragment : Fragment(R.layout.fragment_map) {
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setHasOptionsMenu(true)
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        view.findViewById<ImageView>(R.id.map).apply {
-            if (!context.isLightTheme) {
-                invertImageColors()
-            }
-        }
-    }
-
-    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) = inflater.inflate(R.menu.map, menu)
-
-    override fun onOptionsItemSelected(item: MenuItem) = when (item.itemId) {
-        R.id.directions -> {
-            launchDirections()
-            true
-        }
-        R.id.navigation -> {
-            launchLocalNavigation()
-            true
-        }
-        else -> false
-    }
-
-    private fun launchDirections() {
-        // Build intent to start Google Maps directions
-        val uri = "https://maps.google.com/maps?f=d&daddr=${DESTINATION_LATITUDE},${DESTINATION_LONGITUDE}&dirflg=r".toUri()
-        val intent = Intent(Intent.ACTION_VIEW, uri)
-
-        try {
-            startActivity(intent)
-        } catch (ignore: ActivityNotFoundException) {
-        }
-    }
-
-    private fun launchLocalNavigation() {
-        try {
-            val context = requireContext()
-            CustomTabsIntent.Builder()
-                    .configureToolbarColors(context, R.color.light_color_primary)
-                    .setShowTitle(true)
-                    .build()
-                    .launchUrl(context, Uri.parse(localNavigation))
-        } catch (ignore: ActivityNotFoundException) {
-        }
-    }
-
-    companion object {
-        private const val DESTINATION_LATITUDE = 50.812375
-        private const val DESTINATION_LONGITUDE = 4.380734
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/matomocamp/companion/widgets/PhotoViewDrawerLayout.kt b/app/src/main/java/org/matomocamp/companion/widgets/PhotoViewDrawerLayout.kt
deleted file mode 100644
index 27f95dd..0000000
--- a/app/src/main/java/org/matomocamp/companion/widgets/PhotoViewDrawerLayout.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.matomocamp.companion.widgets
-
-import android.content.Context
-import android.util.AttributeSet
-import android.view.MotionEvent
-import androidx.drawerlayout.widget.DrawerLayout
-
-/**
- * DrawerLayout which includes a fix to prevent crashes with PhotoView.
- *
- *
- * See https://github.com/chrisbanes/PhotoView#issues-with-viewgroups
- * http://code.google.com/p/android/issues/detail?id=18990
- */
-class PhotoViewDrawerLayout : DrawerLayout {
-
-    constructor(context: Context) : super(context)
-    constructor(context: Context, attrs: AttributeSet?) : super(context, attrs)
-    constructor(context: Context, attrs: AttributeSet?, defStyle: Int) : super(context, attrs, defStyle)
-
-    override fun onInterceptTouchEvent(ev: MotionEvent): Boolean {
-        return try {
-            super.onInterceptTouchEvent(ev)
-        } catch (e: Exception) {
-            false
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/matomocamp/companion/widgets/SaveStatePhotoView.kt b/app/src/main/java/org/matomocamp/companion/widgets/SaveStatePhotoView.kt
deleted file mode 100644
index ddb3a1f..0000000
--- a/app/src/main/java/org/matomocamp/companion/widgets/SaveStatePhotoView.kt
+++ /dev/null
@@ -1,87 +0,0 @@
-package org.matomocamp.companion.widgets
-
-import android.content.Context
-import android.os.Parcel
-import android.os.Parcelable
-import android.util.AttributeSet
-import androidx.core.view.doOnLayout
-import androidx.customview.view.AbsSavedState
-import com.github.chrisbanes.photoview.PhotoView
-
-/**
- * PhotoView which saves and restores the current scale and approximate position.
- */
-class SaveStatePhotoView : PhotoView {
-
-    constructor(context: Context) : super(context)
-    constructor(context: Context, attr: AttributeSet?) : super(context, attr)
-    constructor(context: Context, attr: AttributeSet?, defStyle: Int) : super(context, attr, defStyle)
-
-    override fun onSaveInstanceState(): Parcelable? {
-        val superState = super.onSaveInstanceState()
-        val rect = displayRect
-        val overflowWidth = rect.width() - width
-        val pivotX = if (overflowWidth > 0f) {
-            -rect.left / overflowWidth
-        } else 0.5f
-        val overflowHeight = rect.height() - height
-        val pivotY = if (overflowHeight > 0f) {
-            -rect.top / overflowHeight
-        } else 0.5f
-        return SavedState(superState ?: AbsSavedState.EMPTY_STATE, scale, pivotX, pivotY)
-    }
-
-    override fun onRestoreInstanceState(state: Parcelable) {
-        if (state !is SavedState) {
-            super.onRestoreInstanceState(state)
-            return
-        }
-
-        super.onRestoreInstanceState(state.superState)
-
-        doOnLayout {
-            setScale(state.scale.coerceIn(minimumScale, maximumScale),
-                    width * state.pivotX,
-                    height * state.pivotY,
-                    false)
-        }
-    }
-
-    class SavedState : AbsSavedState {
-
-        val scale: Float
-        val pivotX: Float
-        val pivotY: Float
-
-        constructor(superState: Parcelable, scale: Float, pivotX: Float, pivotY: Float) : super(superState) {
-            this.scale = scale
-            this.pivotX = pivotX
-            this.pivotY = pivotY
-        }
-
-        override fun writeToParcel(out: Parcel, flags: Int) {
-            super.writeToParcel(out, flags)
-            out.writeFloat(scale)
-            out.writeFloat(pivotX)
-            out.writeFloat(pivotY)
-        }
-
-        private constructor(source: Parcel, loader: ClassLoader?) : super(source, loader) {
-            scale = source.readFloat()
-            pivotX = source.readFloat()
-            pivotY = source.readFloat()
-        }
-
-        companion object {
-            @JvmField
-            @Suppress("UNUSED")
-            val CREATOR = object : Parcelable.ClassLoaderCreator<SavedState> {
-                override fun createFromParcel(source: Parcel, loader: ClassLoader?) = SavedState(source, loader)
-
-                override fun createFromParcel(source: Parcel) = SavedState(source, null)
-
-                override fun newArray(size: Int) = arrayOfNulls<SavedState>(size)
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/res/drawable-hdpi/campusmap.png b/app/src/main/res/drawable-hdpi/campusmap.png
deleted file mode 100644
index e7aa60b..0000000
Binary files a/app/src/main/res/drawable-hdpi/campusmap.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/room_h1.png b/app/src/main/res/drawable-hdpi/room_h1.png
deleted file mode 100644
index 32cd349..0000000
Binary files a/app/src/main/res/drawable-hdpi/room_h1.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/room_h2.png b/app/src/main/res/drawable-hdpi/room_h2.png
deleted file mode 100644
index 0350820..0000000
Binary files a/app/src/main/res/drawable-hdpi/room_h2.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/room_janson.png b/app/src/main/res/drawable-hdpi/room_janson.png
deleted file mode 100644
index 9e05090..0000000
Binary files a/app/src/main/res/drawable-hdpi/room_janson.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/room_k1105.png b/app/src/main/res/drawable-hdpi/room_k1105.png
deleted file mode 100644
index 1fa141b..0000000
Binary files a/app/src/main/res/drawable-hdpi/room_k1105.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/room_k3.png b/app/src/main/res/drawable-hdpi/room_k3.png
deleted file mode 100644
index f302082..0000000
Binary files a/app/src/main/res/drawable-hdpi/room_k3.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/room_k4.png b/app/src/main/res/drawable-hdpi/room_k4.png
deleted file mode 100644
index eeb04d3..0000000
Binary files a/app/src/main/res/drawable-hdpi/room_k4.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/room_u2.png b/app/src/main/res/drawable-hdpi/room_u2.png
deleted file mode 100644
index 5140172..0000000
Binary files a/app/src/main/res/drawable-hdpi/room_u2.png and /dev/null differ
diff --git a/app/src/main/res/drawable-ldpi/room_ay.png b/app/src/main/res/drawable-ldpi/room_ay.png
deleted file mode 100644
index 65be070..0000000
Binary files a/app/src/main/res/drawable-ldpi/room_ay.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/room_aw1.png b/app/src/main/res/drawable-mdpi/room_aw1.png
deleted file mode 100644
index 2bec265..0000000
Binary files a/app/src/main/res/drawable-mdpi/room_aw1.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/room_aw1120.png b/app/src/main/res/drawable-mdpi/room_aw1120.png
deleted file mode 100644
index 2d04276..0000000
Binary files a/app/src/main/res/drawable-mdpi/room_aw1120.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/room_aw1125.png b/app/src/main/res/drawable-mdpi/room_aw1125.png
deleted file mode 100644
index 52c0534..0000000
Binary files a/app/src/main/res/drawable-mdpi/room_aw1125.png and /dev/null differ
diff --git a/app/src/main/res/drawable/room_aw1105.xml b/app/src/main/res/drawable/room_aw1105.xml
deleted file mode 100644
index 9f94b19..0000000
--- a/app/src/main/res/drawable/room_aw1105.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:bottom="75dp"
-        android:drawable="@drawable/shape_room"
-        android:left="194dp"
-        android:right="66dp"
-        android:top="257dp"/>
-    <item android:drawable="@drawable/room_aw1"/>
-</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/room_aw1115.xml b/app/src/main/res/drawable/room_aw1115.xml
deleted file mode 100644
index 7958f59..0000000
--- a/app/src/main/res/drawable/room_aw1115.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:bottom="75dp"
-        android:drawable="@drawable/shape_room"
-        android:left="5dp"
-        android:right="255dp"
-        android:top="284dp"/>
-    <item android:drawable="@drawable/room_aw1"/>
-</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/room_aw1117.xml b/app/src/main/res/drawable/room_aw1117.xml
deleted file mode 100644
index 0168d9d..0000000
--- a/app/src/main/res/drawable/room_aw1117.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:bottom="129dp"
-        android:drawable="@drawable/shape_room"
-        android:left="5dp"
-        android:right="255dp"
-        android:top="230dp"/>
-    <item android:drawable="@drawable/room_aw1"/>
-</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/room_aw1121.xml b/app/src/main/res/drawable/room_aw1121.xml
deleted file mode 100644
index f35b64a..0000000
--- a/app/src/main/res/drawable/room_aw1121.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:bottom="326dp"
-        android:drawable="@drawable/shape_room"
-        android:left="49dp"
-        android:right="179dp"
-        android:top="5dp"/>
-    <item android:drawable="@drawable/room_aw1"/>
-</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/room_aw1124.xml b/app/src/main/res/drawable/room_aw1124.xml
deleted file mode 100644
index 61ba981..0000000
--- a/app/src/main/res/drawable/room_aw1124.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:bottom="230dp"
-        android:drawable="@drawable/shape_room"
-        android:left="83dp"
-        android:right="142dp"
-        android:top="119dp"/>
-    <item android:drawable="@drawable/room_aw1"/>
-</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/room_aw1126.xml b/app/src/main/res/drawable/room_aw1126.xml
deleted file mode 100644
index 9d7bceb..0000000
--- a/app/src/main/res/drawable/room_aw1126.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:bottom="211dp"
-        android:drawable="@drawable/shape_room"
-        android:left="164dp"
-        android:right="65dp"
-        android:top="119dp"/>
-    <item android:drawable="@drawable/room_aw1"/>
-</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/room_h1301.xml b/app/src/main/res/drawable/room_h1301.xml
deleted file mode 100644
index c7f2f36..0000000
--- a/app/src/main/res/drawable/room_h1301.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:bottom="261dp"
-        android:drawable="@drawable/shape_room"
-        android:left="90dp"
-        android:right="547dp"
-        android:top="69dp"/>
-    <item android:drawable="@drawable/room_h1"/>
-</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/room_h1302.xml b/app/src/main/res/drawable/room_h1302.xml
deleted file mode 100644
index cadf662..0000000
--- a/app/src/main/res/drawable/room_h1302.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:bottom="261dp"
-        android:drawable="@drawable/shape_room"
-        android:left="181dp"
-        android:right="442dp"
-        android:top="72dp"/>
-    <item android:drawable="@drawable/room_h1"/>
-</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/room_h1308.xml b/app/src/main/res/drawable/room_h1308.xml
deleted file mode 100644
index f358f8b..0000000
--- a/app/src/main/res/drawable/room_h1308.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:bottom="263dp"
-        android:drawable="@drawable/shape_room"
-        android:left="366dp"
-        android:right="261dp"
-        android:top="96dp"/>
-    <item android:drawable="@drawable/room_h1"/>
-</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/room_h1309.xml b/app/src/main/res/drawable/room_h1309.xml
deleted file mode 100644
index 53d26fa..0000000
--- a/app/src/main/res/drawable/room_h1309.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:bottom="263dp"
-        android:drawable="@drawable/shape_room"
-        android:left="468dp"
-        android:right="165dp"
-        android:top="98dp"/>
-    <item android:drawable="@drawable/room_h1"/>
-</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/room_h2211.xml b/app/src/main/res/drawable/room_h2211.xml
deleted file mode 100644
index f6d6520..0000000
--- a/app/src/main/res/drawable/room_h2211.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:bottom="241dp"
-        android:drawable="@drawable/shape_room"
-        android:left="424dp"
-        android:right="245dp"
-        android:top="75dp"/>
-    <item android:drawable="@drawable/room_h2"/>
-</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/room_h2213.xml b/app/src/main/res/drawable/room_h2213.xml
deleted file mode 100644
index a47f968..0000000
--- a/app/src/main/res/drawable/room_h2213.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:bottom="316dp"
-        android:drawable="@drawable/shape_room"
-        android:left="486dp"
-        android:right="163dp"
-        android:top="5dp"/>
-    <item android:drawable="@drawable/room_h2"/>
-</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/room_h2214.xml b/app/src/main/res/drawable/room_h2214.xml
deleted file mode 100644
index 7dfe14c..0000000
--- a/app/src/main/res/drawable/room_h2214.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:bottom="241dp"
-        android:drawable="@drawable/shape_room"
-        android:left="486dp"
-        android:right="161dp"
-        android:top="80dp"/>
-    <item android:drawable="@drawable/room_h2"/>
-</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/room_h2215.xml b/app/src/main/res/drawable/room_h2215.xml
deleted file mode 100644
index 73627fb..0000000
--- a/app/src/main/res/drawable/room_h2215.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:bottom="243dp"
-        android:drawable="@drawable/shape_room"
-        android:left="545dp"
-        android:right="67dp"
-        android:top="46dp"/>
-    <item android:drawable="@drawable/room_h2"/>
-</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/room_k3201.xml b/app/src/main/res/drawable/room_k3201.xml
deleted file mode 100644
index 2156b1c..0000000
--- a/app/src/main/res/drawable/room_k3201.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:bottom="116dp"
-        android:drawable="@drawable/shape_room"
-        android:left="46dp"
-        android:right="420dp"
-        android:top="191dp"/>
-    <item android:drawable="@drawable/room_k3"/>
-</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/room_k3401.xml b/app/src/main/res/drawable/room_k3401.xml
deleted file mode 100644
index 97a9497..0000000
--- a/app/src/main/res/drawable/room_k3401.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:bottom="209dp"
-        android:drawable="@drawable/shape_room"
-        android:left="46dp"
-        android:right="420dp"
-        android:top="97dp"/>
-    <item android:drawable="@drawable/room_k3"/>
-</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/room_k3601.xml b/app/src/main/res/drawable/room_k3601.xml
deleted file mode 100644
index c3d8119..0000000
--- a/app/src/main/res/drawable/room_k3601.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:bottom="303dp"
-        android:drawable="@drawable/shape_room"
-        android:left="46dp"
-        android:right="420dp"
-        android:top="4dp"/>
-    <item android:drawable="@drawable/room_k3"/>
-</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/room_k4201.xml b/app/src/main/res/drawable/room_k4201.xml
deleted file mode 100644
index 63bdf44..0000000
--- a/app/src/main/res/drawable/room_k4201.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:bottom="99dp"
-        android:drawable="@drawable/shape_room"
-        android:left="46dp"
-        android:right="434dp"
-        android:top="196dp"/>
-    <item android:drawable="@drawable/room_k4"/>
-</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/room_k4401.xml b/app/src/main/res/drawable/room_k4401.xml
deleted file mode 100644
index 06a446b..0000000
--- a/app/src/main/res/drawable/room_k4401.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:bottom="195dp"
-        android:drawable="@drawable/shape_room"
-        android:left="46dp"
-        android:right="434dp"
-        android:top="100dp"/>
-    <item android:drawable="@drawable/room_k4"/>
-</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/room_k4601.xml b/app/src/main/res/drawable/room_k4601.xml
deleted file mode 100644
index 1a5639a..0000000
--- a/app/src/main/res/drawable/room_k4601.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:bottom="292dp"
-        android:drawable="@drawable/shape_room"
-        android:left="46dp"
-        android:right="434dp"
-        android:top="4dp"/>
-    <item android:drawable="@drawable/room_k4"/>
-</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/room_ua2114.xml b/app/src/main/res/drawable/room_ua2114.xml
deleted file mode 100644
index dd8aa5e..0000000
--- a/app/src/main/res/drawable/room_ua2114.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:bottom="173dp"
-        android:drawable="@drawable/shape_room"
-        android:left="586dp"
-        android:right="5dp"
-        android:top="129dp" />
-    <item android:drawable="@drawable/room_u2" />
-</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/room_ua2118.xml b/app/src/main/res/drawable/room_ua2118.xml
deleted file mode 100644
index 1988b11..0000000
--- a/app/src/main/res/drawable/room_ua2118.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:bottom="95dp"
-        android:drawable="@drawable/shape_room"
-        android:left="587dp"
-        android:right="5dp"
-        android:top="209dp" />
-    <item android:drawable="@drawable/room_u2" />
-</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/room_ua2220.xml b/app/src/main/res/drawable/room_ua2220.xml
deleted file mode 100644
index 5261c23..0000000
--- a/app/src/main/res/drawable/room_ua2220.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:bottom="54dp"
-        android:drawable="@drawable/shape_room"
-        android:left="485dp"
-        android:right="108dp"
-        android:top="230dp" />
-    <item android:drawable="@drawable/room_u2" />
-</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/room_ub2147.xml b/app/src/main/res/drawable/room_ub2147.xml
deleted file mode 100644
index d3318ff..0000000
--- a/app/src/main/res/drawable/room_ub2147.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:bottom="3dp"
-        android:drawable="@drawable/shape_room"
-        android:left="519dp"
-        android:right="73dp"
-        android:top="309dp" />
-    <item android:drawable="@drawable/room_u2" />
-</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/room_ub2252.xml b/app/src/main/res/drawable/room_ub2252.xml
deleted file mode 100644
index 3fa136e..0000000
--- a/app/src/main/res/drawable/room_ub2252.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:bottom="3dp"
-        android:drawable="@drawable/shape_room"
-        android:left="206dp"
-        android:right="334dp"
-        android:top="299dp" />
-    <item android:drawable="@drawable/room_u2" />
-</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/room_ud2119.xml b/app/src/main/res/drawable/room_ud2119.xml
deleted file mode 100644
index 3faae93..0000000
--- a/app/src/main/res/drawable/room_ud2119.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:bottom="139dp"
-        android:drawable="@drawable/shape_room"
-        android:left="3dp"
-        android:right="614dp"
-        android:top="180dp" />
-    <item android:drawable="@drawable/room_u2" />
-</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/room_ud2120.xml b/app/src/main/res/drawable/room_ud2120.xml
deleted file mode 100644
index 69225d9..0000000
--- a/app/src/main/res/drawable/room_ud2120.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:bottom="54dp"
-        android:drawable="@drawable/shape_room"
-        android:left="3dp"
-        android:right="589dp"
-        android:top="213dp" />
-    <item android:drawable="@drawable/room_u2" />
-</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/room_ud2208.xml b/app/src/main/res/drawable/room_ud2208.xml
deleted file mode 100644
index d82ef30..0000000
--- a/app/src/main/res/drawable/room_ud2208.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:bottom="190dp"
-        android:drawable="@drawable/shape_room"
-        android:left="97dp"
-        android:right="504dp"
-        android:top="122dp" />
-    <item android:drawable="@drawable/room_u2" />
-</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/room_ud2218.xml b/app/src/main/res/drawable/room_ud2218.xml
deleted file mode 100644
index 8480d47..0000000
--- a/app/src/main/res/drawable/room_ud2218.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:bottom="61dp"
-        android:drawable="@drawable/shape_room"
-        android:left="105dp"
-        android:right="489dp"
-        android:top="207dp" />
-    <item android:drawable="@drawable/room_u2" />
-</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_room.xml b/app/src/main/res/drawable/shape_room.xml
deleted file mode 100644
index 731e980..0000000
--- a/app/src/main/res/drawable/shape_room.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="#92bdd9"/>
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_map.xml b/app/src/main/res/layout/fragment_map.xml
deleted file mode 100644
index 1027842..0000000
--- a/app/src/main/res/layout/fragment_map.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<org.matomocamp.companion.widgets.SaveStatePhotoView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/map"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:scaleType="fitCenter"
-    android:src="@drawable/campusmap"/>
diff --git a/app/src/main/res/layout/navigation_header.xml b/app/src/main/res/layout/navigation_header.xml
index 5f77ffa..0fd4623 100644
--- a/app/src/main/res/layout/navigation_header.xml
+++ b/app/src/main/res/layout/navigation_header.xml
@@ -7,5 +7,4 @@
     android:paddingHorizontal="@dimen/main_menu_padding"
     android:paddingTop="@dimen/main_menu_padding"
     android:scaleType="fitCenter"
-    app:srcCompat="@drawable/ic_matomocamp_logo_textonly"
-    app:tint="?colorOnSurface" />
\ No newline at end of file
+    app:srcCompat="@drawable/ic_matomocamp_logo_textonly" />
\ No newline at end of file
diff --git a/app/src/main/res/values/drawables.xml b/app/src/main/res/values/drawables.xml
deleted file mode 100644
index f718fae..0000000
--- a/app/src/main/res/values/drawables.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- Room images aliases -->
-    <drawable name="room_chavanne">@drawable/room_ud2120</drawable>
-    <drawable name="room_ferrer">@drawable/room_h2215</drawable>
-    <drawable name="room_guillissen">@drawable/room_ua2220</drawable>
-    <drawable name="room_lameere">@drawable/room_ub2252</drawable>
-    <drawable name="room_ua2">@drawable/room_u2</drawable>
-    <drawable name="room_ub2">@drawable/room_u2</drawable>
-    <drawable name="room_ud2">@drawable/room_u2</drawable>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f08455e..e62a1c8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -167,7 +167,6 @@ and adapted to MatomoCamp by <a href="https://lw1.at/">Lukas Winkler</a>.
 \n- <a href="https://github.com/square/okhttp">OkHttp</a><i> by Square, Inc.</i>
 \n- <a href="https://github.com/square/moshi">Moshi</a><i> by Square, Inc.</i>
 \n- <a href="https://github.com/JetBrains/kotlin">Kotlin Standard Library</a><i> by JetBrains s.r.o. and Kotlin Programming Language contributors</i>
-\n- <a href="https://github.com/Kotlin/kotlinx.coroutines">kotlinx.coroutines</a><i> by JetBrains s.r.o.</i>
-\n- <a href="https://github.com/chrisbanes/PhotoView">PhotoView</a><i> by Chris Banes, Marek Sebera and John Carlson</i></small></string>
+\n- <a href="https://github.com/Kotlin/kotlinx.coroutines">kotlinx.coroutines</a><i> by JetBrains s.r.o.</i></small></string>
 
 </resources>
\ No newline at end of file