diff --git a/briar-android/artwork/ic_exclamation_mark.svg b/briar-android/artwork/ic_exclamation_mark.svg
deleted file mode 100644
index 204d21e725367507dd9c9325b760102accb42d27..0000000000000000000000000000000000000000
--- a/briar-android/artwork/ic_exclamation_mark.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="91" height="90" viewBox="0 0 91 90" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M43.7972 23.7552C43.7972 22.844 44.5359 22.1052 45.4472 22.1052C46.3584 22.1052 47.0972 22.844 47.0972 23.7552V50.8604C47.0972 51.7717 46.3584 52.5104 45.4472 52.5104C44.5359 52.5104 43.7972 51.7717 43.7972 50.8604V23.7552Z" fill="#FBBF24"/>
-<path d="M43.7972 61.4861C43.7972 60.5749 44.5359 59.8361 45.4472 59.8361C46.3584 59.8361 47.0972 60.5749 47.0972 61.4861V61.7552C47.0972 62.6665 46.3584 63.4052 45.4472 63.4052C44.5359 63.4052 43.7972 62.6665 43.7972 61.7552V61.4861Z" fill="#FBBF24"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M89.4004 45C89.4004 69.3005 69.7009 89 45.4004 89C21.0999 89 1.40039 69.3005 1.40039 45C1.40039 20.6995 21.0999 1 45.4004 1C69.7009 1 89.4004 20.6995 89.4004 45ZM86.1004 45C86.1004 67.478 67.8784 85.7 45.4004 85.7C22.9224 85.7 4.70039 67.478 4.70039 45C4.70039 22.522 22.9224 4.3 45.4004 4.3C67.8784 4.3 86.1004 22.522 86.1004 45Z" fill="#FBBF24"/>
-</svg>
diff --git a/briar-android/artwork/il_crash_dark.svg b/briar-android/artwork/il_crash_dark.svg
deleted file mode 100644
index 631be6878beb4b946a4756f7712ff5814673ba2e..0000000000000000000000000000000000000000
--- a/briar-android/artwork/il_crash_dark.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg width="81" height="80" viewBox="0 0 81 80" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M40.4014 76.8438C60.5598 76.8438 76.9014 60.5021 76.9014 40.3438C76.9014 20.1854 60.5598 3.84375 40.4014 3.84375C20.243 3.84375 3.90137 20.1854 3.90137 40.3438C3.90137 60.5021 20.243 76.8438 40.4014 76.8438ZM40.4014 78.3438C61.3882 78.3438 78.4014 61.3306 78.4014 40.3438C78.4014 19.3569 61.3882 2.34375 40.4014 2.34375C19.4145 2.34375 2.40137 19.3569 2.40137 40.3438C2.40137 61.3306 19.4145 78.3438 40.4014 78.3438Z" fill="#64748B"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M15.8334 26.9951C16.1263 26.7022 16.6012 26.7022 16.8941 26.9951L24.3638 34.4647L31.8334 26.9951C32.1263 26.7022 32.6012 26.7022 32.8941 26.9951C33.187 27.288 33.187 27.7628 32.8941 28.0557L25.4244 35.5254L32.8941 42.9951C33.187 43.288 33.187 43.7628 32.8941 44.0557C32.6012 44.3486 32.1263 44.3486 31.8334 44.0557L24.3638 36.5861L16.8941 44.0557C16.6012 44.3486 16.1263 44.3486 15.8334 44.0557C15.5405 43.7628 15.5405 43.288 15.8334 42.9951L23.3031 35.5254L15.8334 28.0557C15.5405 27.7628 15.5405 27.288 15.8334 26.9951Z" fill="#64748B"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M47.9091 26.9951C48.202 26.7022 48.6769 26.7022 48.9698 26.9951L56.4395 34.4647L63.9091 26.9951C64.202 26.7022 64.6769 26.7022 64.9698 26.9951C65.2627 27.288 65.2627 27.7628 64.9698 28.0557L57.5001 35.5254L64.9698 42.9951C65.2627 43.288 65.2627 43.7628 64.9698 44.0557C64.6769 44.3486 64.202 44.3486 63.9091 44.0557L56.4395 36.5861L48.9698 44.0557C48.6769 44.3486 48.202 44.3486 47.9091 44.0557C47.6162 43.7628 47.6162 43.288 47.9091 42.9951L55.3788 35.5254L47.9091 28.0557C47.6162 27.7628 47.6162 27.288 47.9091 26.9951Z" fill="#64748B"/>
-<path d="M53.4633 63.7465C53.4633 60.2823 52.0871 56.9599 49.6375 54.5103C47.1879 52.0607 43.8656 50.6846 40.4013 50.6846C36.9371 50.6846 33.6147 52.0607 31.1651 54.5103C28.7155 56.9599 27.3394 60.2823 27.3394 63.7465L40.4013 63.7465L53.4633 63.7465Z" fill="#334155"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M51.8656 62.2465C51.5368 59.7336 50.3885 57.3826 48.5768 55.571C46.4086 53.4027 43.4677 52.1846 40.4013 52.1846C37.3349 52.1846 34.3941 53.4027 32.2258 55.571C30.4141 57.3826 29.2658 59.7336 28.937 62.2465L51.8656 62.2465ZM53.3769 62.2465C53.0403 59.3345 51.7309 56.6037 49.6375 54.5103C47.1879 52.0607 43.8656 50.6846 40.4013 50.6846C36.9371 50.6846 33.6147 52.0607 31.1651 54.5103C29.0717 56.6037 27.7623 59.3345 27.4257 62.2465C27.3685 62.742 27.3394 63.2428 27.3394 63.7465L53.4633 63.7465C53.4633 63.2428 53.4342 62.742 53.3769 62.2465Z" fill="#64748B"/>
-</svg>
diff --git a/briar-android/artwork/il_crash_light.svg b/briar-android/artwork/il_crash_light.svg
deleted file mode 100644
index 9790eef8e375378cd66c37e67a72c79a0051d15c..0000000000000000000000000000000000000000
--- a/briar-android/artwork/il_crash_light.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg width="81" height="80" viewBox="0 0 81 80" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M40.6514 76.5C60.8098 76.5 77.1514 60.1584 77.1514 40C77.1514 19.8416 60.8098 3.5 40.6514 3.5C20.493 3.5 4.15137 19.8416 4.15137 40C4.15137 60.1584 20.493 76.5 40.6514 76.5ZM40.6514 78C61.6382 78 78.6514 60.9868 78.6514 40C78.6514 19.0132 61.6382 2 40.6514 2C19.6645 2 2.65137 19.0132 2.65137 40C2.65137 60.9868 19.6645 78 40.6514 78Z" fill="#9CA3AF"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M16.0834 26.6513C16.3763 26.3584 16.8512 26.3584 17.1441 26.6513L24.6138 34.121L32.0834 26.6513C32.3763 26.3584 32.8512 26.3584 33.1441 26.6513C33.437 26.9442 33.437 27.4191 33.1441 27.712L25.6744 35.1816L33.1441 42.6513C33.437 42.9442 33.437 43.4191 33.1441 43.712C32.8512 44.0049 32.3763 44.0049 32.0834 43.712L24.6138 36.2423L17.1441 43.712C16.8512 44.0049 16.3763 44.0049 16.0834 43.712C15.7905 43.4191 15.7905 42.9442 16.0834 42.6513L23.5531 35.1816L16.0834 27.712C15.7905 27.4191 15.7905 26.9442 16.0834 26.6513Z" fill="#9CA3AF"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M48.1591 26.6513C48.452 26.3584 48.9269 26.3584 49.2198 26.6513L56.6895 34.121L64.1591 26.6513C64.452 26.3584 64.9269 26.3584 65.2198 26.6513C65.5127 26.9442 65.5127 27.4191 65.2198 27.712L57.7501 35.1816L65.2198 42.6513C65.5127 42.9442 65.5127 43.4191 65.2198 43.712C64.9269 44.0049 64.452 44.0049 64.1591 43.712L56.6895 36.2423L49.2198 43.712C48.9269 44.0049 48.452 44.0049 48.1591 43.712C47.8662 43.4191 47.8662 42.9442 48.1591 42.6513L55.6288 35.1816L48.1591 27.712C47.8662 27.4191 47.8662 26.9442 48.1591 26.6513Z" fill="#9CA3AF"/>
-<path d="M53.7133 63.4028C53.7133 59.9385 52.3371 56.6162 49.8875 54.1666C47.4379 51.717 44.1156 50.3408 40.6513 50.3408C37.1871 50.3408 33.8647 51.717 31.4151 54.1666C28.9655 56.6162 27.5894 59.9385 27.5894 63.4028L40.6513 63.4028L53.7133 63.4028Z" fill="#E5E7EB"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M52.1156 61.9028C51.7868 59.3899 50.6385 57.0389 48.8268 55.2272C46.6586 53.059 43.7177 51.8408 40.6513 51.8408C37.5849 51.8408 34.6441 53.059 32.4758 55.2272C30.6641 57.0389 29.5158 59.3898 29.187 61.9028L52.1156 61.9028ZM53.6269 61.9028C53.2903 58.9907 51.9809 56.26 49.8875 54.1666C47.4379 51.717 44.1156 50.3408 40.6513 50.3408C37.1871 50.3408 33.8647 51.717 31.4151 54.1666C29.3217 56.26 28.0123 58.9907 27.6757 61.9028C27.6185 62.3983 27.5894 62.899 27.5894 63.4028L53.7133 63.4028C53.7133 62.899 53.6842 62.3983 53.6269 61.9028Z" fill="#9CA3AF"/>
-</svg>
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/NicknameFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/NicknameFragment.java
index d2edbc98d2fb471442a5dd44f25e08309dbf8bb3..229683f7c3a88b4bf964ef28144a968f8c7d468a 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/NicknameFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/NicknameFragment.java
@@ -211,7 +211,7 @@ public class NicknameFragment extends BaseFragment {
private void showWarningDialog(String name1, String name2) {
Context ctx = requireContext();
Builder b = new Builder(ctx, R.style.BriarDialogTheme);
- b.setIcon(getDialogIcon(ctx, R.drawable.ic_error));
+ b.setIcon(getDialogIcon(ctx, R.drawable.alerts_and_states_error));
b.setTitle(getString(R.string.duplicate_link_dialog_title));
b.setMessage(
getString(R.string.duplicate_link_dialog_text_3, name1, name2));
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/login/LoginUtils.java b/briar-android/src/main/java/org/briarproject/briar/android/login/LoginUtils.java
index 2e1e3bb19c3be6211eb60d87f747b0dffd662f44..fe706bc845bf5ef210c6759e08b037141ce72baa 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/login/LoginUtils.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/login/LoginUtils.java
@@ -15,7 +15,7 @@ class LoginUtils {
static AlertDialog createKeyStrengthenerErrorDialog(Context ctx) {
AlertDialog.Builder builder =
new AlertDialog.Builder(ctx, R.style.BriarDialogTheme);
- builder.setIcon(getDialogIcon(ctx, R.drawable.ic_error));
+ builder.setIcon(getDialogIcon(ctx, R.drawable.alerts_and_states_error));
builder.setTitle(R.string.dialog_title_cannot_check_password);
builder.setMessage(R.string.dialog_message_cannot_check_password);
builder.setPositiveButton(R.string.ok, null);
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/mailbox/ErrorFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/mailbox/ErrorFragment.java
index 6f713ab565e522b247b1bef028bfb9192bbf3036..47468e98a4e2081bc94365eebfbd604d4ab18c5c 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/mailbox/ErrorFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/mailbox/ErrorFragment.java
@@ -29,7 +29,8 @@ public class ErrorFragment extends FinalFragment {
ErrorFragment f = new ErrorFragment();
Bundle args = new Bundle();
args.putInt(ARG_TITLE, title);
- args.putInt(ARG_ICON, R.drawable.ic_error);
+ args.putInt(ARG_ICON, R.drawable.alerts_and_states_error);
+ args.putInt(ARG_ICON_TINT, R.color.briar_red_500);
args.putInt(ARG_TEXT, text);
f.setArguments(args);
return f;
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/mailbox/MailboxStatusFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/mailbox/MailboxStatusFragment.java
index dcaf1730456304018600acb309e743ef47f14717..6f3db3e582903a898ac353754d0c3473c4b8baaa 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/mailbox/MailboxStatusFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/mailbox/MailboxStatusFragment.java
@@ -1,6 +1,7 @@
package org.briarproject.briar.android.mailbox;
import android.content.Context;
+import android.content.res.ColorStateList;
import android.os.Bundle;
import android.os.Handler;
import android.os.Looper;
@@ -20,6 +21,7 @@ import org.briarproject.nullsafety.ParametersNotNullByDefault;
import javax.inject.Inject;
+import androidx.annotation.ColorRes;
import androidx.annotation.DrawableRes;
import androidx.annotation.Nullable;
import androidx.annotation.UiThread;
@@ -31,6 +33,8 @@ import androidx.lifecycle.ViewModelProvider;
import static android.view.View.GONE;
import static android.view.View.INVISIBLE;
import static android.view.View.VISIBLE;
+import static androidx.core.content.ContextCompat.getColor;
+import static androidx.core.widget.ImageViewCompat.setImageTintList;
import static androidx.transition.TransitionManager.beginDelayedTransition;
import static org.briarproject.bramble.api.mailbox.MailboxConstants.API_CLIENT_TOO_OLD;
import static org.briarproject.briar.android.AppModule.getAndroidComponent;
@@ -137,20 +141,24 @@ public class MailboxStatusFragment extends Fragment {
}
private void onMailboxStateChanged(MailboxStatus status) {
+ @ColorRes int tintRes;
@DrawableRes int iconRes;
String title;
String message = null;
if (status.hasProblem(System.currentTimeMillis())) {
+ tintRes = R.color.briar_red_500;
title = getString(R.string.mailbox_status_failure_title);
- iconRes = R.drawable.ic_error;
+ iconRes = R.drawable.alerts_and_states_error;
showUnlinkWarning = false;
wizardButton.setVisibility(VISIBLE);
} else if (status.getAttemptsSinceSuccess() > 0) {
- iconRes = R.drawable.ic_exclamation_mark;
+ iconRes = R.drawable.ic_help_outline_white;
title = getString(R.string.mailbox_status_problem_title);
+ tintRes = R.color.briar_orange_500;
showUnlinkWarning = false;
wizardButton.setVisibility(VISIBLE);
} else if (status.getMailboxCompatibility() < 0) {
+ tintRes = R.color.briar_red_500;
if (status.getMailboxCompatibility() == API_CLIENT_TOO_OLD) {
title = getString(R.string.mailbox_status_app_too_old_title);
message =
@@ -161,16 +169,19 @@ public class MailboxStatusFragment extends Fragment {
message = getString(
R.string.mailbox_status_mailbox_too_old_message);
}
- iconRes = R.drawable.ic_error;
+ iconRes = R.drawable.alerts_and_states_error;
showUnlinkWarning = true;
wizardButton.setVisibility(GONE);
} else {
- iconRes = R.drawable.ic_check_circle;
+ iconRes = R.drawable.ic_check_circle_outline;
title = getString(R.string.mailbox_status_connected_title);
+ tintRes = R.color.briar_brand_green;
showUnlinkWarning = true;
wizardButton.setVisibility(GONE);
}
imageView.setImageResource(iconRes);
+ int color = getColor(requireContext(), tintRes);
+ setImageTintList(imageView, ColorStateList.valueOf(color));
statusTitleView.setText(title);
if (message == null) {
statusMessageView.setVisibility(GONE);
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/removabledrive/ErrorFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/removabledrive/ErrorFragment.java
index f9a7787927dad26aa80c4d2757e723a3cdd52390..7ab791b889490e05ca096963fa6925c5354215dc 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/removabledrive/ErrorFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/removabledrive/ErrorFragment.java
@@ -25,7 +25,8 @@ public class ErrorFragment extends FinalFragment {
ErrorFragment f = new ErrorFragment();
Bundle args = new Bundle();
args.putInt(ARG_TITLE, title);
- args.putInt(ARG_ICON, R.drawable.ic_error);
+ args.putInt(ARG_ICON, R.drawable.alerts_and_states_error);
+ args.putInt(ARG_ICON_TINT, R.color.briar_red_500);
args.putInt(ARG_TEXT, text);
f.setArguments(args);
return f;
diff --git a/briar-android/src/main/res/drawable/ic_crash.xml b/briar-android/src/main/res/drawable/ic_crash.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f3b7746a1962f0214d916109daddf43317e4d107
--- /dev/null
+++ b/briar-android/src/main/res/drawable/ic_crash.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="128dp"
+ android:height="128dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+ <path
+ android:fillColor="#FF000000"
+ android:pathData="M11.99,2C6.47,2 2,6.47 2,12s4.47,10 9.99,10S22,17.53 22,12 17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8zM16.18,7.76l-1.06,1.06 -1.06,-1.06L13,8.82l1.06,1.06L13,10.94 14.06,12l1.06,-1.06L16.18,12l1.06,-1.06 -1.06,-1.06 1.06,-1.06zM7.82,12l1.06,-1.06L9.94,12 11,10.94 9.94,9.88 11,8.82 9.94,7.76 8.88,8.82 7.82,7.76 6.76,8.82l1.06,1.06 -1.06,1.06zM12,14c-2.33,0 -4.31,1.46 -5.11,3.5h10.22c-0.8,-2.04 -2.78,-3.5 -5.11,-3.5z" />
+</vector>
diff --git a/briar-android/src/main/res/drawable/ic_exclamation_mark.xml b/briar-android/src/main/res/drawable/ic_exclamation_mark.xml
deleted file mode 100644
index 7e728cb86e776861a8976c8a0ae096e23ed9dca0..0000000000000000000000000000000000000000
--- a/briar-android/src/main/res/drawable/ic_exclamation_mark.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="90dp"
- android:height="90dp"
- android:viewportWidth="91"
- android:viewportHeight="90">
- <path
- android:fillColor="@color/il_orange"
- android:pathData="M43.797,23.755C43.797,22.844 44.536,22.105 45.447,22.105C46.358,22.105 47.097,22.844 47.097,23.755V50.86C47.097,51.772 46.358,52.51 45.447,52.51C44.536,52.51 43.797,51.772 43.797,50.86V23.755Z" />
- <path
- android:fillColor="@color/il_orange"
- android:pathData="M43.797,61.486C43.797,60.575 44.536,59.836 45.447,59.836C46.358,59.836 47.097,60.575 47.097,61.486V61.755C47.097,62.667 46.358,63.405 45.447,63.405C44.536,63.405 43.797,62.667 43.797,61.755V61.486Z" />
- <path
- android:fillColor="@color/il_orange"
- android:fillType="evenOdd"
- android:pathData="M89.4,45C89.4,69.3 69.701,89 45.4,89C21.1,89 1.4,69.3 1.4,45C1.4,20.699 21.1,1 45.4,1C69.701,1 89.4,20.699 89.4,45ZM86.1,45C86.1,67.478 67.878,85.7 45.4,85.7C22.922,85.7 4.7,67.478 4.7,45C4.7,22.522 22.922,4.3 45.4,4.3C67.878,4.3 86.1,22.522 86.1,45Z" />
-</vector>
diff --git a/briar-android/src/main/res/drawable/il_crash.xml b/briar-android/src/main/res/drawable/il_crash.xml
deleted file mode 100644
index 1149e2d933075a90374cbb4be0eca6563676b403..0000000000000000000000000000000000000000
--- a/briar-android/src/main/res/drawable/il_crash.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="80dp"
- android:height="80dp"
- android:viewportWidth="80"
- android:viewportHeight="80">
- <path
- android:fillColor="@color/il_border"
- android:fillType="evenOdd"
- android:pathData="M40.651,76.5C60.81,76.5 77.151,60.158 77.151,40C77.151,19.842 60.81,3.5 40.651,3.5C20.493,3.5 4.151,19.842 4.151,40C4.151,60.158 20.493,76.5 40.651,76.5ZM40.651,78C61.638,78 78.651,60.987 78.651,40C78.651,19.013 61.638,2 40.651,2C19.664,2 2.651,19.013 2.651,40C2.651,60.987 19.664,78 40.651,78Z" />
- <path
- android:fillColor="@color/il_border"
- android:fillType="evenOdd"
- android:pathData="M16.083,26.651C16.376,26.358 16.851,26.358 17.144,26.651L24.614,34.121L32.083,26.651C32.376,26.358 32.851,26.358 33.144,26.651C33.437,26.944 33.437,27.419 33.144,27.712L25.674,35.182L33.144,42.651C33.437,42.944 33.437,43.419 33.144,43.712C32.851,44.005 32.376,44.005 32.083,43.712L24.614,36.242L17.144,43.712C16.851,44.005 16.376,44.005 16.083,43.712C15.79,43.419 15.79,42.944 16.083,42.651L23.553,35.182L16.083,27.712C15.79,27.419 15.79,26.944 16.083,26.651Z" />
- <path
- android:fillColor="@color/il_border"
- android:fillType="evenOdd"
- android:pathData="M48.159,26.651C48.452,26.358 48.927,26.358 49.22,26.651L56.689,34.121L64.159,26.651C64.452,26.358 64.927,26.358 65.22,26.651C65.513,26.944 65.513,27.419 65.22,27.712L57.75,35.182L65.22,42.651C65.513,42.944 65.513,43.419 65.22,43.712C64.927,44.005 64.452,44.005 64.159,43.712L56.689,36.242L49.22,43.712C48.927,44.005 48.452,44.005 48.159,43.712C47.866,43.419 47.866,42.944 48.159,42.651L55.629,35.182L48.159,27.712C47.866,27.419 47.866,26.944 48.159,26.651Z" />
- <path
- android:fillColor="@color/il_background"
- android:pathData="M53.713,63.403C53.713,59.938 52.337,56.616 49.888,54.167C47.438,51.717 44.116,50.341 40.651,50.341C37.187,50.341 33.865,51.717 31.415,54.167C28.965,56.616 27.589,59.938 27.589,63.403L40.651,63.403L53.713,63.403Z" />
- <path
- android:fillColor="@color/il_border"
- android:fillType="evenOdd"
- android:pathData="M52.116,61.903C51.787,59.39 50.639,57.039 48.827,55.227C46.659,53.059 43.718,51.841 40.651,51.841C37.585,51.841 34.644,53.059 32.476,55.227C30.664,57.039 29.516,59.39 29.187,61.903L52.116,61.903ZM53.627,61.903C53.29,58.991 51.981,56.26 49.888,54.167C47.438,51.717 44.116,50.341 40.651,50.341C37.187,50.341 33.865,51.717 31.415,54.167C29.322,56.26 28.012,58.991 27.676,61.903C27.618,62.398 27.589,62.899 27.589,63.403L53.713,63.403C53.713,62.899 53.684,62.398 53.627,61.903Z" />
-</vector>
diff --git a/briar-android/src/main/res/layout/fragment_crash.xml b/briar-android/src/main/res/layout/fragment_crash.xml
index 80349dbee5c40e3958096a3c257650f549bbea41..02c136de416fa0a8e35bbf8534a7fff50990c2ab 100644
--- a/briar-android/src/main/res/layout/fragment_crash.xml
+++ b/briar-android/src/main/res/layout/fragment_crash.xml
@@ -30,7 +30,7 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.25"
app:layout_constraintVertical_chainStyle="packed"
- app:srcCompat="@drawable/il_crash"
+ app:srcCompat="@drawable/ic_crash"
app:tint="?attr/colorControlNormal"
tools:ignore="ContentDescription" />
diff --git a/briar-android/src/main/res/layout/fragment_error.xml b/briar-android/src/main/res/layout/fragment_error.xml
index a785cfed6bca687b7a33c4596439f15b36a403aa..643f81e387a1bd25ff292bbe041f1c833ff669cb 100644
--- a/briar-android/src/main/res/layout/fragment_error.xml
+++ b/briar-android/src/main/res/layout/fragment_error.xml
@@ -21,7 +21,7 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.25"
app:layout_constraintVertical_chainStyle="packed"
- app:srcCompat="@drawable/ic_error"
+ app:srcCompat="@drawable/alerts_and_states_error"
app:tint="@color/briar_red_500"
tools:ignore="ContentDescription" />
diff --git a/briar-android/src/main/res/layout/fragment_final.xml b/briar-android/src/main/res/layout/fragment_final.xml
index 4b781301f63e01e8a6c9b7c3ab22a7e62d8f8fb5..a75ac3d99c35fe0308dc754846c0acdc5906013e 100644
--- a/briar-android/src/main/res/layout/fragment_final.xml
+++ b/briar-android/src/main/res/layout/fragment_final.xml
@@ -28,7 +28,7 @@
app:layout_constraintVertical_bias="0.25"
app:layout_constraintVertical_chainStyle="packed"
tools:ignore="ContentDescription"
- tools:srcCompat="@drawable/ic_error"
+ tools:srcCompat="@drawable/alerts_and_states_error"
tools:tint="@color/briar_red_500" />
<TextView