diff --git a/src/main/java/org/thoughtcrime/securesms/TransportListActivity.java b/src/main/java/org/thoughtcrime/securesms/TransportListActivity.java
index 4968dc0eb..f8e3d5c97 100644
--- a/src/main/java/org/thoughtcrime/securesms/TransportListActivity.java
+++ b/src/main/java/org/thoughtcrime/securesms/TransportListActivity.java
@@ -3,9 +3,14 @@ package org.thoughtcrime.securesms;
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.MenuItem;
+import android.view.View;
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
+import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import androidx.core.graphics.Insets;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowInsetsCompat;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
@@ -46,6 +51,7 @@ public class TransportListActivity extends BaseActionBarActivity
             getSupportActionBar().setElevation(0);
         }
 
+        CoordinatorLayout coordinatorLayout = findViewById(R.id.coordinator_layout);
         recyclerView = findViewById(R.id.transport_list);
         fabAdd = findViewById(R.id.fab_add_transport);
 
@@ -55,6 +61,29 @@ public class TransportListActivity extends BaseActionBarActivity
 
         fabAdd.setOnClickListener(v -> openAddTransport());
 
+        // Handle window insets for edge-to-edge
+        ViewCompat.setOnApplyWindowInsetsListener(coordinatorLayout, (v, windowInsets) -> {
+            Insets insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars());
+            
+            // Apply top inset to RecyclerView as padding
+            recyclerView.setPadding(
+                recyclerView.getPaddingLeft(),
+                insets.top,
+                recyclerView.getPaddingRight(),
+                insets.bottom
+            );
+            recyclerView.setClipToPadding(false);
+
+            // Apply bottom inset to FAB as margin
+            CoordinatorLayout.LayoutParams fabParams = (CoordinatorLayout.LayoutParams) fabAdd.getLayoutParams();
+            int fabMargin = (int) (16 * getResources().getDisplayMetrics().density);
+            fabParams.bottomMargin = insets.bottom + fabMargin;
+            fabParams.rightMargin = fabMargin;
+            fabAdd.setLayoutParams(fabParams);
+
+            return WindowInsetsCompat.CONSUMED;
+        });
+
         loadTransports();
     }
 
diff --git a/src/main/java/org/thoughtcrime/securesms/TransportListAdapter.java b/src/main/java/org/thoughtcrime/securesms/TransportListAdapter.java
index 7c9a43651..223a1c7d7 100644
--- a/src/main/java/org/thoughtcrime/securesms/TransportListAdapter.java
+++ b/src/main/java/org/thoughtcrime/securesms/TransportListAdapter.java
@@ -59,7 +59,7 @@ public class TransportListAdapter extends RecyclerView.Adapter<TransportListAdap
     static class TransportViewHolder extends RecyclerView.ViewHolder {
         private final TextView emailText;
         private final TextView serverText;
-        private final TextView mainIndicator;
+        private final ImageView mainIndicator;
         private final ImageView editButton;
         private final ImageView deleteButton;
 
diff --git a/src/main/res/layout/activity_transport_list.xml b/src/main/res/layout/activity_transport_list.xml
index 5c0cbc362..21b7e63aa 100644
--- a/src/main/res/layout/activity_transport_list.xml
+++ b/src/main/res/layout/activity_transport_list.xml
@@ -2,9 +2,9 @@
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/coordinator_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:fitsSystemWindows="true"
     android:background="?android:attr/windowBackground">
 
     <androidx.recyclerview.widget.RecyclerView
@@ -12,8 +12,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:clipToPadding="false"
-        android:paddingTop="8dp"
-        android:paddingBottom="8dp"
         android:scrollbars="vertical"
         tools:listitem="@layout/transport_list_item" />
 
diff --git a/src/main/res/layout/transport_list_item.xml b/src/main/res/layout/transport_list_item.xml
index a319d5c26..47e6fa835 100644
--- a/src/main/res/layout/transport_list_item.xml
+++ b/src/main/res/layout/transport_list_item.xml
@@ -9,41 +9,32 @@
     android:minHeight="72dp"
     android:gravity="center_vertical">
 
+    <ImageView
+        android:id="@+id/main_transport_indicator"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginRight="16dp"
+        android:src="@drawable/ic_check_white_24dp"
+        android:tint="?attr/colorPrimary"
+        android:contentDescription="@string/main"
+        android:visibility="gone"
+        tools:visibility="visible" />
+
     <LinearLayout
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
         android:orientation="vertical">
 
-        <LinearLayout
+        <TextView
+            android:id="@+id/transport_email"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:gravity="center_vertical">
-
-            <TextView
-                android:id="@+id/transport_email"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:textSize="16sp"
-                android:textColor="?android:attr/textColorPrimary"
-                tools:text="user@example.com" />
-
-            <TextView
-                android:id="@+id/main_transport_indicator"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="8dp"
-                android:layout_marginLeft="8dp"
-                android:text="@string/main"
-                android:textSize="12sp"
-                android:textColor="?attr/colorPrimary"
-                android:textStyle="bold"
-                android:visibility="gone"
-                tools:visibility="visible" />
-
-        </LinearLayout>
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textSize="16sp"
+            android:textColor="?android:attr/textColorPrimary"
+            tools:text="user@example.com" />
 
         <TextView
             android:id="@+id/transport_server"