diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java b/app/src/full/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java
index b43626b6d..0be72390f 100644
--- a/app/src/full/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java
+++ b/app/src/full/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java
@@ -17,17 +17,6 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.provider.Settings;
-import androidx.annotation.LayoutRes;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.StringRes;
-import androidx.localbroadcastmanager.content.LocalBroadcastManager;
-import androidx.core.view.MenuItemCompat;
-import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.SearchView;
-import androidx.appcompat.widget.SwitchCompat;
-import androidx.appcompat.widget.Toolbar;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -45,9 +34,23 @@ import android.widget.ListView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import android.widget.Toast;
-import cc.mvdan.accesspoint.WifiApControl;
+
+import androidx.annotation.LayoutRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.SearchView;
+import androidx.appcompat.widget.SwitchCompat;
+import androidx.appcompat.widget.Toolbar;
+import androidx.core.content.ContextCompat;
+import androidx.core.view.MenuItemCompat;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+
 import com.google.zxing.integration.android.IntentIntegrator;
 import com.google.zxing.integration.android.IntentResult;
+
 import org.fdroid.fdroid.BuildConfig;
 import org.fdroid.fdroid.FDroidApp;
 import org.fdroid.fdroid.NfcHelper;
@@ -75,6 +78,8 @@ import java.util.Set;
 import java.util.Timer;
 import java.util.TimerTask;
 
+import cc.mvdan.accesspoint.WifiApControl;
+
 import static org.fdroid.fdroid.views.main.MainActivity.ACTION_REQUEST_SWAP;
 
 /**
@@ -955,19 +960,19 @@ public class SwapWorkflowActivity extends AppCompatActivity {
         if (TextUtils.isEmpty(FDroidApp.bssid) && !TextUtils.isEmpty(FDroidApp.ipAddressString)) {
             // empty bssid with an ipAddress means hotspot mode
             descriptionView.setText(R.string.swap_join_this_hotspot);
-            wifiIcon.setImageDrawable(getResources().getDrawable(R.drawable.hotspot));
+            wifiIcon.setImageDrawable(ContextCompat.getDrawable(this, R.drawable.ic_wifi_tethering));
             ssidView.setText(R.string.swap_active_hotspot);
             tapView.setText(R.string.swap_switch_to_wifi);
         } else if (TextUtils.isEmpty(FDroidApp.ssid)) {
             // not connected to or setup with any wifi network
             descriptionView.setText(R.string.swap_join_same_wifi);
-            wifiIcon.setImageDrawable(getResources().getDrawable(R.drawable.wifi));
+            wifiIcon.setImageDrawable(ContextCompat.getDrawable(this, R.drawable.ic_wifi));
             ssidView.setText(R.string.swap_no_wifi_network);
             tapView.setText(R.string.swap_view_available_networks);
         } else {
             // connected to a regular wifi network
             descriptionView.setText(R.string.swap_join_same_wifi);
-            wifiIcon.setImageDrawable(getResources().getDrawable(R.drawable.wifi));
+            wifiIcon.setImageDrawable(ContextCompat.getDrawable(this, R.drawable.ic_wifi));
             ssidView.setText(FDroidApp.ssid);
             tapView.setText(R.string.swap_view_available_networks);
         }
diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/peers/WifiPeer.java b/app/src/full/java/org/fdroid/fdroid/nearby/peers/WifiPeer.java
index bbfc0b2e0..27b8cf34b 100644
--- a/app/src/full/java/org/fdroid/fdroid/nearby/peers/WifiPeer.java
+++ b/app/src/full/java/org/fdroid/fdroid/nearby/peers/WifiPeer.java
@@ -3,6 +3,7 @@ package org.fdroid.fdroid.nearby.peers;
 import android.net.Uri;
 import android.os.Parcel;
 import android.text.TextUtils;
+
 import org.fdroid.fdroid.R;
 import org.fdroid.fdroid.data.NewRepoConfig;
 
@@ -62,7 +63,7 @@ public class WifiPeer implements Peer {
 
     @Override
     public int getIcon() {
-        return R.drawable.ic_network_wifi_white;
+        return R.drawable.ic_network_wifi;
     }
 
     @Override
diff --git a/app/src/full/res/drawable-hdpi/hotspot.png b/app/src/full/res/drawable-hdpi/hotspot.png
deleted file mode 100644
index e58dfce83..000000000
Binary files a/app/src/full/res/drawable-hdpi/hotspot.png and /dev/null differ
diff --git a/app/src/full/res/drawable-hdpi/ic_network_wifi_white.png b/app/src/full/res/drawable-hdpi/ic_network_wifi_white.png
deleted file mode 100644
index 8dbf07380..000000000
Binary files a/app/src/full/res/drawable-hdpi/ic_network_wifi_white.png and /dev/null differ
diff --git a/app/src/full/res/drawable-hdpi/wifi.png b/app/src/full/res/drawable-hdpi/wifi.png
deleted file mode 100644
index cebc8c56c..000000000
Binary files a/app/src/full/res/drawable-hdpi/wifi.png and /dev/null differ
diff --git a/app/src/full/res/drawable-ldpi/hotspot.png b/app/src/full/res/drawable-ldpi/hotspot.png
deleted file mode 100644
index 90e3cfc8a..000000000
Binary files a/app/src/full/res/drawable-ldpi/hotspot.png and /dev/null differ
diff --git a/app/src/full/res/drawable-ldpi/wifi.png b/app/src/full/res/drawable-ldpi/wifi.png
deleted file mode 100644
index 18b56f048..000000000
Binary files a/app/src/full/res/drawable-ldpi/wifi.png and /dev/null differ
diff --git a/app/src/full/res/drawable-mdpi/hotspot.png b/app/src/full/res/drawable-mdpi/hotspot.png
deleted file mode 100644
index a12cf150b..000000000
Binary files a/app/src/full/res/drawable-mdpi/hotspot.png and /dev/null differ
diff --git a/app/src/full/res/drawable-mdpi/ic_network_wifi_white.png b/app/src/full/res/drawable-mdpi/ic_network_wifi_white.png
deleted file mode 100644
index 0a65372c9..000000000
Binary files a/app/src/full/res/drawable-mdpi/ic_network_wifi_white.png and /dev/null differ
diff --git a/app/src/full/res/drawable-mdpi/wifi.png b/app/src/full/res/drawable-mdpi/wifi.png
deleted file mode 100644
index af3c3835d..000000000
Binary files a/app/src/full/res/drawable-mdpi/wifi.png and /dev/null differ
diff --git a/app/src/full/res/drawable-xhdpi/ic_network_wifi_white.png b/app/src/full/res/drawable-xhdpi/ic_network_wifi_white.png
deleted file mode 100644
index a4f217af0..000000000
Binary files a/app/src/full/res/drawable-xhdpi/ic_network_wifi_white.png and /dev/null differ
diff --git a/app/src/full/res/drawable-xhdpi/wifi.png b/app/src/full/res/drawable-xhdpi/wifi.png
deleted file mode 100644
index b7ecb0916..000000000
Binary files a/app/src/full/res/drawable-xhdpi/wifi.png and /dev/null differ
diff --git a/app/src/full/res/drawable-xxhdpi/ic_network_wifi_white.png b/app/src/full/res/drawable-xxhdpi/ic_network_wifi_white.png
deleted file mode 100644
index 08581b1ad..000000000
Binary files a/app/src/full/res/drawable-xxhdpi/ic_network_wifi_white.png and /dev/null differ
diff --git a/app/src/full/res/drawable-xxxhdpi/ic_network_wifi_white.png b/app/src/full/res/drawable-xxxhdpi/ic_network_wifi_white.png
deleted file mode 100644
index 57c6333e1..000000000
Binary files a/app/src/full/res/drawable-xxxhdpi/ic_network_wifi_white.png and /dev/null differ
diff --git a/app/src/full/res/drawable/ic_network_wifi.xml b/app/src/full/res/drawable/ic_network_wifi.xml
new file mode 100644
index 000000000..196df1370
--- /dev/null
+++ b/app/src/full/res/drawable/ic_network_wifi.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FFFFFF" android:pathData="M12.01,21.49L23.64,7c-0.45,-0.34 -4.93,-4 -11.64,-4C5.28,3 0.81,6.66 0.36,7l11.63,14.49 0.01,0.01 0.01,-0.01z"/>
+</vector>
diff --git a/app/src/full/res/drawable/ic_wifi.xml b/app/src/full/res/drawable/ic_wifi.xml
new file mode 100644
index 000000000..c7f44455a
--- /dev/null
+++ b/app/src/full/res/drawable/ic_wifi.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FFFFFF" android:pathData="M1,9l2,2c4.97,-4.97 13.03,-4.97 18,0l2,-2C16.93,2.93 7.08,2.93 1,9zM9,17l3,3 3,-3c-1.65,-1.66 -4.34,-1.66 -6,0zM5,13l2,2c2.76,-2.76 7.24,-2.76 10,0l2,-2C15.14,9.14 8.87,9.14 5,13z"/>
+</vector>
diff --git a/app/src/full/res/drawable/ic_wifi_tethering.xml b/app/src/full/res/drawable/ic_wifi_tethering.xml
new file mode 100644
index 000000000..8adefdf8d
--- /dev/null
+++ b/app/src/full/res/drawable/ic_wifi_tethering.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FFFFFF" android:pathData="M12,11c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM18,13c0,-3.31 -2.69,-6 -6,-6s-6,2.69 -6,6c0,2.22 1.21,4.15 3,5.19l1,-1.74c-1.19,-0.7 -2,-1.97 -2,-3.45 0,-2.21 1.79,-4 4,-4s4,1.79 4,4c0,1.48 -0.81,2.75 -2,3.45l1,1.74c1.79,-1.04 3,-2.97 3,-5.19zM12,3C6.48,3 2,7.48 2,13c0,3.7 2.01,6.92 4.99,8.65l1,-1.73C5.61,18.53 4,15.96 4,13c0,-4.42 3.58,-8 8,-8s8,3.58 8,8c0,2.96 -1.61,5.53 -4,6.92l1,1.73c2.99,-1.73 5,-4.95 5,-8.65 0,-5.52 -4.48,-10 -10,-10z"/>
+</vector>
diff --git a/app/src/full/res/layout/swap_join_wifi.xml b/app/src/full/res/layout/swap_join_wifi.xml
index c25e8be00..9a123b687 100644
--- a/app/src/full/res/layout/swap_join_wifi.xml
+++ b/app/src/full/res/layout/swap_join_wifi.xml
@@ -25,7 +25,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:id="@+id/wifi_icon"
-            android:src="@drawable/wifi"
+            android:src="@drawable/ic_wifi"
             android:layout_below="@+id/text_description"
             android:layout_centerHorizontal="true"/>
 
diff --git a/app/src/full/res/layout/swap_start_swap.xml b/app/src/full/res/layout/swap_start_swap.xml
index ce0d6f729..4b25a4e79 100644
--- a/app/src/full/res/layout/swap_start_swap.xml
+++ b/app/src/full/res/layout/swap_start_swap.xml
@@ -76,7 +76,7 @@
                 android:layout_height="24dp"
                 android:tint="@color/swap_grey_icon"
                 android:contentDescription="@string/wifi"
-                android:src="@drawable/ic_network_wifi_white"/>
+                android:src="@drawable/ic_network_wifi"/>
 
         <LinearLayout
                 android:layout_width="0dp"