diff --git a/app/src/main/java/net/schueller/peertube/fragment/VideoPlayerFragment.java b/app/src/main/java/net/schueller/peertube/fragment/VideoPlayerFragment.java
index b92023d..62e8d24 100644
--- a/app/src/main/java/net/schueller/peertube/fragment/VideoPlayerFragment.java
+++ b/app/src/main/java/net/schueller/peertube/fragment/VideoPlayerFragment.java
@@ -138,9 +138,11 @@ public class VideoPlayerFragment extends Fragment implements VideoRendererEventL
         torrentStatus = activity.findViewById(R.id.exo_torrent_status);
 
         // Full screen Icon
-        TextView fullscreenButton = activity.findViewById(R.id.exo_fullscreen);
-        fullscreenButton.setText(R.string.video_expand_icon);
-        new Iconics.IconicsBuilder().ctx(context).on(fullscreenButton).build();
+        TextView fullscreenText = activity.findViewById(R.id.exo_fullscreen);
+        FrameLayout fullscreenButton = activity.findViewById(R.id.exo_fullscreen_button);
+
+        fullscreenText.setText(R.string.video_expand_icon);
+        new Iconics.IconicsBuilder().ctx(context).on(fullscreenText).build();
 
         fullscreenButton.setOnClickListener(view -> {
             Log.d(TAG, "Fullscreen");
diff --git a/app/src/main/res/layout/video_playback_controls.xml b/app/src/main/res/layout/video_playback_controls.xml
index f15235b..beeb5fc 100644
--- a/app/src/main/res/layout/video_playback_controls.xml
+++ b/app/src/main/res/layout/video_playback_controls.xml
@@ -109,8 +109,8 @@
 
         <FrameLayout
             android:id="@+id/exo_fullscreen_button"
-            android:layout_width="32dp"
-            android:layout_height="32dp"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
             android:layout_gravity="end">
 
             <TextView