diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index ca02a76c..42d88713 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -52,8 +52,8 @@
     "/chunks/invoices.js": "/chunks/invoices.js?id=1deb187f6d3eb1e81ad0",
     "/chunks/not-found-shared.js": "/chunks/not-found-shared.js?id=7fc7f9b6f10bdfac770e",
     "/chunks/oasis/homepage.js": "/chunks/oasis/homepage.js?id=a1885dd8814f9eb63a1c",
-    "/chunks/oasis/invoices.js": "/chunks/oasis/invoices.js?id=ff41d90afd0154a45d77",
-    "/chunks/oasis/invoices/list.js": "/chunks/oasis/invoices/list.js?id=fa265ec5658bfb5d47d2",
+    "/chunks/oasis/invoices.js": "/chunks/oasis/invoices.js?id=468f5d8b279884496332",
+    "/chunks/oasis/invoices/list.js": "/chunks/oasis/invoices/list.js?id=5fc965d6fde96ed7ef00",
     "/chunks/oasis/invoices~chunks/platform~chunks/shared.js": "/chunks/oasis/invoices~chunks/platform~chunks/shared.js?id=9ad184d8e96c7d04941c",
     "/chunks/oasis/platba.js": "/chunks/oasis/platba.js?id=53d9f2a31b1dd5dad85e",
     "/chunks/oasis/platba~chunks/oasis/upgrade-billing~chunks/oasis/upgrade-plan~chunks/upgrade-billing~ch~6880400b.js": "/chunks/oasis/platba~chunks/oasis/upgrade-billing~chunks/oasis/upgrade-plan~chunks/upgrade-billing~ch~6880400b.js?id=0c8d1c3cca084baa177f",
@@ -120,5 +120,9 @@
     "/js/main.178d7e57e604f65f98b2.hot-update.js": "/js/main.178d7e57e604f65f98b2.hot-update.js",
     "/chunks/oasis/invoices/list.8578178491ad6c3c565f.hot-update.js": "/chunks/oasis/invoices/list.8578178491ad6c3c565f.hot-update.js",
     "/chunks/oasis/invoices.0522bbd02c490c945440.hot-update.js": "/chunks/oasis/invoices.0522bbd02c490c945440.hot-update.js",
-    "/chunks/oasis/invoices/list.0522bbd02c490c945440.hot-update.js": "/chunks/oasis/invoices/list.0522bbd02c490c945440.hot-update.js"
+    "/chunks/oasis/invoices/list.0522bbd02c490c945440.hot-update.js": "/chunks/oasis/invoices/list.0522bbd02c490c945440.hot-update.js",
+    "/chunks/oasis/invoices.722ea2e34cc7e8e95915.hot-update.js": "/chunks/oasis/invoices.722ea2e34cc7e8e95915.hot-update.js",
+    "/chunks/oasis/invoices.884a13144310550d496d.hot-update.js": "/chunks/oasis/invoices.884a13144310550d496d.hot-update.js",
+    "/chunks/oasis/invoices/list.31d8fd28372c5ca4c59f.hot-update.js": "/chunks/oasis/invoices/list.31d8fd28372c5ca4c59f.hot-update.js",
+    "/chunks/oasis/invoices/list.f2da41474e486bd5b136.hot-update.js": "/chunks/oasis/invoices/list.f2da41474e486bd5b136.hot-update.js"
 }
diff --git a/resources/js/Oasis/Modules/Invoices/Invoices.vue b/resources/js/Oasis/Modules/Invoices/Invoices.vue
index 93a76b8d..a762845f 100644
--- a/resources/js/Oasis/Modules/Invoices/Invoices.vue
+++ b/resources/js/Oasis/Modules/Invoices/Invoices.vue
@@ -15,37 +15,33 @@
 
 		<!--Sidebar navigation-->
         <ContentSidebar>
-            <ContentGroup title="Invoices" class="navigator">
-                <div class="menu-list-wrapper vertical">
-                    <a @click="goTo('invoices')" :class="{'is-active': $isThisLocation(['invoices'])}" class="menu-list-item link">
-                        <div class="icon text-theme">
-                            <file-text-icon size="17" />
-                        </div>
-                        <div class="label text-theme">
-                            Invoices
-                        </div>
-                    </a>
-                    <a @click="goTo('advance-invoices')" :class="{'is-active': $isThisLocation(['advance-invoices'])}" class="menu-list-item link">
-                        <div class="icon text-theme">
-                            <clock-icon size="17" />
-                        </div>
-                        <div class="label text-theme">
-                            Advance Invoices
-                        </div>
-                    </a>
-                </div>
+            <ContentGroup title="Invoices" class="navigator menu-list-wrapper vertical">
+				<a @click="goTo('invoices')" :class="{'is-active': $isThisLocation(['invoices'])}" class="menu-list-item link">
+					<div class="icon text-theme">
+						<file-text-icon size="17" />
+					</div>
+					<div class="label text-theme">
+						Invoices
+					</div>
+				</a>
+				<a @click="goTo('advance-invoices')" :class="{'is-active': $isThisLocation(['advance-invoices'])}" class="menu-list-item link">
+					<div class="icon text-theme">
+						<clock-icon size="17" />
+					</div>
+					<div class="label text-theme">
+						Advance Invoices
+					</div>
+				</a>
             </ContentGroup>
-            <ContentGroup title="Others" class="navigator">
-                <div class="menu-list-wrapper vertical">
-                    <a @click="goTo('clients')" :class="{'is-active': $isThisLocation(['clients'])}" class="menu-list-item link">
-                        <div class="icon text-theme">
-                            <users-icon size="17" />
-                        </div>
-                        <div class="label text-theme">
-                            Clients
-                        </div>
-                    </a>
-                </div>
+            <ContentGroup title="Others" class="navigator menu-list-wrapper vertical">
+				<a @click="goTo('clients')" :class="{'is-active': $isThisLocation(['clients'])}" class="menu-list-item link">
+					<div class="icon text-theme">
+						<users-icon size="17" />
+					</div>
+					<div class="label text-theme">
+						Clients
+					</div>
+				</a>
             </ContentGroup>
         </ContentSidebar>
 
diff --git a/resources/js/Oasis/Modules/Invoices/components/InvoiceDesktopToolbar.vue b/resources/js/Oasis/Modules/Invoices/components/InvoiceDesktopToolbar.vue
index baa7df3d..d655b293 100644
--- a/resources/js/Oasis/Modules/Invoices/components/InvoiceDesktopToolbar.vue
+++ b/resources/js/Oasis/Modules/Invoices/components/InvoiceDesktopToolbar.vue
@@ -35,9 +35,9 @@
 
 				<!--Invoice Controls-->
 				<ToolbarGroup v-if="! $isMobile()">
-                    <ToolbarButton @click.native="shareInvoice" source="send" :action="$t('actions.share')" />
-                    <ToolbarButton @click.native="shareInvoice" source="rename" :action="$t('actions.share')" />
-                    <ToolbarButton @click.native="deleteInvoice" source="trash" :action="$t('actions.delete')" />
+                    <ToolbarButton @click.native="shareInvoice" :class="{'is-inactive': canActiveInView }" source="send" :action="$t('actions.share')" />
+                    <ToolbarButton @click.native="shareInvoice" :class="{'is-inactive': canActiveInView }" source="rename" :action="$t('actions.share')" />
+                    <ToolbarButton @click.native="deleteInvoice" :class="{'is-inactive': canActiveInView }" source="trash" :action="$t('actions.delete')" />
 				</ToolbarGroup>
 
 				<!--View Controls-->
@@ -45,7 +45,10 @@
 					<PopoverWrapper>
 						<ToolbarButton @click.stop.native="showSortingMenu" source="preview-sorting" :action="$t('actions.sorting_view')" />
 						<PopoverItem name="desktop-sorting">
-							<FileSortingOptions />
+							<OptionGroup>
+								<Option @click.native.stop="sort('created_at')" :title="$t('preview_sorting.sort_date')" icon="calendar" />
+								<Option @click.native.stop="sort('name')" :title="$t('preview_sorting.sort_alphabet')" icon="alphabet" />
+							</OptionGroup>
 						</PopoverItem>
 					</PopoverWrapper>
                     <ToolbarButton @click.native="$store.dispatch('fileInfoToggle')" :class="{'active': isVisibleSidebar }" :action="$t('actions.info_panel')" source="info" />
@@ -89,6 +92,13 @@
 				'isVisibleSidebar',
 				'clipboard',
 			]),
+			canActiveInView() {
+				let locations = [
+					'invoices',
+					'advance-invoices',
+				]
+				return !this.$isThisLocation(locations) || this.clipboard.length === 0
+			},
 		},
 		data() {
 			return {