diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/app/config.yml b/src/Sylius/Bundle/AdminBundle/Resources/config/app/config.yml
index 3551a1e0a23..7192c39f0cc 100644
--- a/src/Sylius/Bundle/AdminBundle/Resources/config/app/config.yml
+++ b/src/Sylius/Bundle/AdminBundle/Resources/config/app/config.yml
@@ -57,6 +57,7 @@ sylius_admin:
             links: '@SyliusAdmin/Shared/Grid/ItemAction/_links.html.twig'
             show: '@SyliusAdmin/Shared/Grid/ItemAction/_show.html.twig'
             update: '@SyliusAdmin/Shared/Grid/ItemAction/_update.html.twig'
+            ship_with_tracking_code: '@SyliusAdmin/Shipment/Grid/Action/shipWithTrackingCode.html.twig'
 
 sylius_grid:
     templates:
diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/grids/shipment.yml b/src/Sylius/Bundle/AdminBundle/Resources/config/grids/shipment.yml
index 019ffe9b2e2..00450b2cbb8 100644
--- a/src/Sylius/Bundle/AdminBundle/Resources/config/grids/shipment.yml
+++ b/src/Sylius/Bundle/AdminBundle/Resources/config/grids/shipment.yml
@@ -27,18 +27,18 @@ sylius_grid:
                     label: sylius.ui.order
                     path: order
                     options:
-                        template: "@SyliusAdmin/Order/Grid/Field/number.html.twig"
+                        template: "@SyliusAdmin/Shared/Grid/Field/orderNumber.html.twig"
                 channel:
                     type: twig
                     label: sylius.ui.channel
                     path: order.channel
                     options:
-                        template: "@SyliusAdmin/Order/Grid/Field/channel.html.twig"
+                        template: "@SyliusAdmin/Shared/Grid/Field/channel.html.twig"
                 state:
                     type: twig
                     label: sylius.ui.state
                     options:
-                        template: "@SyliusAdmin/Common/Label/shipmentState.html.twig"
+                        template: "@SyliusAdmin/Shared/Grid/Field/shipmentState.html.twig"
             filters:
                 state:
                     type: select
diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Field/shipmentState.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Field/shipmentState.html.twig
new file mode 100644
index 00000000000..eaea25b150d
--- /dev/null
+++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shared/Grid/Field/shipmentState.html.twig
@@ -0,0 +1,14 @@
+{%
+    set viewOptions = {
+    cancelled: { color: 'bg-red-lt' },
+    cart: { color: '' },
+    ready: { color: 'bg-blue-lt' },
+    shipped: { color: 'bg-green-lt' },
+}
+%}
+
+{% set value = 'sylius.ui.' ~ data %}
+
+<span class="badge {{ viewOptions[data]['color'] }}">
+    {{ value|trans }}
+</span>
diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Shipment/Grid/Action/shipWithTrackingCode.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Shipment/Grid/Action/shipWithTrackingCode.html.twig
new file mode 100644
index 00000000000..722ed8ce09e
--- /dev/null
+++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Shipment/Grid/Action/shipWithTrackingCode.html.twig
@@ -0,0 +1 @@
+xd