diff --git a/resources/lang/en-GB/modules.php b/resources/lang/en-GB/modules.php
index efcdd83dd..cd265a692 100644
--- a/resources/lang/en-GB/modules.php
+++ b/resources/lang/en-GB/modules.php
@@ -10,8 +10,6 @@ return [
     'free'                  => 'FREE',
     'install'               => 'Install',
     'buy_now'               => 'Buy Now',
-    'faq'                   => 'FAQ',
-    'changelog'             => 'Changelog',
     'token_link'            => '<a href="https://akaunting.com/tokens" target="_blank">Click here</a> to get your API token.',
 
     'installed'             => ':module installed',
@@ -20,6 +18,12 @@ return [
     'enabled'               => ':module enabled',
     'disabled'              => ':module disabled',
 
+    'tab' => [
+        'installation'      => 'Installation',
+        'faq'               => 'FAQ',
+        'changelog'         => 'Changelog',
+    ],
+
     'installation' => [
         'header'            => 'App Installation',
         'download'          => 'Downloading :module file.',
diff --git a/resources/views/modules/item/show.blade.php b/resources/views/modules/item/show.blade.php
index 81b7f6a92..f8ae78229 100644
--- a/resources/views/modules/item/show.blade.php
+++ b/resources/views/modules/item/show.blade.php
@@ -14,30 +14,42 @@
             <div class="nav-tabs-custom">
                 <ul class="nav nav-tabs">
                     <li class="active"><a href="#description" data-toggle="tab" aria-expanded="true">{{ trans('general.description') }}</a></li>
-                    <li class=""><a href="#faq" data-toggle="tab" aria-expanded="false">{{ trans('modules.faq') }}</a></li>
-                    <li class=""><a href="#changelog" data-toggle="tab" aria-expanded="false">{{ trans('modules.changelog') }}</a></li>
+                    @if ($module->installation)
+                    <li class=""><a href="#installation" data-toggle="tab" aria-expanded="false">{{ trans('modules.tab.installation') }}</a></li>
+                    @endif
+                    @if ($module->faq)
+                    <li class=""><a href="#faq" data-toggle="tab" aria-expanded="false">{{ trans('modules.tab.faq') }}</a></li>
+                    @endif
+                    @if ($module->changelog)
+                    <li class=""><a href="#changelog" data-toggle="tab" aria-expanded="false">{{ trans('modules.tab.changelog') }}</a></li>
+                    @endif
                 </ul>
                 <div class="tab-content">
                     <div class="tab-pane active" id="description">
                         {!! $module->description !!}
                     </div>
-                    <!-- /.tab-pane -->
+                    @if ($module->installation)
+                    <div class="tab-pane" id="installation">
+                        {!! $module->installation !!}
+                    </div>
+                    @endif
+                    @if ($module->faq)
                     <div class="tab-pane" id="faq">
                         {!! $module->faq !!}
                     </div>
-                    <!-- /.tab-pane -->
+                    @endif
+                    @if ($module->changelog)
                     <div class="tab-pane" id="changelog">
                         {!! $module->changelog !!}
                     </div>
-                    <!-- /.tab-pane -->
+                    @endif
                 </div>
-                <!-- /.tab-content -->
             </div>
         </div>
 
         <div class="col-md-4 no-padding-right">
             <div class="content-header no-padding-left">
-                <h3>Action</h3>
+                <h3>{{ trans_choice('general.actions', 1) }}</h3>
             </div>
 
             <div class="box box-success">
diff --git a/resources/views/partials/modules/item.blade.php b/resources/views/partials/modules/item.blade.php
index 5df51f800..476ea1b79 100644
--- a/resources/views/partials/modules/item.blade.php
+++ b/resources/views/partials/modules/item.blade.php
@@ -8,7 +8,12 @@
 
         <div class="box-body text-center">
             <a href="{{ url('apps/' . $module->slug) }}">
-                <img src="{{ $module->files[0]->path_string }}" alt="{{ $module->name }}" class="item-image">
+                @foreach ($module->files as $file)
+                    @if (($file->media_type != 'image') || ($file->pivot->zone != 'thumbnail'))
+                        @php continue; @endphp
+                    @endif
+                    <img src="{{ $file->path_string }}" alt="{{ $module->name }}" class="item-image">
+                @endforeach
             </a>
         </div>
         <!-- /.box-body -->