diff --git a/assets/images/search.gif b/assets/images/search.gif
new file mode 100644
index 0000000..ea35173
Binary files /dev/null and b/assets/images/search.gif differ
diff --git a/assets/locale/tr-TR.json b/assets/locale/tr-TR.json
index f7df714..8960a9f 100644
--- a/assets/locale/tr-TR.json
+++ b/assets/locale/tr-TR.json
@@ -20,7 +20,7 @@
   "login_hint": "Öz loginiňizi ýazyň",
   "password": "Açar sözi",
   "password_hint": "Öz açar sözüni ýazyň",
-  "credentials_validation_header": "'Invalid credentials",
+  "credentials_validation_header": "Invalid credentials",
   "credentials_validation_body": "Username or Password Wrong!",
   "required_validation": "This field can't be empty",
   "order": "Sargyt",
diff --git a/lib/core/constants/assets.dart b/lib/core/constants/assets.dart
index f805730..906eaea 100644
--- a/lib/core/constants/assets.dart
+++ b/lib/core/constants/assets.dart
@@ -11,4 +11,5 @@ sealed class AppAssets {
   static const String trucksPng = 'assets/images/trucks.png';
   static const String header = 'assets/images/header.png';
   static const String search = 'assets/images/search.png';
+  static const String searchGif = 'assets/images/search.gif';
 }
diff --git a/lib/data/data_sources/remote/user_remote_data_source.dart b/lib/data/data_sources/remote/user_remote_data_source.dart
index 6cd61d3..6191747 100644
--- a/lib/data/data_sources/remote/user_remote_data_source.dart
+++ b/lib/data/data_sources/remote/user_remote_data_source.dart
@@ -25,7 +25,7 @@ class UserRemoteDataSourceImpl implements UserRemoteDataSource {
       },
       body: json.encode(
         {
-          'UserName': params.username,
+          'UserName': params.username.trim(),
           'Password': params.password,
         },
       ),
diff --git a/lib/presentation/screens/histories_screen.dart b/lib/presentation/screens/histories_screen.dart
index 929960a..d07b56e 100644
--- a/lib/presentation/screens/histories_screen.dart
+++ b/lib/presentation/screens/histories_screen.dart
@@ -100,7 +100,9 @@ class _HistoriesScreenState extends State<HistoriesScreen> {
                     ),
                   );
                 } else {
-                  return const SizedBox.shrink();
+                  return const SliverToBoxAdapter(
+                    child: SizedBox.shrink(),
+                  );
                 }
               },
             ),
diff --git a/lib/presentation/screens/orders.dart b/lib/presentation/screens/orders.dart
index a94f5eb..309c029 100644
--- a/lib/presentation/screens/orders.dart
+++ b/lib/presentation/screens/orders.dart
@@ -69,7 +69,7 @@ class _OrdersScreenState extends State<OrdersScreen> with AutomaticKeepAliveClie
             ),
             BlocBuilder<OrderBloc, OrderState>(
               builder: (context, state) {
-                if (state is OrderLoading && state.orders.isEmpty) {
+                if (state is OrderLoading && state.orders.isEmpty || state is OrderInitial) {
                   return const SliverToBoxAdapter(
                     child: Center(
                       child: CircularProgressIndicator(),
@@ -108,7 +108,9 @@ class _OrdersScreenState extends State<OrdersScreen> with AutomaticKeepAliveClie
                     ),
                   );
                 } else {
-                  return const SizedBox.shrink();
+                  return const SliverToBoxAdapter(
+                    child: SizedBox.shrink(),
+                  );
                 }
               },
             ),
diff --git a/lib/presentation/widgets/empty_order.dart b/lib/presentation/widgets/empty_order.dart
index 61ffc3e..62bbe25 100644
--- a/lib/presentation/widgets/empty_order.dart
+++ b/lib/presentation/widgets/empty_order.dart
@@ -15,7 +15,17 @@ class EmptyOrder extends StatelessWidget {
         child: Column(
           mainAxisSize: MainAxisSize.min,
           children: [
-            Image.asset(AppAssets.search),
+            ColorFiltered(
+              colorFilter: const ColorFilter.mode(
+                AppColors.surface,
+                BlendMode.multiply,
+              ),
+              child: Image.asset(
+                AppAssets.searchGif,
+                height: 120,
+                width: 120,
+              ),
+            ),
             Space.yf(),
             Text('order_not_available'.tr()),
           ],