diff --git a/app/Http/Controllers/Common/Uploads.php b/app/Http/Controllers/Common/Uploads.php
index ae522b7a3..98274b149 100644
--- a/app/Http/Controllers/Common/Uploads.php
+++ b/app/Http/Controllers/Common/Uploads.php
@@ -37,12 +37,20 @@ class Uploads extends Controller
     public function show($id, Request $request)
     {
         $file = false;
+        $options = false;
         $column_name = 'attachment';
 
         if ($request->has('column_name')) {
             $column_name = $request->get('column_name');
         }
 
+        if ($request->has('page')) {
+            $options = [
+                'page' => $request->get('page'),
+                'key' => $request->get('key'),
+            ];
+        }
+
         $media = Media::find($id);
 
         // Get file path
@@ -58,7 +66,7 @@ class Uploads extends Controller
 
         $file = $media;
 
-        $html = view('partials.media.file', compact('file', 'column_name'))->render();
+        $html = view('partials.media.file', compact('file', 'column_name', 'options'))->render();
 
         return response()->json([
             'success' => true,
diff --git a/resources/views/expenses/bills/show.blade.php b/resources/views/expenses/bills/show.blade.php
index 772f795aa..7d9cb3cdc 100644
--- a/resources/views/expenses/bills/show.blade.php
+++ b/resources/views/expenses/bills/show.blade.php
@@ -431,11 +431,13 @@
 
 @push('scripts')
     <script type="text/javascript">
+        @permission('delete-common-uploads')
         @if($bill->attachment)
         $(document).on('click', '#remove-attachment', function (e) {
             confirmDelete("#attachment-{!! $bill->attachment->id !!}", "{!! trans('general.attachment') !!}", "{!! trans('general.delete_confirm', ['name' => '<strong>' . $bill->attachment->basename . '</strong>', 'type' => strtolower(trans('general.attachment'))]) !!}", "{!! trans('general.cancel') !!}", "{!! trans('general.delete')  !!}");
         });
         @endif
+        @endpermission
 
         $(document).on('click', '#button-payment', function (e) {
             $('#modal-add-payment').remove();
diff --git a/resources/views/incomes/invoices/show.blade.php b/resources/views/incomes/invoices/show.blade.php
index c4b8c5fa8..368941448 100644
--- a/resources/views/incomes/invoices/show.blade.php
+++ b/resources/views/incomes/invoices/show.blade.php
@@ -459,11 +459,13 @@
 
 @push('scripts')
     <script type="text/javascript">
+        @permission('delete-common-uploads')
         @if($invoice->attachment)
         $(document).on('click', '#remove-attachment', function (e) {
             confirmDelete("#attachment-{!! $invoice->attachment->id !!}", "{!! trans('general.attachment') !!}", "{!! trans('general.delete_confirm', ['name' => '<strong>' . $invoice->attachment->basename . '</strong>', 'type' => strtolower(trans('general.attachment'))]) !!}", "{!! trans('general.cancel') !!}", "{!! trans('general.delete')  !!}");
         });
         @endif
+        @endpermission
 
         $(document).on('click', '#button-payment', function (e) {
             $('#modal-add-payment').remove();
diff --git a/resources/views/partials/media/file.blade.php b/resources/views/partials/media/file.blade.php
index 960675409..fe7f720ad 100644
--- a/resources/views/partials/media/file.blade.php
+++ b/resources/views/partials/media/file.blade.php
@@ -1,3 +1,8 @@
+@php
+$column_name = !empty($column_name) ? $column_name : 'attachment';
+$options = !empty($options) ? $options : false;
+@endphp
+
 <ul class="mailbox-attachments clearfix margin-top">
     <li>
         @if ($file->aggregate_type != 'image')
@@ -20,18 +25,24 @@
             <span class="mailbox-attachment-size">
               {{ $file->readableSize() }}
 
+                @permission('delete-common-uploads')
                 {!! Form::open([
                 'id' => $column_name. '-' . $file->id,
                 'method' => 'DELETE',
                 'url' => [url('uploads/' . $file->id)],
                 'style' => 'display:inline'
             ]) !!}
-                @permission('delete-common-uploads')
                 <a href="javascript:void();" id="remove-{{ $column_name }}" class="btn btn-danger btn-xs pull-right mailbox-attachment-remove">
                     <i class="fa fa fa-times"></i>
                 </a>
-                @endpermission
+
+                @if ($options)
+                <input type="hidden" name="page" value="{{ $options['page'] }}" />
+                <input type="hidden" name="key" value="{{ $options['key'] }}" />
+                <input type="hidden" name="value" value="{{ $file->id }}" />
+                @endif
                 {!! Form::close() !!}
+                @endpermission
 
                 <a href="{{ url('uploads/' . $file->id . '/download') }}" class="btn btn-info btn-xs pull-right mailbox-attachment-download">
                     <i class="fa fa-cloud-download"></i>
diff --git a/resources/views/partials/media/files.blade.php b/resources/views/partials/media/files.blade.php
index f1deb107b..13d60a69e 100644
--- a/resources/views/partials/media/files.blade.php
+++ b/resources/views/partials/media/files.blade.php
@@ -1,3 +1,8 @@
+@php
+$column_name = !empty($column_name) ? $column_name : 'attachment';
+$options = !empty($options) ? $options : false;
+@endphp
+
 <ul class="mailbox-attachments clearfix margin-top">
     @foreach ($files as $file)
     <li>
@@ -21,18 +26,24 @@
             <span class="mailbox-attachment-size">
               {{ $file->readableSize() }}
 
+              @permission('delete-common-uploads')
                 {!! Form::open([
                 'id' => 'attachment-' . $file->id,
                 'method' => 'DELETE',
                 'url' => [url('uploads/' . $file->id)],
                 'style' => 'display:inline'
             ]) !!}
-                @permission('delete-common-uploads')
                 <a href="javascript:void();" id="remove-attachment" class="btn btn-danger btn-xs pull-right mailbox-attachment-remove">
                     <i class="fa fa fa-times"></i>
                 </a>
-                @endpermission
+
+                @if ($options)
+                <input type="hidden" name="page" value="{{ $options['page'] }}" />
+                <input type="hidden" name="key" value="{{ $options['key'] }}" />
+                <input type="hidden" name="value" value="{{ $file->id }}" />
+                @endif
                 {!! Form::close() !!}
+                @endpermission
 
                 <a href="{{ url('uploads/' . $file->id . '/download') }}" class="btn btn-info btn-xs pull-right mailbox-attachment-download">
                     <i class="fa fa-cloud-download"></i>
diff --git a/resources/views/settings/settings/edit.blade.php b/resources/views/settings/settings/edit.blade.php
index 06c808faa..aa41e2fa9 100644
--- a/resources/views/settings/settings/edit.blade.php
+++ b/resources/views/settings/settings/edit.blade.php
@@ -249,7 +249,7 @@
             $.ajax({
                 url: '{{ url('uploads/' . $setting['company_logo']->id . '/show') }}',
                 type: 'GET',
-                data: {column_name: 'company_logo'},
+                data: {column_name: 'company_logo', page: 'setting', key: 'general.company_logo'},
                 dataType: 'JSON',
                 success: function(json) {
                     if (json['success']) {
@@ -285,7 +285,7 @@
                     $.ajax({
                         url: '{{ url('uploads/' . $setting['invoice_logo']->id . '/show') }}',
                         type: 'GET',
-                        data: {column_name: 'invoice_logo'},
+                        data: {column_name: 'invoice_logo', page: 'setting', key: 'general.invoice_logo'},
                         dataType: 'JSON',
                         success: function(json) {
                             if (json['success']) {