diff --git a/assets/Icons/angledown.png b/assets/Icons/angledown.png
new file mode 100644
index 0000000..bbfd82d
Binary files /dev/null and b/assets/Icons/angledown.png differ
diff --git a/assets/Icons/Angle down.svg b/assets/Icons/angledown.svg
similarity index 100%
rename from assets/Icons/Angle down.svg
rename to assets/Icons/angledown.svg
diff --git a/assets/Icons/angleright.png b/assets/Icons/angleright.png
new file mode 100644
index 0000000..f585e07
Binary files /dev/null and b/assets/Icons/angleright.png differ
diff --git a/assets/Icons/Angle right.svg b/assets/Icons/angleright.svg
similarity index 100%
rename from assets/Icons/Angle right.svg
rename to assets/Icons/angleright.svg
diff --git a/assets/Icons/download.png b/assets/Icons/download.png
new file mode 100644
index 0000000..094d23c
Binary files /dev/null and b/assets/Icons/download.png differ
diff --git a/assets/Icons/edit.png b/assets/Icons/edit.png
new file mode 100644
index 0000000..e8f889f
Binary files /dev/null and b/assets/Icons/edit.png differ
diff --git a/assets/Icons/file.png b/assets/Icons/file.png
new file mode 100644
index 0000000..b0af53f
Binary files /dev/null and b/assets/Icons/file.png differ
diff --git a/assets/Icons/inbox.png b/assets/Icons/inbox.png
new file mode 100644
index 0000000..ab2e5a1
Binary files /dev/null and b/assets/Icons/inbox.png differ
diff --git a/assets/Icons/markup.png b/assets/Icons/markup.png
new file mode 100644
index 0000000..5585d21
Binary files /dev/null and b/assets/Icons/markup.png differ
diff --git a/assets/Icons/markupfilled.png b/assets/Icons/markupfilled.png
new file mode 100644
index 0000000..1fcc5b1
Binary files /dev/null and b/assets/Icons/markupfilled.png differ
diff --git a/assets/Icons/morevertical.png b/assets/Icons/morevertical.png
new file mode 100644
index 0000000..d897682
Binary files /dev/null and b/assets/Icons/morevertical.png differ
diff --git a/assets/Icons/paperclip.png b/assets/Icons/paperclip.png
new file mode 100644
index 0000000..d9786e6
Binary files /dev/null and b/assets/Icons/paperclip.png differ
diff --git a/assets/Icons/plus.png b/assets/Icons/plus.png
new file mode 100644
index 0000000..f4a01af
Binary files /dev/null and b/assets/Icons/plus.png differ
diff --git a/assets/Icons/printer.png b/assets/Icons/printer.png
new file mode 100644
index 0000000..500a0ff
Binary files /dev/null and b/assets/Icons/printer.png differ
diff --git a/assets/Icons/printer2.png b/assets/Icons/printer2.png
new file mode 100644
index 0000000..500a0ff
Binary files /dev/null and b/assets/Icons/printer2.png differ
diff --git a/assets/Icons/reply.png b/assets/Icons/reply.png
new file mode 100644
index 0000000..2acdde7
Binary files /dev/null and b/assets/Icons/reply.png differ
diff --git a/assets/Icons/replyall.png b/assets/Icons/replyall.png
new file mode 100644
index 0000000..4a6fde0
Binary files /dev/null and b/assets/Icons/replyall.png differ
diff --git a/assets/Icons/search.png b/assets/Icons/search.png
new file mode 100644
index 0000000..2304caa
Binary files /dev/null and b/assets/Icons/search.png differ
diff --git a/assets/Icons/send.png b/assets/Icons/send.png
new file mode 100644
index 0000000..2256131
Binary files /dev/null and b/assets/Icons/send.png differ
diff --git a/assets/Icons/sort.png b/assets/Icons/sort.png
new file mode 100644
index 0000000..c937947
Binary files /dev/null and b/assets/Icons/sort.png differ
diff --git a/assets/Icons/transfer.png b/assets/Icons/transfer.png
new file mode 100644
index 0000000..e54974e
Binary files /dev/null and b/assets/Icons/transfer.png differ
diff --git a/assets/Icons/trash.png b/assets/Icons/trash.png
new file mode 100644
index 0000000..86da38b
Binary files /dev/null and b/assets/Icons/trash.png differ
diff --git a/lib/components/side_menu.dart b/lib/components/side_menu.dart
index a5c6e95..2c089e4 100644
--- a/lib/components/side_menu.dart
+++ b/lib/components/side_menu.dart
@@ -47,7 +47,7 @@ class SideMenu extends StatelessWidget {
                 ),
                 color: kPrimaryColor,
                 onPressed: () {},
-                icon: WebsafeSvg.asset("assets/Icons/Edit.svg", width: 16),
+                icon: Image.asset("assets/Icons/edit.png", width: 16),
                 label: Text(
                   "New message",
                   style: TextStyle(color: Colors.white),
@@ -67,7 +67,7 @@ class SideMenu extends StatelessWidget {
                 ),
                 color: kBgDarkColor,
                 onPressed: () {},
-                icon: WebsafeSvg.asset("assets/Icons/Download.svg", width: 16),
+                icon: Image.asset("assets/Icons/download.png", width: 16),
                 label: Text(
                   "Get messages",
                   style: TextStyle(color: kTextColor),
@@ -78,26 +78,26 @@ class SideMenu extends StatelessWidget {
               SideMenuItem(
                 press: () {},
                 title: "Inbox",
-                iconSrc: "assets/Icons/Inbox.svg",
+                iconSrc: "assets/Icons/inbox.png",
                 isActive: true,
                 itemCount: 3,
               ),
               SideMenuItem(
                 press: () {},
                 title: "Sent",
-                iconSrc: "assets/Icons/Send.svg",
+                iconSrc: "assets/Icons/send.png",
                 isActive: false,
               ),
               SideMenuItem(
                 press: () {},
                 title: "Drafts",
-                iconSrc: "assets/Icons/File.svg",
+                iconSrc: "assets/Icons/file.png",
                 isActive: false,
               ),
               SideMenuItem(
                 press: () {},
                 title: "Deleted",
-                iconSrc: "assets/Icons/Trash.svg",
+                iconSrc: "assets/Icons/trash.png",
                 isActive: false,
                 showBorder: false,
               ),
diff --git a/lib/components/side_menu_item.dart b/lib/components/side_menu_item.dart
index 905c36b..f38fd72 100644
--- a/lib/components/side_menu_item.dart
+++ b/lib/components/side_menu_item.dart
@@ -30,8 +30,8 @@ class SideMenuItem extends StatelessWidget {
         child: Row(
           children: [
             (isActive || isHover)
-                ? WebsafeSvg.asset(
-                    "assets/Icons/Angle right.svg",
+                ? Image.asset(
+                    "assets/Icons/angleright.png",
                     width: 15,
                   )
                 : SizedBox(width: 15),
@@ -48,7 +48,7 @@ class SideMenuItem extends StatelessWidget {
                     : null,
                 child: Row(
                   children: [
-                    WebsafeSvg.asset(
+                    Image.asset(
                       iconSrc,
                       height: 20,
                       color: (isActive || isHover) ? kPrimaryColor : kGrayColor,
diff --git a/lib/components/tags.dart b/lib/components/tags.dart
index 194c874..1ac87ff 100644
--- a/lib/components/tags.dart
+++ b/lib/components/tags.dart
@@ -14,9 +14,9 @@ class Tags extends StatelessWidget {
       children: [
         Row(
           children: [
-            WebsafeSvg.asset("assets/Icons/Angle down.svg", width: 16),
+            Image.asset("assets/Icons/angledown.png", width: 16),
             SizedBox(width: kDefaultPadding / 4),
-            WebsafeSvg.asset("assets/Icons/Markup.svg", width: 20),
+            Image.asset("assets/Icons/markup.png", width: 20),
             SizedBox(width: kDefaultPadding / 2),
             Text(
               "Tags",
@@ -55,8 +55,8 @@ class Tags extends StatelessWidget {
         padding: const EdgeInsets.fromLTRB(kDefaultPadding * 1.5, 10, 0, 10),
         child: Row(
           children: [
-            WebsafeSvg.asset(
-              "assets/Icons/Markup filled.svg",
+            Image.asset(
+              "assets/Icons/markupfilled.png",
               height: 18,
               color: color,
             ),
diff --git a/lib/screens/email/components/header.dart b/lib/screens/email/components/header.dart
index b62b2c3..4e788ab 100644
--- a/lib/screens/email/components/header.dart
+++ b/lib/screens/email/components/header.dart
@@ -18,29 +18,29 @@ class Header extends StatelessWidget {
           // We need this back button on mobile only
           if (Responsive.isMobile(context)) BackButton(),
           IconButton(
-            icon: WebsafeSvg.asset(
-              "assets/Icons/Trash.svg",
+            icon: Image.asset(
+              "assets/Icons/trash.png",
               width: 24,
             ),
             onPressed: () {},
           ),
           IconButton(
-            icon: WebsafeSvg.asset(
-              "assets/Icons/Reply.svg",
+            icon: Image.asset(
+              "assets/Icons/reply.png",
               width: 24,
             ),
             onPressed: () {},
           ),
           IconButton(
-            icon: WebsafeSvg.asset(
-              "assets/Icons/Reply all.svg",
+            icon: Image.asset(
+              "assets/Icons/replyall.png",
               width: 24,
             ),
             onPressed: () {},
           ),
           IconButton(
-            icon: WebsafeSvg.asset(
-              "assets/Icons/Transfer.svg",
+            icon: Image.asset(
+              "assets/Icons/transfer.png",
               width: 24,
             ),
             onPressed: () {},
@@ -49,22 +49,22 @@ class Header extends StatelessWidget {
           // We don't need print option on mobile
           if (Responsive.isDesktop(context))
             IconButton(
-              icon: WebsafeSvg.asset(
-                "assets/Icons/Printer.svg",
+              icon: Image.asset(
+                "assets/Icons/printer.png",
                 width: 24,
               ),
               onPressed: () {},
             ),
           IconButton(
-            icon: WebsafeSvg.asset(
-              "assets/Icons/Markup.svg",
+            icon: Image.asset(
+              "assets/Icons/markup.png",
               width: 24,
             ),
             onPressed: () {},
           ),
           IconButton(
-            icon: WebsafeSvg.asset(
-              "assets/Icons/More vertical.svg",
+            icon: Image.asset(
+              "assets/Icons/morevertical.png",
               width: 24,
             ),
             onPressed: () {},
diff --git a/lib/screens/email/email_screen.dart b/lib/screens/email/email_screen.dart
index b30d6bd..092fe04 100644
--- a/lib/screens/email/email_screen.dart
+++ b/lib/screens/email/email_screen.dart
@@ -111,8 +111,8 @@ class EmailScreen extends StatelessWidget {
                                               .caption,
                                         ),
                                         SizedBox(width: kDefaultPadding / 4),
-                                        WebsafeSvg.asset(
-                                          "assets/Icons/Download.svg",
+                                        Image.asset(
+                                          "assets/Icons/download.png",
                                           height: 16,
                                           color: kGrayColor,
                                         ),
diff --git a/lib/screens/main/components/email_card.dart b/lib/screens/main/components/email_card.dart
index 9da70c8..2505332 100644
--- a/lib/screens/main/components/email_card.dart
+++ b/lib/screens/main/components/email_card.dart
@@ -79,8 +79,8 @@ class EmailCard extends StatelessWidget {
                           ),
                           SizedBox(height: 5),
                           if (email.isAttachmentAvailable)
-                            WebsafeSvg.asset(
-                              "assets/Icons/Paperclip.svg",
+                            Image.asset(
+                              "assets/Icons/paperclip.png",
                               color: isActive ? Colors.white70 : kGrayColor,
                             )
                         ],
@@ -127,8 +127,8 @@ class EmailCard extends StatelessWidget {
               Positioned(
                 left: 8,
                 top: 0,
-                child: WebsafeSvg.asset(
-                  "assets/Icons/Markup filled.svg",
+                child: Image.asset(
+                  "assets/Icons/markupfilled.png",
                   height: 18,
                   color: email.tagColor,
                 ),
diff --git a/lib/screens/main/components/list_of_emails.dart b/lib/screens/main/components/list_of_emails.dart
index 86f7e99..c4f27c6 100644
--- a/lib/screens/main/components/list_of_emails.dart
+++ b/lib/screens/main/components/list_of_emails.dart
@@ -63,8 +63,8 @@ class _ListOfEmailsState extends State<ListOfEmails> {
                           suffixIcon: Padding(
                             padding: const EdgeInsets.all(
                                 kDefaultPadding * 0.75), //15
-                            child: WebsafeSvg.asset(
-                              "assets/Icons/Search.svg",
+                            child: Image.asset(
+                              "assets/Icons/search.png",
                               width: 24,
                             ),
                           ),
@@ -84,8 +84,8 @@ class _ListOfEmailsState extends State<ListOfEmails> {
                     const EdgeInsets.symmetric(horizontal: kDefaultPadding),
                 child: Row(
                   children: [
-                    WebsafeSvg.asset(
-                      "assets/Icons/Angle down.svg",
+                    Image.asset(
+                      "assets/Icons/angledown.png",
                       width: 16,
                       color: Colors.black,
                     ),
@@ -98,8 +98,8 @@ class _ListOfEmailsState extends State<ListOfEmails> {
                     MaterialButton(
                       minWidth: 20,
                       onPressed: () {},
-                      child: WebsafeSvg.asset(
-                        "assets/Icons/Sort.svg",
+                      child: Image.asset(
+                        "assets/Icons/sort.png",
                         width: 16,
                       ),
                     ),
diff --git a/pubspec.lock b/pubspec.lock
index 6c69a70..227a872 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -1,83 +1,55 @@
 # Generated by pub
 # See https://dart.dev/tools/pub/glossary#lockfile
 packages:
-  _fe_analyzer_shared:
-    dependency: transitive
-    description:
-      name: _fe_analyzer_shared
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "12.0.0"
-  analyzer:
-    dependency: transitive
-    description:
-      name: analyzer
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.40.6"
   archive:
     dependency: transitive
     description:
       name: archive
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.13"
-  args:
-    dependency: transitive
-    description:
-      name: args
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.6.0"
+    version: "3.1.2"
   async:
     dependency: transitive
     description:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.5.0-nullsafety.3"
+    version: "2.6.1"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0-nullsafety.3"
+    version: "2.1.0"
   characters:
     dependency: transitive
     description:
       name: characters
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0-nullsafety.5"
+    version: "1.1.0"
   charcode:
     dependency: transitive
     description:
       name: charcode
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0-nullsafety.3"
-  cli_util:
-    dependency: transitive
-    description:
-      name: cli_util
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.2.0"
+    version: "1.2.0"
   clock:
     dependency: transitive
     description:
       name: clock
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0-nullsafety.3"
+    version: "1.1.0"
   collection:
     dependency: transitive
     description:
       name: collection
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.15.0-nullsafety.5"
+    version: "1.15.0"
   convert:
     dependency: transitive
     description:
@@ -85,41 +57,34 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.1"
-  coverage:
-    dependency: transitive
-    description:
-      name: coverage
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.14.2"
   crypto:
     dependency: transitive
     description:
       name: crypto
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.5"
+    version: "3.0.1"
   cupertino_icons:
     dependency: "direct main"
     description:
       name: cupertino_icons
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.2"
+    version: "1.0.3"
   fake_async:
     dependency: transitive
     description:
       name: fake_async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0-nullsafety.3"
+    version: "1.2.0"
   file:
     dependency: transitive
     description:
       name: file
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "6.0.0-nullsafety.4"
+    version: "6.1.0"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -136,14 +101,14 @@ packages:
       name: flutter_staggered_grid_view
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.3.3"
+    version: "0.3.4"
   flutter_svg:
     dependency: transitive
     description:
       name: flutter_svg
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.18.1"
+    version: "0.19.3"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -154,13 +119,6 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
-  glob:
-    dependency: transitive
-    description:
-      name: glob
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.2.0"
   http:
     dependency: transitive
     description:
@@ -179,28 +137,7 @@ packages:
     dependency: "direct dev"
     description: flutter
     source: sdk
-    version: "0.9.2+2"
-  io:
-    dependency: transitive
-    description:
-      name: io
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.3.4"
-  js:
-    dependency: transitive
-    description:
-      name: js
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.6.3-nullsafety.3"
-  json_rpc_2:
-    dependency: transitive
-    description:
-      name: json_rpc_2
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.2.2"
+    version: "0.0.0"
   logging:
     dependency: transitive
     description:
@@ -214,42 +151,21 @@ packages:
       name: matcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.10-nullsafety.3"
+    version: "0.12.10"
   meta:
     dependency: transitive
     description:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0-nullsafety.6"
-  node_interop:
-    dependency: transitive
-    description:
-      name: node_interop
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.2.1"
-  node_io:
-    dependency: transitive
-    description:
-      name: node_io
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.1.1"
-  package_config:
-    dependency: transitive
-    description:
-      name: package_config
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.9.3"
+    version: "1.3.0"
   path:
     dependency: transitive
     description:
       name: path
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.0-nullsafety.3"
+    version: "1.8.0"
   path_drawing:
     dependency: transitive
     description:
@@ -270,7 +186,7 @@ packages:
       name: pedantic
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.10.0-nullsafety.3"
+    version: "1.11.1"
   petitparser:
     dependency: transitive
     description:
@@ -284,152 +200,103 @@ packages:
       name: platform
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.0-nullsafety.4"
-  pool:
-    dependency: transitive
-    description:
-      name: pool
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.5.0-nullsafety.3"
+    version: "3.0.0"
   process:
     dependency: transitive
     description:
       name: process
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.0.0-nullsafety.4"
-  pub_semver:
-    dependency: transitive
-    description:
-      name: pub_semver
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.4.4"
+    version: "4.2.1"
   sky_engine:
     dependency: transitive
     description: flutter
     source: sdk
     version: "0.0.99"
-  source_map_stack_trace:
-    dependency: transitive
-    description:
-      name: source_map_stack_trace
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.1.0-nullsafety.4"
-  source_maps:
-    dependency: transitive
-    description:
-      name: source_maps
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.10.10-nullsafety.3"
   source_span:
     dependency: transitive
     description:
       name: source_span
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.0-nullsafety.4"
+    version: "1.8.1"
   stack_trace:
     dependency: transitive
     description:
       name: stack_trace
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.10.0-nullsafety.6"
+    version: "1.10.0"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0-nullsafety.3"
+    version: "2.1.0"
   string_scanner:
     dependency: transitive
     description:
       name: string_scanner
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0-nullsafety.3"
+    version: "1.1.0"
   sync_http:
     dependency: transitive
     description:
       name: sync_http
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.0"
+    version: "0.3.0"
   term_glyph:
     dependency: transitive
     description:
       name: term_glyph
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0-nullsafety.3"
+    version: "1.2.0"
   test_api:
     dependency: transitive
     description:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.19-nullsafety.6"
-  test_core:
-    dependency: transitive
-    description:
-      name: test_core
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.3.12-nullsafety.9"
+    version: "0.3.0"
   typed_data:
     dependency: transitive
     description:
       name: typed_data
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0-nullsafety.5"
+    version: "1.3.0"
   vector_math:
     dependency: transitive
     description:
       name: vector_math
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0-nullsafety.5"
+    version: "2.1.0"
   vm_service:
     dependency: transitive
     description:
       name: vm_service
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "5.5.0"
-  watcher:
-    dependency: transitive
-    description:
-      name: watcher
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.9.7+15"
-  web_socket_channel:
-    dependency: transitive
-    description:
-      name: web_socket_channel
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.1.0"
+    version: "6.2.0"
   webdriver:
     dependency: transitive
     description:
       name: webdriver
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.2"
+    version: "3.0.0"
   websafe_svg:
     dependency: "direct main"
     description:
       name: websafe_svg
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.4+1"
+    version: "1.1.4+2"
   xml:
     dependency: transitive
     description:
@@ -437,13 +304,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "4.5.1"
-  yaml:
-    dependency: transitive
-    description:
-      name: yaml
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.2.1"
 sdks:
-  dart: ">=2.12.0-0.0 <3.0.0"
-  flutter: ">=1.18.0-6.0.pre <2.0.0"
+  dart: ">=2.12.0 <3.0.0"
+  flutter: ">=1.24.0-10.1.pre"