diff --git a/lib/components/content_banner.dart b/lib/components/content_banner.dart
index 40eefde7..13bfca8e 100644
--- a/lib/components/content_banner.dart
+++ b/lib/components/content_banner.dart
@@ -64,7 +64,7 @@ class ContentBanner extends StatelessWidget {
               child: FloatingActionButton(
                 mini: true,
                 backgroundColor: Theme.of(context).primaryColor,
-                child: Icon(Icons.camera_alt),
+                child: Icon(Icons.camera_alt_outlined),
                 onPressed: onEdit,
               ),
             ),
diff --git a/lib/components/dialogs/key_verification_dialog.dart b/lib/components/dialogs/key_verification_dialog.dart
index 03a62588..5bf1f86f 100644
--- a/lib/components/dialogs/key_verification_dialog.dart
+++ b/lib/components/dialogs/key_verification_dialog.dart
@@ -236,7 +236,7 @@ class _KeyVerificationPageState extends State<KeyVerificationDialog> {
       case KeyVerificationState.done:
         body = Column(
           children: <Widget>[
-            Icon(Icons.check_circle, color: Colors.green, size: 200.0),
+            Icon(Icons.check_circle_outlined, color: Colors.green, size: 200.0),
             SizedBox(height: 10),
             Text(
               L10n.of(context).verifySuccess,
diff --git a/lib/components/dialogs/recording_dialog.dart b/lib/components/dialogs/recording_dialog.dart
index 80d879eb..a843577d 100644
--- a/lib/components/dialogs/recording_dialog.dart
+++ b/lib/components/dialogs/recording_dialog.dart
@@ -90,7 +90,7 @@ class _RecordingDialogState extends State<RecordingDialog> {
             children: <Widget>[
               Text(L10n.of(context).send.toUpperCase()),
               SizedBox(width: 4),
-              Icon(Icons.send, size: 15),
+              Icon(Icons.send_outlined, size: 15),
             ],
           ),
           onPressed: () async {
diff --git a/lib/components/encryption_button.dart b/lib/components/encryption_button.dart
index bd9f47dd..c00937ac 100644
--- a/lib/components/encryption_button.dart
+++ b/lib/components/encryption_button.dart
@@ -94,8 +94,12 @@ class _EncryptionButtonState extends State<EncryptionButton> {
             color = null;
           }
           return IconButton(
-            icon: Icon(widget.room.encrypted ? Icons.lock : Icons.lock_open,
-                size: 20, color: color),
+            icon: Icon(
+                widget.room.encrypted
+                    ? Icons.lock_outlined
+                    : Icons.lock_open_outlined,
+                size: 20,
+                color: color),
             onPressed: _enableEncryptionAction,
           );
         });
diff --git a/lib/components/list_items/chat_list_item.dart b/lib/components/list_items/chat_list_item.dart
index 16cfd36c..3c75dd65 100644
--- a/lib/components/list_items/chat_list_item.dart
+++ b/lib/components/list_items/chat_list_item.dart
@@ -197,7 +197,7 @@ class ChatListItem extends StatelessWidget {
               },
               if (typingText.isNotEmpty) ...{
                 Icon(
-                  Icons.edit,
+                  Icons.edit_outlined,
                   color: Theme.of(context).primaryColor,
                   size: 14,
                 ),
diff --git a/lib/components/list_items/message.dart b/lib/components/list_items/message.dart
index d8028e87..56ed4632 100644
--- a/lib/components/list_items/message.dart
+++ b/lib/components/list_items/message.dart
@@ -261,7 +261,7 @@ class _MetaRow extends StatelessWidget {
           Padding(
             padding: const EdgeInsets.only(left: 2.0),
             child: Icon(
-              Icons.edit,
+              Icons.edit_outlined,
               size: 12,
               color: color,
             ),
diff --git a/lib/components/matrix.dart b/lib/components/matrix.dart
index 168a9d95..16b8687d 100644
--- a/lib/components/matrix.dart
+++ b/lib/components/matrix.dart
@@ -191,13 +191,13 @@ class MatrixState extends State<Matrix> {
                 Spacer(),
                 FloatingActionButton(
                   backgroundColor: Colors.red,
-                  child: Icon(Icons.phone_missed),
+                  child: Icon(Icons.phone_missed_outlined),
                   onPressed: () => Navigator.of(context).pop(),
                 ),
                 Spacer(),
                 FloatingActionButton(
                   backgroundColor: Colors.green,
-                  child: Icon(Icons.phone),
+                  child: Icon(Icons.phone_outlined),
                   onPressed: () {
                     Navigator.of(context).pop();
                     launch(event.body);
diff --git a/lib/components/message_content.dart b/lib/components/message_content.dart
index 1959d80e..00a1b9fe 100644
--- a/lib/components/message_content.dart
+++ b/lib/components/message_content.dart
@@ -146,7 +146,7 @@ class MessageContent extends StatelessWidget {
                 child: Row(
                   mainAxisSize: MainAxisSize.min,
                   children: <Widget>[
-                    Icon(Icons.phone),
+                    Icon(Icons.phone_outlined),
                     SizedBox(width: 8),
                     Text(L10n.of(context).videoCall),
                   ],
diff --git a/lib/components/user_bottom_sheet.dart b/lib/components/user_bottom_sheet.dart
index 239bd94b..1b51e714 100644
--- a/lib/components/user_bottom_sheet.dart
+++ b/lib/components/user_bottom_sheet.dart
@@ -105,7 +105,7 @@ class UserBottomSheet extends StatelessWidget {
         PopupMenuItem(
             child: _TextWithIcon(
               L10n.of(context).sendAMessage,
-              Icons.send,
+              Icons.send_outlined,
             ),
             value: 'message'),
       );
@@ -171,7 +171,7 @@ class UserBottomSheet extends StatelessWidget {
                   if (verificationStatus != null)
                     IconButton(
                       icon: Icon(
-                        Icons.lock,
+                        Icons.lock_outlined,
                         color: {
                               UserVerifiedStatus.unknownDevice: Colors.red,
                               UserVerifiedStatus.verified: Colors.green,
@@ -202,7 +202,7 @@ class UserBottomSheet extends StatelessWidget {
                   ListTile(
                     title: Text(L10n.of(context).username),
                     subtitle: Text(user.id),
-                    trailing: Icon(Icons.share),
+                    trailing: Icon(Icons.share_outlined),
                     onTap: () => FluffyShare.share(user.id, context),
                   ),
                   if (presence != null)
diff --git a/lib/utils/event_extension.dart b/lib/utils/event_extension.dart
index afd34868..6bd4ec6c 100644
--- a/lib/utils/event_extension.dart
+++ b/lib/utils/event_extension.dart
@@ -30,13 +30,13 @@ extension LocalizedBody on Event {
       case -1:
         return Icons.error_outline;
       case 0:
-        return Icons.timer;
+        return Icons.timer_outlined;
       case 1:
-        return Icons.done;
+        return Icons.done_outlined;
       case 2:
-        return Icons.done_all;
+        return Icons.done_all_outlined;
       default:
-        return Icons.done;
+        return Icons.done_outlined;
     }
   }
 
diff --git a/lib/views/auth_web_view.dart b/lib/views/auth_web_view.dart
index ec5ba7dc..920d0879 100644
--- a/lib/views/auth_web_view.dart
+++ b/lib/views/auth_web_view.dart
@@ -33,7 +33,7 @@ class AuthWebView extends StatelessWidget {
           LinearProgressIndicator(),
           Expanded(
             child: kIsWeb
-                ? Center(child: Icon(Icons.link))
+                ? Center(child: Icon(Icons.link_outlined))
                 : WebView(
                     initialUrl: url,
                     javascriptMode: JavascriptMode.unrestricted,
diff --git a/lib/views/chat.dart b/lib/views/chat.dart
index e719a133..c520ee9d 100644
--- a/lib/views/chat.dart
+++ b/lib/views/chat.dart
@@ -532,7 +532,7 @@ class _ChatState extends State<_Chat> {
                           )
                         : Row(
                             children: <Widget>[
-                              Icon(Icons.edit,
+                              Icon(Icons.edit_outlined,
                                   color: Theme.of(context).primaryColor,
                                   size: 13),
                               SizedBox(width: 4),
@@ -557,7 +557,7 @@ class _ChatState extends State<_Chat> {
                     selectedEvents.first.status > 0 &&
                     selectedEvents.first.senderId == client.userID)
                   IconButton(
-                    icon: Icon(Icons.edit),
+                    icon: Icon(Icons.edit_outlined),
                     onPressed: () {
                       setState(() {
                         pendingText = sendController.text;
@@ -572,12 +572,12 @@ class _ChatState extends State<_Chat> {
                     },
                   ),
                 IconButton(
-                  icon: Icon(Icons.content_copy),
+                  icon: Icon(Icons.content_copy_outlined),
                   onPressed: () => copyEventsAction(context),
                 ),
                 if (canRedactSelectedEvents)
                   IconButton(
-                    icon: Icon(Icons.delete),
+                    icon: Icon(Icons.delete_outlined),
                     onPressed: () => redactEventsAction(context),
                   ),
               ]
@@ -587,7 +587,7 @@ class _ChatState extends State<_Chat> {
           ? Padding(
               padding: const EdgeInsets.only(bottom: 56.0),
               child: FloatingActionButton(
-                child: Icon(Icons.arrow_downward,
+                child: Icon(Icons.arrow_downward_outlined,
                     color: Theme.of(context).primaryColor),
                 onPressed: () => _scrollController.jumpTo(0),
                 foregroundColor: Theme.of(context).textTheme.bodyText2.color,
@@ -721,7 +721,7 @@ class _ChatState extends State<_Chat> {
                                             padding: EdgeInsets.symmetric(
                                                 horizontal: 12.0),
                                             child: Center(
-                                              child: Icon(Icons.reply),
+                                              child: Icon(Icons.reply_outlined),
                                             ),
                                           ),
                                           direction: SwipeDirection.endToStart,
@@ -911,7 +911,8 @@ class _ChatState extends State<_Chat> {
                                           forwardEventsAction(context),
                                       child: Row(
                                         children: <Widget>[
-                                          Icon(Icons.keyboard_arrow_left),
+                                          Icon(Icons
+                                              .keyboard_arrow_left_outlined),
                                           Text(L10n.of(context).forward),
                                         ],
                                       ),
@@ -946,7 +947,8 @@ class _ChatState extends State<_Chat> {
                                                     Text(L10n.of(context)
                                                         .tryToSendAgain),
                                                     SizedBox(width: 4),
-                                                    Icon(Icons.send, size: 16),
+                                                    Icon(Icons.send_outlined,
+                                                        size: 16),
                                                   ],
                                                 ),
                                               ),
@@ -959,7 +961,7 @@ class _ChatState extends State<_Chat> {
                                       height: 56,
                                       alignment: Alignment.center,
                                       child: PopupMenuButton<String>(
-                                        icon: Icon(Icons.add),
+                                        icon: Icon(Icons.add_outlined),
                                         onSelected: (String choice) async {
                                           if (choice == 'file') {
                                             sendFileAction(context);
@@ -981,7 +983,8 @@ class _ChatState extends State<_Chat> {
                                               leading: CircleAvatar(
                                                 backgroundColor: Colors.green,
                                                 foregroundColor: Colors.white,
-                                                child: Icon(Icons.attachment),
+                                                child: Icon(
+                                                    Icons.attachment_outlined),
                                               ),
                                               title: Text(
                                                   L10n.of(context).sendFile),
@@ -994,7 +997,8 @@ class _ChatState extends State<_Chat> {
                                               leading: CircleAvatar(
                                                 backgroundColor: Colors.blue,
                                                 foregroundColor: Colors.white,
-                                                child: Icon(Icons.image),
+                                                child:
+                                                    Icon(Icons.image_outlined),
                                               ),
                                               title: Text(
                                                   L10n.of(context).sendImage),
@@ -1009,7 +1013,8 @@ class _ChatState extends State<_Chat> {
                                                   backgroundColor:
                                                       Colors.purple,
                                                   foregroundColor: Colors.white,
-                                                  child: Icon(Icons.camera_alt),
+                                                  child: Icon(Icons
+                                                      .camera_alt_outlined),
                                                 ),
                                                 title: Text(L10n.of(context)
                                                     .openCamera),
@@ -1024,7 +1029,8 @@ class _ChatState extends State<_Chat> {
                                                 leading: CircleAvatar(
                                                   backgroundColor: Colors.red,
                                                   foregroundColor: Colors.white,
-                                                  child: Icon(Icons.mic),
+                                                  child: Icon(
+                                                      Icons.mic_none_outlined),
                                                 ),
                                                 title: Text(L10n.of(context)
                                                     .voiceMessage),
@@ -1098,7 +1104,7 @@ class _ChatState extends State<_Chat> {
                                       height: 56,
                                       alignment: Alignment.center,
                                       child: IconButton(
-                                        icon: Icon(Icons.mic),
+                                        icon: Icon(Icons.mic_none_outlined),
                                         onPressed: () =>
                                             voiceMessageAction(context),
                                       ),
@@ -1109,7 +1115,7 @@ class _ChatState extends State<_Chat> {
                                       height: 56,
                                       alignment: Alignment.center,
                                       child: IconButton(
-                                        icon: Icon(Icons.send),
+                                        icon: Icon(Icons.send_outlined),
                                         onPressed: () => send(),
                                       ),
                                     ),
diff --git a/lib/views/chat_details.dart b/lib/views/chat_details.dart
index 83026493..ecc0852c 100644
--- a/lib/views/chat_details.dart
+++ b/lib/views/chat_details.dart
@@ -200,7 +200,7 @@ class _ChatDetailsState extends State<ChatDetails> {
                     actions: <Widget>[
                       if (widget.room.canonicalAlias?.isNotEmpty ?? false)
                         IconButton(
-                          icon: Icon(Icons.share),
+                          icon: Icon(Icons.share_outlined),
                           onPressed: () => FluffyShare.share(
                               AppConfig.matrixToLinkPrefix +
                                   widget.room.canonicalAlias,
@@ -239,7 +239,7 @@ class _ChatDetailsState extends State<ChatDetails> {
                                       backgroundColor: Theme.of(context)
                                           .scaffoldBackgroundColor,
                                       foregroundColor: Colors.grey,
-                                      child: Icon(Icons.edit),
+                                      child: Icon(Icons.edit_outlined),
                                     )
                                   : null,
                               title: Text(
@@ -282,7 +282,7 @@ class _ChatDetailsState extends State<ChatDetails> {
                                   backgroundColor:
                                       Theme.of(context).scaffoldBackgroundColor,
                                   foregroundColor: Colors.grey,
-                                  child: Icon(Icons.people),
+                                  child: Icon(Icons.people_outlined),
                                 ),
                                 title: Text(
                                     L10n.of(context).changeTheNameOfTheGroup),
@@ -299,7 +299,7 @@ class _ChatDetailsState extends State<ChatDetails> {
                                   backgroundColor:
                                       Theme.of(context).scaffoldBackgroundColor,
                                   foregroundColor: Colors.grey,
-                                  child: Icon(Icons.link),
+                                  child: Icon(Icons.link_outlined),
                                 ),
                                 onTap: () => setCanonicalAliasAction(context),
                                 title: Text(L10n.of(context).setInvitationLink),
@@ -314,7 +314,7 @@ class _ChatDetailsState extends State<ChatDetails> {
                                 backgroundColor:
                                     Theme.of(context).scaffoldBackgroundColor,
                                 foregroundColor: Colors.grey,
-                                child: Icon(Icons.insert_emoticon),
+                                child: Icon(Icons.insert_emoticon_outlined),
                               ),
                               title: Text(L10n.of(context).emoteSettings),
                               subtitle: Text(L10n.of(context).setCustomEmotes),
@@ -350,7 +350,7 @@ class _ChatDetailsState extends State<ChatDetails> {
                                     backgroundColor: Theme.of(context)
                                         .scaffoldBackgroundColor,
                                     foregroundColor: Colors.grey,
-                                    child: Icon(Icons.public)),
+                                    child: Icon(Icons.public_outlined)),
                                 title: Text(L10n.of(context)
                                     .whoIsAllowedToJoinThisGroup),
                                 subtitle: Text(
@@ -387,7 +387,7 @@ class _ChatDetailsState extends State<ChatDetails> {
                                   backgroundColor:
                                       Theme.of(context).scaffoldBackgroundColor,
                                   foregroundColor: Colors.grey,
-                                  child: Icon(Icons.visibility),
+                                  child: Icon(Icons.visibility_outlined),
                                 ),
                                 title: Text(L10n.of(context)
                                     .visibilityOfTheChatHistory),
@@ -513,7 +513,7 @@ class _ChatDetailsState extends State<ChatDetails> {
                                 ? ListTile(
                                     title: Text(L10n.of(context).inviteContact),
                                     leading: CircleAvatar(
-                                      child: Icon(Icons.add),
+                                      child: Icon(Icons.add_outlined),
                                       backgroundColor:
                                           Theme.of(context).primaryColor,
                                       foregroundColor: Colors.white,
diff --git a/lib/views/chat_list.dart b/lib/views/chat_list.dart
index 3e823011..148cfc70 100644
--- a/lib/views/chat_list.dart
+++ b/lib/views/chat_list.dart
@@ -300,7 +300,7 @@ class _ChatListState extends State<ChatList> {
                               padding: EdgeInsets.zero,
                               children: <Widget>[
                                 ListTile(
-                                  leading: Icon(Icons.edit),
+                                  leading: Icon(Icons.edit_outlined),
                                   title: Text(L10n.of(context).setStatus),
                                   onTap: () => _setStatus(context),
                                 ),
@@ -311,21 +311,21 @@ class _ChatListState extends State<ChatList> {
                                   onTap: () => _drawerTapAction(NewGroupView()),
                                 ),
                                 ListTile(
-                                  leading: Icon(Icons.person_add),
+                                  leading: Icon(Icons.person_add_outlined),
                                   title: Text(L10n.of(context).newPrivateChat),
                                   onTap: () =>
                                       _drawerTapAction(NewPrivateChatView()),
                                 ),
                                 Divider(height: 1),
                                 ListTile(
-                                  leading: Icon(Icons.archive),
+                                  leading: Icon(Icons.archive_outlined),
                                   title: Text(L10n.of(context).archive),
                                   onTap: () => _drawerTapAction(
                                     Archive(),
                                   ),
                                 ),
                                 ListTile(
-                                  leading: Icon(Icons.settings),
+                                  leading: Icon(Icons.settings_outlined),
                                   title: Text(L10n.of(context).settings),
                                   onTap: () => _drawerTapAction(
                                     SettingsView(),
@@ -333,7 +333,7 @@ class _ChatListState extends State<ChatList> {
                                 ),
                                 Divider(height: 1),
                                 ListTile(
-                                  leading: Icon(Icons.share),
+                                  leading: Icon(Icons.share_outlined),
                                   title: Text(L10n.of(context).inviteContact),
                                   onTap: () {
                                     Navigator.of(context).pop();
@@ -375,11 +375,11 @@ class _ChatListState extends State<ChatList> {
                               ),
                             if (_selectedRoomIds.length == 1)
                               IconButton(
-                                icon: Icon(Icons.notifications_none),
+                                icon: Icon(Icons.notifications_none_outlined),
                                 onPressed: () => _toggleMuted(context),
                               ),
                             IconButton(
-                              icon: Icon(Icons.archive),
+                              icon: Icon(Icons.archive_outlined),
                               onPressed: () => _archiveAction(context),
                             ),
                           ],
@@ -409,7 +409,8 @@ class _ChatListState extends State<ChatList> {
                                       hintText: L10n.of(context).searchForAChat,
                                       suffixIcon: searchMode
                                           ? IconButton(
-                                              icon: Icon(Icons.backspace),
+                                              icon: Icon(
+                                                  Icons.backspace_outlined),
                                               onPressed: () => setState(() {
                                                 searchController.clear();
                                                 _searchFocusNode.unfocus();
@@ -424,7 +425,7 @@ class _ChatListState extends State<ChatList> {
                   floatingActionButton: AdaptivePageLayout.columnMode(context)
                       ? null
                       : FloatingActionButton(
-                          child: Icon(Icons.add),
+                          child: Icon(Icons.add_outlined),
                           backgroundColor: Theme.of(context).primaryColor,
                           onPressed: () => Navigator.of(context)
                               .pushAndRemoveUntil(
@@ -471,7 +472,7 @@ class _ChatListState extends State<ChatList> {
                                           children: <Widget>[
                                             Icon(
                                               searchMode
-                                                  ? Icons.search
+                                                  ? Icons.search_outlined
                                                   : Icons.chat_bubble_outline,
                                               size: 80,
                                               color: Colors.grey,
diff --git a/lib/views/image_view.dart b/lib/views/image_view.dart
index 50398a64..2b730497 100644
--- a/lib/views/image_view.dart
+++ b/lib/views/image_view.dart
@@ -31,12 +31,12 @@ class ImageView extends StatelessWidget {
         backgroundColor: Color(0x44000000),
         actions: [
           IconButton(
-            icon: Icon(Icons.reply),
+            icon: Icon(Icons.reply_outlined),
             onPressed: () => _forwardAction(context),
             color: Colors.white,
           ),
           IconButton(
-            icon: Icon(Icons.file_download),
+            icon: Icon(Icons.download_outlined),
             onPressed: () => event.openFile(context, downloadOnly: true),
             color: Colors.white,
           ),
diff --git a/lib/views/invitation_selection.dart b/lib/views/invitation_selection.dart
index 8e146335..ff4c3c5b 100644
--- a/lib/views/invitation_selection.dart
+++ b/lib/views/invitation_selection.dart
@@ -145,7 +145,7 @@ class _InvitationSelectionState extends State<InvitationSelection> {
                             height: 12,
                             child: CircularProgressIndicator(),
                           )
-                        : Icon(Icons.search),
+                        : Icon(Icons.search_outlined),
                   ),
                 ),
               ),
diff --git a/lib/views/login.dart b/lib/views/login.dart
index e6874fcf..a58266a0 100644
--- a/lib/views/login.dart
+++ b/lib/views/login.dart
@@ -176,7 +176,7 @@ class _LoginState extends State<Login> {
           children: <Widget>[
             ListTile(
               leading: CircleAvatar(
-                child: Icon(Icons.account_box,
+                child: Icon(Icons.account_box_outlined,
                     color: Theme.of(context).primaryColor),
               ),
               title: TextField(
@@ -197,7 +197,8 @@ class _LoginState extends State<Login> {
                 backgroundColor: Theme.of(context).brightness == Brightness.dark
                     ? Color(0xff121212)
                     : Colors.white,
-                child: Icon(Icons.lock, color: Theme.of(context).primaryColor),
+                child: Icon(Icons.lock_outlined,
+                    color: Theme.of(context).primaryColor),
               ),
               title: TextField(
                 readOnly: loading,
@@ -210,8 +211,8 @@ class _LoginState extends State<Login> {
                     errorText: passwordError,
                     suffixIcon: IconButton(
                       icon: Icon(showPassword
-                          ? Icons.visibility_off
-                          : Icons.visibility),
+                          ? Icons.visibility_off_outlined
+                          : Icons.visibility_outlined),
                       onPressed: () =>
                           setState(() => showPassword = !showPassword),
                     ),
diff --git a/lib/views/new_group.dart b/lib/views/new_group.dart
index b02d27d9..8f0154ee 100644
--- a/lib/views/new_group.dart
+++ b/lib/views/new_group.dart
@@ -87,7 +87,7 @@ class _NewGroupState extends State<_NewGroup> {
               decoration: InputDecoration(
                   border: OutlineInputBorder(),
                   labelText: L10n.of(context).optionalGroupName,
-                  prefixIcon: Icon(Icons.people),
+                  prefixIcon: Icon(Icons.people_outlined),
                   hintText: L10n.of(context).enterAGroupName),
             ),
           ),
@@ -105,7 +105,7 @@ class _NewGroupState extends State<_NewGroup> {
         foregroundColor: Colors.white,
         backgroundColor: Theme.of(context).primaryColor,
         onPressed: () => submitAction(context),
-        child: Icon(Icons.arrow_forward),
+        child: Icon(Icons.arrow_forward_outlined),
       ),
     );
   }
diff --git a/lib/views/new_private_chat.dart b/lib/views/new_private_chat.dart
index 66b9da42..67f050a3 100644
--- a/lib/views/new_private_chat.dart
+++ b/lib/views/new_private_chat.dart
@@ -156,7 +156,7 @@ class _NewPrivateChatState extends State<_NewPrivateChat> {
                                 size: 12,
                               ),
                             )
-                          : Icon(Icons.account_circle),
+                          : Icon(Icons.account_circle_outlined),
                   prefixText: '@',
                   hintText: '${L10n.of(context).username.toLowerCase()}',
                 ),
@@ -200,10 +200,7 @@ class _NewPrivateChatState extends State<_NewPrivateChat> {
             ),
           if (foundProfiles.isEmpty || correctMxId)
             ListTile(
-              trailing: Icon(
-                Icons.share,
-                size: 16,
-              ),
+              trailing: Icon(Icons.share_outlined),
               onTap: () => FluffyShare.share(
                   L10n.of(context).inviteText(Matrix.of(context).client.userID,
                       'https://matrix.to/#/${Matrix.of(context).client.userID}'),
@@ -231,7 +228,7 @@ class _NewPrivateChatState extends State<_NewPrivateChat> {
       ),
       floatingActionButton: FloatingActionButton(
         onPressed: () => submitAction(context),
-        child: Icon(Icons.arrow_forward),
+        child: Icon(Icons.arrow_forward_outlined),
         foregroundColor: Colors.white,
         backgroundColor: Theme.of(context).primaryColor,
       ),
diff --git a/lib/views/settings.dart b/lib/views/settings.dart
index 8b9000a8..7b29f93b 100644
--- a/lib/views/settings.dart
+++ b/lib/views/settings.dart
@@ -295,7 +295,7 @@ class _SettingsState extends State<Settings> {
               background: ContentBanner(
                 profile?.avatarUrl,
                 height: 300,
-                defaultIcon: Icons.account_circle,
+                defaultIcon: Icons.account_circle_outlined,
                 loading: profile == null,
                 onEdit: () => setAvatarAction(context),
               ),
@@ -314,7 +314,7 @@ class _SettingsState extends State<Settings> {
               ),
             ),
             ListTile(
-              trailing: Icon(Icons.notifications),
+              trailing: Icon(Icons.notifications_outlined),
               title: Text(L10n.of(context).notifications),
               onTap: () async => await Navigator.of(context).push(
                 AppRoute.defaultRoute(
@@ -340,7 +340,7 @@ class _SettingsState extends State<Settings> {
                   SettingsStyleView(),
                 ),
               ),
-              trailing: Icon(Icons.wallpaper),
+              trailing: Icon(Icons.style_outlined),
             ),
             SwitchListTile(
               title: Text(L10n.of(context).renderRichContent),
@@ -381,7 +381,7 @@ class _SettingsState extends State<Settings> {
                   EmotesSettingsView(),
                 ),
               ),
-              trailing: Icon(Icons.insert_emoticon),
+              trailing: Icon(Icons.insert_emoticon_outlined),
             ),
             Divider(thickness: 1),
             ListTile(
@@ -394,19 +394,19 @@ class _SettingsState extends State<Settings> {
               ),
             ),
             ListTile(
-              trailing: Icon(Icons.edit),
+              trailing: Icon(Icons.edit_outlined),
               title: Text(L10n.of(context).editDisplayname),
               subtitle: Text(profile?.displayname ?? client.userID.localpart),
               onTap: () => setDisplaynameAction(context),
             ),
             ListTile(
-              trailing: Icon(Icons.phone),
+              trailing: Icon(Icons.phone_outlined),
               title: Text(L10n.of(context).editJitsiInstance),
               subtitle: Text(Matrix.of(context).jitsiInstance),
               onTap: () => setJitsiInstanceAction(context),
             ),
             ListTile(
-              trailing: Icon(Icons.devices_other),
+              trailing: Icon(Icons.devices_other_outlined),
               title: Text(L10n.of(context).devices),
               onTap: () async => await Navigator.of(context).push(
                 AppRoute.defaultRoute(
@@ -416,7 +416,7 @@ class _SettingsState extends State<Settings> {
               ),
             ),
             ListTile(
-              trailing: Icon(Icons.block),
+              trailing: Icon(Icons.block_outlined),
               title: Text(L10n.of(context).ignoredUsers),
               onTap: () async => await Navigator.of(context).push(
                 AppRoute.defaultRoute(
@@ -426,7 +426,7 @@ class _SettingsState extends State<Settings> {
               ),
             ),
             ListTile(
-              trailing: Icon(Icons.account_circle),
+              trailing: Icon(Icons.account_circle_outlined),
               title: Text(L10n.of(context).accountInformation),
               onTap: () => Navigator.of(context).push(
                 AppRoute.defaultRoute(
@@ -436,20 +436,20 @@ class _SettingsState extends State<Settings> {
               ),
             ),
             ListTile(
-              trailing: Icon(Icons.bug_report),
+              trailing: Icon(Icons.bug_report_outlined),
               title: Text(L10n.of(context).sendBugReports),
               onTap: () => SentryController.toggleSentryAction(context),
             ),
             Divider(thickness: 1),
             ListTile(
-              trailing: Icon(Icons.vpn_key),
+              trailing: Icon(Icons.vpn_key_outlined),
               title: Text(
                 L10n.of(context).changePassword,
               ),
               onTap: () => _changePasswordAccountAction(context),
             ),
             ListTile(
-              trailing: Icon(Icons.email),
+              trailing: Icon(Icons.email_outlined),
               title: Text(L10n.of(context).passwordRecovery),
               onTap: () => Navigator.of(context).push(
                 AppRoute.defaultRoute(
@@ -459,12 +459,12 @@ class _SettingsState extends State<Settings> {
               ),
             ),
             ListTile(
-              trailing: Icon(Icons.exit_to_app),
+              trailing: Icon(Icons.exit_to_app_outlined),
               title: Text(L10n.of(context).logout),
               onTap: () => logoutAction(context),
             ),
             ListTile(
-              trailing: Icon(Icons.delete_forever),
+              trailing: Icon(Icons.delete_forever_outlined),
               title: Text(
                 L10n.of(context).deleteAccount,
                 style: TextStyle(color: Colors.red),
@@ -482,7 +482,7 @@ class _SettingsState extends State<Settings> {
               ),
             ),
             ListTile(
-              trailing: Icon(Icons.compare_arrows),
+              trailing: Icon(Icons.compare_arrows_outlined),
               title: Text(client.encryption.crossSigning.enabled
                   ? L10n.of(context).crossSigningEnabled
                   : L10n.of(context).crossSigningDisabled),
@@ -562,7 +562,7 @@ class _SettingsState extends State<Settings> {
               },
             ),
             ListTile(
-              trailing: Icon(Icons.wb_cloudy),
+              trailing: Icon(Icons.wb_cloudy_outlined),
               title: Text(client.encryption.keyManager.enabled
                   ? L10n.of(context).onlineKeyBackupEnabled
                   : L10n.of(context).onlineKeyBackupDisabled),
@@ -597,17 +597,17 @@ class _SettingsState extends State<Settings> {
               ),
             ),
             ListTile(
-              trailing: Icon(Icons.help),
+              trailing: Icon(Icons.help_outlined),
               title: Text(L10n.of(context).help),
               onTap: () => launch(AppConfig.supportUrl),
             ),
             ListTile(
-              trailing: Icon(Icons.privacy_tip_rounded),
+              trailing: Icon(Icons.privacy_tip_outlined),
               title: Text(L10n.of(context).privacy),
               onTap: () => launch(AppConfig.privacyUrl),
             ),
             ListTile(
-              trailing: Icon(Icons.link),
+              trailing: Icon(Icons.link_outlined),
               title: Text(L10n.of(context).license),
               onTap: () => showLicensePage(
                 context: context,
@@ -617,7 +617,7 @@ class _SettingsState extends State<Settings> {
               ),
             ),
             ListTile(
-              trailing: Icon(Icons.code),
+              trailing: Icon(Icons.code_outlined),
               title: Text(L10n.of(context).sourceCode),
               onTap: () => launch(AppConfig.sourceCodeUrl),
             ),
diff --git a/lib/views/settings_3pid.dart b/lib/views/settings_3pid.dart
index 4e2ed00c..d5b5fe82 100644
--- a/lib/views/settings_3pid.dart
+++ b/lib/views/settings_3pid.dart
@@ -126,7 +126,7 @@ class _Settings3PidState extends State<Settings3Pid> {
         title: Text(L10n.of(context).passwordRecovery),
         actions: [
           IconButton(
-            icon: Icon(Icons.add),
+            icon: Icon(Icons.add_outlined),
             onPressed: () => _add3PidAction(context),
           )
         ],
@@ -155,7 +155,9 @@ class _Settings3PidState extends State<Settings3Pid> {
                   foregroundColor:
                       identifier.isEmpty ? Colors.orange : Colors.grey,
                   child: Icon(
-                    identifier.isEmpty ? Icons.warning : Icons.info,
+                    identifier.isEmpty
+                        ? Icons.warning_outlined
+                        : Icons.info_outlined,
                   ),
                 ),
                 title: Text(
@@ -176,7 +178,7 @@ class _Settings3PidState extends State<Settings3Pid> {
                         child: Icon(identifier[i].iconData)),
                     title: Text(identifier[i].address),
                     trailing: IconButton(
-                      icon: Icon(Icons.delete_forever),
+                      icon: Icon(Icons.delete_forever_outlined),
                       color: Colors.red,
                       onPressed: () => _delete3Pid(context, identifier[i]),
                     ),
diff --git a/lib/views/settings_devices.dart b/lib/views/settings_devices.dart
index ea8f70b5..510d3a39 100644
--- a/lib/views/settings_devices.dart
+++ b/lib/views/settings_devices.dart
@@ -99,7 +99,7 @@ class DevicesSettingsState extends State<DevicesSettings> {
               child: Column(
                 mainAxisSize: MainAxisSize.min,
                 children: <Widget>[
-                  Icon(Icons.error),
+                  Icon(Icons.error_outlined),
                   Text(snapshot.error.toString()),
                 ],
               ),
diff --git a/lib/views/settings_emotes.dart b/lib/views/settings_emotes.dart
index 631554d0..bbc812d4 100644
--- a/lib/views/settings_emotes.dart
+++ b/lib/views/settings_emotes.dart
@@ -189,7 +189,7 @@ class _EmotesSettingsState extends State<EmotesSettings> {
       ),
       floatingActionButton: showSave
           ? FloatingActionButton(
-              child: Icon(Icons.save, color: Colors.white),
+              child: Icon(Icons.save_outlined, color: Colors.white),
               onPressed: () async {
                 await _save(context);
                 setState(() {
@@ -239,7 +239,7 @@ class _EmotesSettingsState extends State<EmotesSettings> {
                       title: _EmoteImagePicker(newMxcController),
                       trailing: InkWell(
                         child: Icon(
-                          Icons.add,
+                          Icons.add_outlined,
                           color: Colors.green,
                           size: 32.0,
                         ),
@@ -387,7 +387,7 @@ class _EmotesSettingsState extends State<EmotesSettings> {
                                   ? null
                                   : InkWell(
                                       child: Icon(
-                                        Icons.delete_forever,
+                                        Icons.delete_forever_outlined,
                                         color: Colors.red,
                                         size: 32.0,
                                       ),
diff --git a/lib/views/settings_ignore_list.dart b/lib/views/settings_ignore_list.dart
index 1acf7783..35326670 100644
--- a/lib/views/settings_ignore_list.dart
+++ b/lib/views/settings_ignore_list.dart
@@ -53,7 +53,7 @@ class SettingsIgnoreList extends StatelessWidget {
                     prefixText: '@',
                     labelText: L10n.of(context).ignoreUsername,
                     suffixIcon: IconButton(
-                      icon: Icon(Icons.done),
+                      icon: Icon(Icons.done_outlined),
                       onPressed: () => _ignoreUser(context),
                     ),
                   ),
@@ -85,7 +85,7 @@ class SettingsIgnoreList extends StatelessWidget {
                         title:
                             Text(s.data?.displayname ?? client.ignoredUsers[i]),
                         trailing: IconButton(
-                          icon: Icon(Icons.delete_forever),
+                          icon: Icon(Icons.delete_forever_outlined),
                           onPressed: () => SimpleDialogs(context)
                               .tryRequestWithLoadingDialog(
                             client.unignoreUser(client.ignoredUsers[i]),
diff --git a/lib/views/settings_style.dart b/lib/views/settings_style.dart
index 74c6d4ad..80b8c7c8 100644
--- a/lib/views/settings_style.dart
+++ b/lib/views/settings_style.dart
@@ -70,7 +70,7 @@ class _SettingsStyleState extends State<SettingsStyle> {
                 fit: BoxFit.cover,
               ),
               trailing: Icon(
-                Icons.delete_forever,
+                Icons.delete_forever_outlined,
                 color: Colors.red,
               ),
               onTap: () => deleteWallpaperAction(context),
@@ -78,7 +78,7 @@ class _SettingsStyleState extends State<SettingsStyle> {
           Builder(builder: (context) {
             return ListTile(
               title: Text(L10n.of(context).changeWallpaper),
-              trailing: Icon(Icons.wallpaper),
+              trailing: Icon(Icons.wallpaper_outlined),
               onTap: () => setWallpaperAction(context),
             );
           }),
diff --git a/lib/views/sign_up.dart b/lib/views/sign_up.dart
index 0d7647ce..6988293b 100644
--- a/lib/views/sign_up.dart
+++ b/lib/views/sign_up.dart
@@ -102,7 +102,7 @@ class _SignUpState extends State<SignUp> {
                         : Colors.white
                     : Theme.of(context).secondaryHeaderColor,
                 child: avatar == null
-                    ? Icon(Icons.camera_alt,
+                    ? Icon(Icons.camera_alt_outlined,
                         color: Theme.of(context).primaryColor)
                     : null,
               ),
@@ -125,7 +125,7 @@ class _SignUpState extends State<SignUp> {
                     ? Color(0xff121212)
                     : Colors.white,
                 child: Icon(
-                  Icons.account_circle,
+                  Icons.account_circle_outlined,
                   color: Theme.of(context).primaryColor,
                 ),
               ),
diff --git a/lib/views/sign_up_password.dart b/lib/views/sign_up_password.dart
index 5244f403..03d65049 100644
--- a/lib/views/sign_up_password.dart
+++ b/lib/views/sign_up_password.dart
@@ -130,7 +130,7 @@ class _SignUpPasswordState extends State<SignUpPassword> {
           ListTile(
             leading: CircleAvatar(
               backgroundColor: Colors.white,
-              child: Icon(Icons.lock, color: Theme.of(context).primaryColor),
+              child: Icon(Icons.lock_outlined, color: Theme.of(context).primaryColor),
             ),
             title: TextField(
               controller: passwordController,
@@ -143,7 +143,7 @@ class _SignUpPasswordState extends State<SignUpPassword> {
                   errorText: passwordError,
                   suffixIcon: IconButton(
                     icon: Icon(
-                        showPassword ? Icons.visibility_off : Icons.visibility),
+                        showPassword ? Icons.visibility_off_outlined : Icons.visibility_outlined),
                     onPressed: () =>
                         setState(() => showPassword = !showPassword),
                   ),