diff --git a/packages/Webkul/Admin/src/Resources/views/layouts/tabs.blade.php b/packages/Webkul/Admin/src/Resources/views/layouts/tabs.blade.php
index b156a99b4..9c8c1c071 100644
--- a/packages/Webkul/Admin/src/Resources/views/layouts/tabs.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/layouts/tabs.blade.php
@@ -1,27 +1,46 @@
 <div class="tabs">
-    <ul>
-        @if (request()->route()->getName() != 'admin.configuration.index')
-            <?php $keys = explode('.', $menu->currentKey);  ?>
+    @if (request()->route()->getName() != 'admin.configuration.index')
 
-            @foreach(array_get($menu->items, implode('.children.', array_slice($keys, 0, 2)) . '.children') as $item)
-                <li class="{{ $menu->getActive($item) }}">
-                    <a href="{{ $item['url'] }}">
-                        {{ $item['name'] }}
-                    </a>
-                </li>
-            @endforeach
+        <?php $keys = explode('.', $menu->currentKey);  ?>
 
-        @else
 
-            @if (array_get($config->items, request()->route('slug') . '.children'))
-                @foreach (array_get($config->items, request()->route('slug') . '.children') as $key => $item)
+        @if ($items = array_get($menu->items, implode('.children.', array_slice($keys, 0, 2)) . '.children'))
+        
+            <ul>
+
+                @foreach(array_get($menu->items, implode('.children.', array_slice($keys, 0, 2)) . '.children') as $item)
+
+                    <li class="{{ $menu->getActive($item) }}">
+                        <a href="{{ $item['url'] }}">
+                            {{ $item['name'] }}
+                        </a>
+                    </li>
+
+                @endforeach
+        
+            </ul>
+
+        @endif
+
+    @else
+
+        @if ($items = array_get($config->items, request()->route('slug') . '.children'))
+
+            <ul>
+
+                @foreach ($items as $key => $item)
+
                     <li class="{{ $key == request()->route('slug2') ? 'active' : '' }}">
                         <a href="{{ route('admin.configuration.index', (request()->route('slug') . '/' . $key)) }}">
                             {{ $item['name'] }}
                         </a>
                     </li>
+
                 @endforeach
-            @endif
+
+            </ul>
+
         @endif
-    </ul>
+
+    @endif
 </div>
\ No newline at end of file
diff --git a/packages/Webkul/Admin/src/Resources/views/sales/orders/view.blade.php b/packages/Webkul/Admin/src/Resources/views/sales/orders/view.blade.php
index 779755f02..7fa327cc3 100644
--- a/packages/Webkul/Admin/src/Resources/views/sales/orders/view.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/sales/orders/view.blade.php
@@ -341,7 +341,7 @@
                                         <td>{{ core()->formatBasePrice($invoice->base_grand_total) }}</td>
                                         <td class="action">
                                             <a href="{{ route('admin.sales.invoices.view', $invoice->id) }}">
-                                                <i class="icon pencil-lg-icon"></i>
+                                                <i class="icon eye-icon"></i>
                                             </a>
                                         </td>
                                     </tr>
@@ -385,7 +385,7 @@
                                         <td>{{ $shipment->total_qty }}</td>
                                         <td class="action">
                                             <a href="{{ route('admin.sales.shipments.view', $shipment->id) }}">
-                                                <i class="icon pencil-lg-icon"></i>
+                                                <i class="icon eye-icon"></i>
                                             </a>
                                         </td>
                                     </tr>