diff --git a/lib/utils/constants.dart b/lib/utils/constants.dart
index 658ff6763..e4a07b068 100644
--- a/lib/utils/constants.dart
+++ b/lib/utils/constants.dart
@@ -77,10 +77,10 @@ class Constants {
       sourceUrl: 'https://github.com/Skylled/expansion_tile_card',
     ),
     Dependency(
-      name: 'Firebase Crashlytics',
+      name: 'FlutterFire',
       license: 'BSD 3-Clause',
-      licenseUrl: 'https://github.com/FirebaseExtended/flutterfire/blob/master/packages/firebase_crashlytics/LICENSE',
-      sourceUrl: 'https://github.com/FirebaseExtended/flutterfire/tree/master/packages/firebase_crashlytics',
+      licenseUrl: 'https://github.com/FirebaseExtended/flutterfire/blob/master/LICENSE',
+      sourceUrl: 'https://github.com/FirebaseExtended/flutterfire',
     ),
     Dependency(
       name: 'Flushbar',
@@ -94,6 +94,12 @@ class Constants {
       licenseUrl: 'https://github.com/CaiJingLong/flutter_ijkplayer/blob/master/LICENSE',
       sourceUrl: 'https://github.com/CaiJingLong/flutter_ijkplayer',
     ),
+    Dependency(
+      name: 'Flutter Map',
+      license: 'BSD 3-Clause',
+      licenseUrl: 'https://github.com/fleaflet/flutter_map/blob/master/LICENSE',
+      sourceUrl: 'https://github.com/fleaflet/flutter_map',
+    ),
     Dependency(
       name: 'Flutter Markdown',
       license: 'BSD 3-Clause',
@@ -137,10 +143,22 @@ class Constants {
       sourceUrl: 'https://github.com/dart-lang/intl',
     ),
     Dependency(
-      name: 'Outline Material Icons',
+      name: 'LatLong',
       license: 'Apache 2.0',
-      licenseUrl: 'https://github.com/lucaslcode/outline_material_icons/blob/master/LICENSE',
-      sourceUrl: 'https://github.com/lucaslcode/outline_material_icons',
+      licenseUrl: 'https://github.com/MikeMitterer/dart-latlong/blob/master/LICENSE',
+      sourceUrl: 'https://github.com/MikeMitterer/dart-latlong',
+    ),
+    Dependency(
+      name: 'Overlay Support',
+      license: 'Apache 2.0',
+      licenseUrl: 'https://github.com/boyan01/overlay_support/blob/master/LICENSE',
+      sourceUrl: 'https://github.com/boyan01/overlay_support',
+    ),
+    Dependency(
+      name: 'Package info',
+      license: 'BSD 3-Clause',
+      licenseUrl: 'https://github.com/flutter/plugins/blob/master/packages/package_info/LICENSE',
+      sourceUrl: 'https://github.com/flutter/plugins/tree/master/packages/package_info',
     ),
     Dependency(
       name: 'Palette Generator',
@@ -220,6 +238,12 @@ class Constants {
       licenseUrl: 'https://github.com/dart-lang/tuple/blob/master/LICENSE',
       sourceUrl: 'https://github.com/dart-lang/tuple',
     ),
+    Dependency(
+      name: 'URL Launcher',
+      license: 'BSD 3-Clause',
+      licenseUrl: 'https://github.com/flutter/plugins/blob/master/packages/url_launcher/url_launcher/LICENSE',
+      sourceUrl: 'https://github.com/flutter/plugins/blob/master/packages/url_launcher/url_launcher',
+    ),
     Dependency(
       name: 'UUID',
       license: 'MIT',
diff --git a/lib/widgets/common/icons.dart b/lib/widgets/common/icons.dart
index 6f7d2b47c..2a6b08c8c 100644
--- a/lib/widgets/common/icons.dart
+++ b/lib/widgets/common/icons.dart
@@ -4,58 +4,59 @@ import 'package:aves/model/image_entry.dart';
 import 'package:aves/utils/android_file_utils.dart';
 import 'package:aves/widgets/common/image_providers/app_icon_image_provider.dart';
 import 'package:flutter/material.dart';
-import 'package:outline_material_icons/outline_material_icons.dart';
 
 class AIcons {
-  static const IconData allCollection = OMIcons.collections;
-  static const IconData image = OMIcons.photo;
-  static const IconData video = OMIcons.movie;
-  static const IconData vector = OMIcons.code;
+  static const IconData allCollection = Icons.collections_outlined;
+  static const IconData image = Icons.photo_outlined;
+  static const IconData video = Icons.movie_outlined;
+  static const IconData vector = Icons.code_outlined;
 
-  static const IconData checked = OMIcons.done;
-  static const IconData date = OMIcons.calendarToday;
+  static const IconData android = Icons.android;
+  static const IconData checked = Icons.done_outlined;
+  static const IconData date = Icons.calendar_today_outlined;
   static const IconData disc = Icons.fiber_manual_record;
-  static const IconData error = OMIcons.errorOutline;
-  static const IconData location = OMIcons.place;
-  static const IconData shooting = OMIcons.camera;
-  static const IconData removableStorage = OMIcons.sdStorage;
-  static const IconData settings = OMIcons.settings;
-  static const IconData text = OMIcons.formatQuote;
-  static const IconData tag = OMIcons.localOffer;
+  static const IconData error = Icons.error_outline;
+  static const IconData location = Icons.place_outlined;
+  static const IconData shooting = Icons.camera_outlined;
+  static const IconData removableStorage = Icons.sd_storage_outlined;
+  static const IconData settings = Icons.settings_outlined;
+  static const IconData text = Icons.format_quote_outlined;
+  static const IconData tag = Icons.local_offer_outlined;
 
   // actions
-  static const IconData addShortcut = OMIcons.bookmarkBorder;
-  static const IconData clear = OMIcons.clear;
-  static const IconData collapse = OMIcons.expandLess;
-  static const IconData createAlbum = OMIcons.addCircleOutline;
-  static const IconData debug = OMIcons.whatshot;
-  static const IconData delete = OMIcons.delete;
-  static const IconData expand = OMIcons.expandMore;
-  static const IconData favourite = OMIcons.favoriteBorder;
-  static const IconData favouriteActive = OMIcons.favorite;
-  static const IconData goUp = OMIcons.arrowUpward;
-  static const IconData group = OMIcons.groupWork;
-  static const IconData info = OMIcons.info;
-  static const IconData layers = OMIcons.layers;
-  static const IconData openInNew = OMIcons.openInNew;
-  static const IconData print = OMIcons.print;
-  static const IconData refresh = OMIcons.refresh;
-  static const IconData rename = OMIcons.title;
-  static const IconData rotateLeft = OMIcons.rotateLeft;
-  static const IconData rotateRight = OMIcons.rotateRight;
-  static const IconData search = OMIcons.search;
-  static const IconData select = OMIcons.selectAll;
-  static const IconData share = OMIcons.share;
-  static const IconData sort = OMIcons.sort;
-  static const IconData stats = OMIcons.pieChart;
-  static const IconData zoomIn = OMIcons.add;
-  static const IconData zoomOut = OMIcons.remove;
+  static const IconData addShortcut = Icons.bookmark_border;
+  static const IconData clear = Icons.clear_outlined;
+  static const IconData collapse = Icons.expand_less_outlined;
+  static const IconData createAlbum = Icons.add_circle_outline;
+  static const IconData debug = Icons.whatshot_outlined;
+  static const IconData delete = Icons.delete_outlined;
+  static const IconData expand = Icons.expand_more_outlined;
+  static const IconData favourite = Icons.favorite_border;
+  static const IconData favouriteActive = Icons.favorite;
+  static const IconData goUp = Icons.arrow_upward_outlined;
+  static const IconData group = Icons.group_work_outlined;
+  static const IconData info = Icons.info_outlined;
+  static const IconData layers = Icons.layers_outlined;
+  static const IconData openInNew = Icons.open_in_new_outlined;
+  static const IconData pin = Icons.push_pin_outlined;
+  static const IconData print = Icons.print_outlined;
+  static const IconData refresh = Icons.refresh_outlined;
+  static const IconData rename = Icons.title_outlined;
+  static const IconData rotateLeft = Icons.rotate_left_outlined;
+  static const IconData rotateRight = Icons.rotate_right_outlined;
+  static const IconData search = Icons.search_outlined;
+  static const IconData select = Icons.select_all_outlined;
+  static const IconData share = Icons.share_outlined;
+  static const IconData sort = Icons.sort_outlined;
+  static const IconData stats = Icons.pie_chart_outlined;
+  static const IconData zoomIn = Icons.add_outlined;
+  static const IconData zoomOut = Icons.remove_outlined;
 
   // albums
-  static const IconData album = OMIcons.photoAlbum;
-  static const IconData cameraAlbum = OMIcons.photoCamera;
+  static const IconData album = Icons.photo_album_outlined;
+  static const IconData cameraAlbum = Icons.photo_camera_outlined;
   static const IconData downloadAlbum = Icons.file_download;
-  static const IconData screenshotAlbum = OMIcons.smartphone;
+  static const IconData screenshotAlbum = Icons.smartphone_outlined;
 
   // thumbnail overlay
   static const IconData animated = Icons.slideshow;
diff --git a/lib/widgets/debug_page.dart b/lib/widgets/debug_page.dart
index e5fb45a72..e78a35cc8 100644
--- a/lib/widgets/debug_page.dart
+++ b/lib/widgets/debug_page.dart
@@ -11,13 +11,13 @@ import 'package:aves/services/image_file_service.dart';
 import 'package:aves/utils/android_file_utils.dart';
 import 'package:aves/utils/file_utils.dart';
 import 'package:aves/widgets/common/data_providers/media_query_data_provider.dart';
+import 'package:aves/widgets/common/icons.dart';
 import 'package:aves/widgets/fullscreen/info/info_page.dart';
 import 'package:firebase_core/firebase_core.dart';
 import 'package:firebase_crashlytics/firebase_crashlytics.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/scheduler.dart';
 import 'package:flutter_svg/flutter_svg.dart';
-import 'package:outline_material_icons/outline_material_icons.dart';
 
 class DebugPage extends StatefulWidget {
   static const routeName = '/debug';
@@ -58,10 +58,10 @@ class DebugPageState extends State<DebugPage> {
             title: Text('Debug'),
             bottom: TabBar(
               tabs: [
-                Tab(icon: Icon(OMIcons.whatshot)),
-                Tab(icon: Icon(OMIcons.settings)),
-                Tab(icon: Icon(OMIcons.sdStorage)),
-                Tab(icon: Icon(OMIcons.android)),
+                Tab(icon: Icon(AIcons.debug)),
+                Tab(icon: Icon(AIcons.settings)),
+                Tab(icon: Icon(AIcons.removableStorage)),
+                Tab(icon: Icon(AIcons.android)),
               ],
             ),
           ),
diff --git a/pubspec.lock b/pubspec.lock
index dc4027043..c03ddc8a6 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -501,13 +501,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.3.0"
-  outline_material_icons:
-    dependency: "direct main"
-    description:
-      name: outline_material_icons
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.1.1"
   overlay_support:
     dependency: "direct main"
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 6d2584819..4aad73775 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -63,7 +63,6 @@ dependencies:
   google_maps_flutter:
   intl:
   latlong: # for flutter_map
-  outline_material_icons:
   overlay_support:
   package_info:
   palette_generator: