diff --git a/stream_chat_v1/lib/chat_info_screen.dart b/stream_chat_v1/lib/chat_info_screen.dart
index 4696a40..7df0a59 100644
--- a/stream_chat_v1/lib/chat_info_screen.dart
+++ b/stream_chat_v1/lib/chat_info_screen.dart
@@ -77,7 +77,6 @@ class _ChatInfoScreenState extends State<ChatInfoScreen> {
                     showOnlineStatus: false,
                   ),
                 ),
-                //SizedBox(height: 4.0),
                 Text(
                   widget.user.name,
                   style: TextStyle(fontSize: 16.0, fontWeight: FontWeight.bold),
@@ -105,16 +104,10 @@ class _ChatInfoScreenState extends State<ChatInfoScreen> {
               ],
             ),
             Positioned(
-              top: 21,
-              left: 16,
-              child: InkWell(
-                child: StreamSvgIcon.left(
-                  color: StreamChatTheme.of(context).colorTheme.black,
-                ),
-                onTap: () {
-                  Navigator.of(context).pop();
-                },
-              ),
+              top: 0,
+              left: 0,
+              width: 58,
+              child: StreamBackButton(),
             ),
           ],
         ),
@@ -445,21 +438,7 @@ class __SharedGroupsScreenState extends State<_SharedGroupsScreen> {
               color: StreamChatTheme.of(context).colorTheme.black,
               fontSize: 16.0),
         ),
-        leading: Center(
-          child: InkWell(
-            onTap: () {
-              Navigator.of(context).pop();
-            },
-            child: Container(
-              child: StreamSvgIcon.left(
-                color: StreamChatTheme.of(context).colorTheme.black,
-                size: 24.0,
-              ),
-              width: 24.0,
-              height: 24.0,
-            ),
-          ),
-        ),
+        leading: StreamBackButton(),
         backgroundColor: StreamChatTheme.of(context).colorTheme.white,
       ),
       body: StreamBuilder<List<Channel>>(
diff --git a/stream_chat_v1/lib/group_info_screen.dart b/stream_chat_v1/lib/group_info_screen.dart
index ed72afa..1d2eaab 100644
--- a/stream_chat_v1/lib/group_info_screen.dart
+++ b/stream_chat_v1/lib/group_info_screen.dart
@@ -84,18 +84,7 @@ class _GroupInfoScreenState extends State<GroupInfoScreen> {
               elevation: 1.0,
               toolbarHeight: 56.0,
               backgroundColor: StreamChatTheme.of(context).colorTheme.white,
-              leading: InkWell(
-                onTap: () {
-                  Navigator.pop(context);
-                },
-                child: Padding(
-                  padding: const EdgeInsets.only(left: 12.0),
-                  child: StreamSvgIcon.left(
-                    color: StreamChatTheme.of(context).colorTheme.black,
-                  ),
-                ),
-              ),
-              leadingWidth: 36.0,
+              leading: StreamBackButton(),
               title: Column(
                 children: [
                   StreamBuilder<ChannelState>(