diff --git a/app/src/main/java/com/nextcloud/talk/call/components/ParticipantTile.kt b/app/src/main/java/com/nextcloud/talk/call/components/ParticipantTile.kt
index 74f32af3f..e17403c0c 100644
--- a/app/src/main/java/com/nextcloud/talk/call/components/ParticipantTile.kt
+++ b/app/src/main/java/com/nextcloud/talk/call/components/ParticipantTile.kt
@@ -38,7 +38,7 @@ fun ParticipantTile(
     participant: ParticipantUiState,
     eglBase: EglBase?,
     modifier: Modifier = Modifier,
-    isVoiceOnlyCall: Boolean,
+    isVoiceOnlyCall: Boolean
 ) {
     val colorInt = ColorGenerator.shared.usernameToColor(participant.nick)
 
diff --git a/app/src/main/java/com/nextcloud/talk/call/components/WebRTCVideoView.kt b/app/src/main/java/com/nextcloud/talk/call/components/WebRTCVideoView.kt
index 814013ee1..1b3c2be0f 100644
--- a/app/src/main/java/com/nextcloud/talk/call/components/WebRTCVideoView.kt
+++ b/app/src/main/java/com/nextcloud/talk/call/components/WebRTCVideoView.kt
@@ -16,10 +16,7 @@ import org.webrtc.EglBase
 import org.webrtc.SurfaceViewRenderer
 
 @Composable
-fun WebRTCVideoView(
-    participant: ParticipantUiState,
-    eglBase: EglBase?
-) {
+fun WebRTCVideoView(participant: ParticipantUiState, eglBase: EglBase?) {
     AndroidView(
         factory = { context ->
             SurfaceViewRenderer(context).apply {
diff --git a/app/src/main/java/com/nextcloud/talk/utils/message/MessageUtils.kt b/app/src/main/java/com/nextcloud/talk/utils/message/MessageUtils.kt
index eee95b293..9ed9e524c 100644
--- a/app/src/main/java/com/nextcloud/talk/utils/message/MessageUtils.kt
+++ b/app/src/main/java/com/nextcloud/talk/utils/message/MessageUtils.kt
@@ -9,13 +9,13 @@ package com.nextcloud.talk.utils.message
 import android.content.Context
 import android.content.Intent
 import android.graphics.Typeface
-import android.net.Uri
 import android.text.SpannableString
 import android.text.SpannableStringBuilder
 import android.text.Spanned
 import android.text.style.StyleSpan
 import android.util.Log
 import android.view.View
+import androidx.core.net.toUri
 import com.nextcloud.talk.R
 import com.nextcloud.talk.chat.data.model.ChatMessage
 import com.nextcloud.talk.ui.theme.ViewThemeUtils
@@ -145,7 +145,7 @@ class MessageUtils(val context: Context) {
 
                     "file" -> {
                         itemView?.setOnClickListener { v ->
-                            val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse(individualHashMap["link"]))
+                            val browserIntent = Intent(Intent.ACTION_VIEW, individualHashMap["link"]?.toUri())
                             context.startActivity(browserIntent)
                         }
                     }
diff --git a/app/src/main/res/layout/call_item.xml b/app/src/main/res/layout/call_item.xml
deleted file mode 100644
index 9edd399a4..000000000
--- a/app/src/main/res/layout/call_item.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Nextcloud Talk - Android Client
-  ~
-  ~ SPDX-FileCopyrightText: 2021 Andy Scherzinger <info@andy-scherzinger.de>
-  ~ SPDX-FileCopyrightText: 2021 Marcel Hibbe <dev@mhibbe.de>
-  ~ SPDX-FileCopyrightText: 2017 Mario Danic <mario@lovelyhq.com>
-  ~ SPDX-License-Identifier: GPL-3.0-or-later
--->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/relative_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:gravity="center"
-    android:orientation="vertical">
-
-    <ImageView
-        android:id="@+id/avatarImageView"
-        android:layout_width="80dp"
-        android:layout_height="80dp"
-        android:layout_centerInParent="true"
-        android:contentDescription="@string/avatar"/>
-
-    <org.webrtc.SurfaceViewRenderer
-        android:id="@+id/surface_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:visibility="invisible" />
-
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:layout_alignParentBottom="true">
-
-        <TextView
-            android:id="@+id/peer_nick_text_view"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
-            android:layout_marginBottom="6dp"
-            android:ellipsize="end"
-            android:maxEms="8"
-            android:maxLines="1"
-            android:textAlignment="viewStart"
-            android:textColor="@color/white"
-            tools:text="Bill Murray 12345678901234567890" />
-
-        <ImageView
-            android:id="@+id/remote_audio_off"
-            android:layout_width="16dp"
-            android:layout_height="16dp"
-            android:layout_marginStart="10dp"
-            android:layout_marginBottom="6dp"
-            android:contentDescription="@string/nc_remote_audio_off"
-            android:src="@drawable/ic_mic_off_white_24px"
-            android:visibility="invisible"
-            tools:visibility="visible" />
-
-        <ImageView
-            android:id="@+id/raised_hand"
-            android:layout_width="16dp"
-            android:layout_height="16dp"
-            android:layout_marginStart="10dp"
-            android:layout_marginBottom="6dp"
-            android:contentDescription="@string/raise_hand"
-            android:src="@drawable/ic_hand_back_left"
-            android:visibility="invisible"
-            tools:visibility="visible" />
-    </LinearLayout>
-
-    <ProgressBar
-        android:id="@+id/participant_progress_bar"
-        style="?android:attr/progressBarStyle"
-        android:layout_width="@dimen/call_participant_progress_bar_size"
-        android:layout_height="@dimen/call_participant_progress_bar_size"
-        android:layout_centerInParent="@bool/value_true" />
-
-</RelativeLayout>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 768c7c388..f9ccd0c99 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -54,7 +54,6 @@
     <dimen name="dialog_padding">24dp</dimen>
     <dimen name="dialog_padding_top_bottom">18dp</dimen>
 
-    <dimen name="call_grid_item_min_height">180dp</dimen>
     <dimen name="call_controls_height">110dp</dimen>
     <dimen name="call_participant_progress_bar_size">48dp</dimen>
     <dimen name="call_self_participant_progress_bar_size">48dp</dimen>