diff --git a/app/lib/presentation/icons/tor_icons.dart b/app/lib/presentation/icons/tor_icons.dart
index cd74f921..53e7942f 100644
--- a/app/lib/presentation/icons/tor_icons.dart
+++ b/app/lib/presentation/icons/tor_icons.dart
@@ -19,57 +19,95 @@
  */
 import 'package:flutter/widgets.dart';
 
-enum TorIcons implements IconData {
-  authority(0xf101),
-  badexit(0xf102),
-  bridge(0xf103),
-  country(0xf104),
-  directory(0xf105),
-  exit(0xf106),
-  experimental(0xf107),
-  fallbackdir(0xf108),
-  fast(0xf109),
-  fingerprint(0xf10a),
-  guard(0xf10b),
-  hibernating(0xf10c),
-  hsdir(0xf10d),
-  ipv4(0xf10e),
-  ipv6exit(0xf10f),
-  ipv6(0xf110),
-  noedconsensus(0xf111),
-  notrecommended(0xf112),
-  onionAlt(0xf113),
-  onion(0xf114),
-  outdated(0xf115),
-  reachableipv4(0xf116),
-  reachableipv6(0xf117),
-  relay(0xf118),
-  running(0xf119),
-  stable(0xf11a),
-  tshirt(0xf11b),
-  unmeasured(0xf11c),
-  unreachableipv4(0xf11d),
-  unreachableipv6(0xf11e),
-  v2dir(0xf11f),
-  valid(0xf120);
+abstract class TorIcons {
+  static const String _fontFamily = 'TorIcons';
 
-  const TorIcons(this.codePoint);
+  static const IconData authority = IconData(0xf101, fontFamily: _fontFamily);
+  static const IconData badexit = IconData(0xf102, fontFamily: _fontFamily);
+  static const IconData bridge = IconData(0xf103, fontFamily: _fontFamily);
+  static const IconData country = IconData(0xf104, fontFamily: _fontFamily);
+  static const IconData directory = IconData(0xf105, fontFamily: _fontFamily);
+  static const IconData exit = IconData(0xf106, fontFamily: _fontFamily);
+  static const IconData experimental = IconData(
+    0xf107,
+    fontFamily: _fontFamily,
+  );
+  static const IconData fallbackdir = IconData(0xf108, fontFamily: _fontFamily);
+  static const IconData fast = IconData(0xf109, fontFamily: _fontFamily);
+  static const IconData fingerprint = IconData(0xf10a, fontFamily: _fontFamily);
+  static const IconData guard = IconData(0xf10b, fontFamily: _fontFamily);
+  static const IconData hibernating = IconData(0xf10c, fontFamily: _fontFamily);
+  static const IconData hsdir = IconData(0xf10d, fontFamily: _fontFamily);
+  static const IconData ipv4 = IconData(0xf10e, fontFamily: _fontFamily);
+  static const IconData ipv6exit = IconData(0xf10f, fontFamily: _fontFamily);
+  static const IconData ipv6 = IconData(0xf110, fontFamily: _fontFamily);
+  static const IconData noedconsensus = IconData(
+    0xf111,
+    fontFamily: _fontFamily,
+  );
+  static const IconData notrecommended = IconData(
+    0xf112,
+    fontFamily: _fontFamily,
+  );
+  static const IconData onionAlt = IconData(0xf113, fontFamily: _fontFamily);
+  static const IconData onion = IconData(0xf114, fontFamily: _fontFamily);
+  static const IconData outdated = IconData(0xf115, fontFamily: _fontFamily);
+  static const IconData reachableipv4 = IconData(
+    0xf116,
+    fontFamily: _fontFamily,
+  );
+  static const IconData reachableipv6 = IconData(
+    0xf117,
+    fontFamily: _fontFamily,
+  );
+  static const IconData relay = IconData(0xf118, fontFamily: _fontFamily);
+  static const IconData running = IconData(0xf119, fontFamily: _fontFamily);
+  static const IconData stable = IconData(0xf11a, fontFamily: _fontFamily);
+  static const IconData tshirt = IconData(0xf11b, fontFamily: _fontFamily);
+  static const IconData unmeasured = IconData(0xf11c, fontFamily: _fontFamily);
+  static const IconData unreachableipv4 = IconData(
+    0xf11d,
+    fontFamily: _fontFamily,
+  );
+  static const IconData unreachableipv6 = IconData(
+    0xf11e,
+    fontFamily: _fontFamily,
+  );
+  static const IconData v2dir = IconData(0xf11f, fontFamily: _fontFamily);
+  static const IconData valid = IconData(0xf120, fontFamily: _fontFamily);
 
-  @override
-  final int codePoint;
-
-  @override
-  String get fontFamily => 'TorIcons';
-
-  @override
-  List<String>? get fontFamilyFallback => null;
-
-  @override
-  String? get fontPackage => null;
-
-  @override
-  bool get matchTextDirection => false;
-
-  @override
-  String toString() => 'TorIcons.$name';
+  static const List<IconData> values = [
+    authority,
+    badexit,
+    bridge,
+    country,
+    directory,
+    exit,
+    experimental,
+    fallbackdir,
+    fast,
+    fingerprint,
+    guard,
+    hibernating,
+    hsdir,
+    ipv4,
+    ipv6exit,
+    ipv6,
+    noedconsensus,
+    notrecommended,
+    onionAlt,
+    onion,
+    outdated,
+    reachableipv4,
+    reachableipv6,
+    relay,
+    running,
+    stable,
+    tshirt,
+    unmeasured,
+    unreachableipv4,
+    unreachableipv6,
+    v2dir,
+    valid,
+  ];
 }
diff --git a/app/lib/presentation/icons/weblibre_icons.dart b/app/lib/presentation/icons/weblibre_icons.dart
index 9325fef2..b419b5fe 100644
--- a/app/lib/presentation/icons/weblibre_icons.dart
+++ b/app/lib/presentation/icons/weblibre_icons.dart
@@ -19,28 +19,12 @@
  */
 import 'package:flutter/widgets.dart';
 
-enum WebLibreIcons implements IconData {
-  privateTab(0xEA01),
-  tabOptions(0xEA02),
-  tabType(0xEA03);
+abstract class WebLibreIcons {
+  static const String _fontFamily = 'WebLibre';
 
-  const WebLibreIcons(this.codePoint);
+  static const IconData privateTab = IconData(0xEA01, fontFamily: _fontFamily);
+  static const IconData tabOptions = IconData(0xEA02, fontFamily: _fontFamily);
+  static const IconData tabType = IconData(0xEA03, fontFamily: _fontFamily);
 
-  @override
-  final int codePoint;
-
-  @override
-  String get fontFamily => 'WebLibre';
-
-  @override
-  List<String>? get fontFamilyFallback => null;
-
-  @override
-  String? get fontPackage => null;
-
-  @override
-  bool get matchTextDirection => false;
-
-  @override
-  String toString() => 'WebLibreIcons.$name';
+  static const List<IconData> values = [privateTab, tabOptions, tabType];
 }