diff --git a/resources/lang/en-GB/modules.php b/resources/lang/en-GB/modules.php
index b3b2a5ccd..12c1115e6 100644
--- a/resources/lang/en-GB/modules.php
+++ b/resources/lang/en-GB/modules.php
@@ -46,8 +46,10 @@ return [
     'install_cloud'         => 'Use on Cloud Service',
     'get_cloud'             => 'Get Cloud Service',
     'get_premium_cloud'     => 'Get Premium Cloud',
-    'only_works_cloud'      => 'This app only works on <strong>Cloud Service</strong>.',
-    'only_premium_plan'     => 'This app only works on <strong>Cloud Premium Service</strong>.',
+    'switch_to_cloud'       => 'Switch to Cloud',
+    'hosted_on_akaunting'   => 'Hosted on akaunting.com',
+    'only_works_cloud'      => 'This app is available only on <strong>Cloud</strong>.',
+    'only_premium_plan'     => 'This app is available only on <strong>Premium Cloud</strong>.',
 
     'about'                 => 'About',
 
diff --git a/resources/views/components/layouts/modules/show/buttons.blade.php b/resources/views/components/layouts/modules/show/buttons.blade.php
index 0a2ebd180..48a685c00 100644
--- a/resources/views/components/layouts/modules/show/buttons.blade.php
+++ b/resources/views/components/layouts/modules/show/buttons.blade.php
@@ -1,14 +1,16 @@
 @props(['module', 'installed', 'enable'])
 
 @if (! empty($module->plan))
-    <x-link
-        href="{{ $module->action_url }}"
-        target="_blank"
-        class="bg-green hover:bg-green-700 rounded-md text-white text-sm text-center w-full py-2 truncate"
-        override="class"
-    >
-        {{ trans('modules.get_premium_cloud') }}
-    </x-link>
+    <x-tooltip message="{{ trans('modules.hosted_on_akaunting') }}" placement="top">
+        <x-link
+            href="{{ $module->action_url }}"
+            target="_blank"
+            class="bg-green hover:bg-green-700 rounded-md text-white text-sm text-center w-full py-2 truncate"
+            override="class"
+        >
+            {{ trans('modules.switch_to_cloud') }}
+        </x-link>
+    </x-tooltip>
 @elseif (in_array('onprime', $module->where_to_use))
     @if ($installed)
         @can('delete-modules-item')
@@ -81,22 +83,26 @@
     @endif
 @else
     @if ($module->install)
-        <x-link
-            href="{{ $module->action_url }}"
-            target="_blank"
-            class="bg-green hover:bg-green-700 rounded-md text-white text-sm text-center w-full py-2 truncate"
-            override="class"
-        >
-            {{ trans('modules.install_cloud') }}
-        </x-link>
+        <x-tooltip message="{{ trans('modules.hosted_on_akaunting') }}" placement="top">
+            <x-link
+                href="{{ $module->action_url }}"
+                target="_blank"
+                class="bg-green hover:bg-green-700 rounded-md text-white text-sm text-center w-full py-2 truncate"
+                override="class"
+            >
+                {{ trans('modules.switch_to_cloud') }}
+            </x-link>
+        </x-tooltip>
     @else
-        <x-link
-            href="{{ $module->action_url }}"
-            target="_blank"
-            class="bg-green hover:bg-green-700 rounded-md text-white text-sm text-center w-full py-2 truncate"
-            override="class"
-        >
-            {{ trans('modules.get_cloud') }}
-        </x-link>
+        <x-tooltip message="{{ trans('modules.hosted_on_akaunting') }}" placement="top">
+            <x-link
+                href="{{ $module->action_url }}"
+                target="_blank"
+                class="bg-green hover:bg-green-700 rounded-md text-white text-sm text-center w-full py-2 truncate"
+                override="class"
+            >
+                {{ trans('modules.switch_to_cloud') }}
+            </x-link>
+        </x-tooltip>
     @endif
 @endif
diff --git a/resources/views/modules/item/show.blade.php b/resources/views/modules/item/show.blade.php
index cb697d9ed..099cafc5f 100644
--- a/resources/views/modules/item/show.blade.php
+++ b/resources/views/modules/item/show.blade.php
@@ -45,6 +45,9 @@
                                     <a href="{{ route('apps.categories.show', $module_category->slug) }}" class="text-sm">
                                         {{ $module_category->name }}
                                     </a>
+                                    @if (! $loop->last)
+                                    ,
+                                    @endif
                                 @endforeach
                             </span>
                         </div>
@@ -94,21 +97,33 @@
                             </div>
                         </div>
 
-                        <div class="text-sm truncate line-clamp-1">
-                            {!! $module->description !!}
-                        </div>
-
-                        <div class="relative flex flex-col lg:flex-row space-x-4 justify-between">
-                            <x-layouts.modules.show.price :module="$module" />
-
-                            <div class="flex w-1/2 lg:justify-center">
-                                @if ($module->price != '0.0000')
-                                    <x-layouts.modules.show.toggle />
-                                @endif
+                        @if (! in_array('onprime', $module->where_to_use))
+                            @if (! empty($module->cloud_information))
+                                {!! $module->cloud_information !!}
+                            @else
+                                <div class="text-center text-sm mt-3 mb--2 bg-red-100 rounded-lg p-2 cursor-default">
+                                    <span class="text-sm text-red-700">
+                                        {!! trans('modules.only_works_cloud') !!}
+                                    </span>
+                                </div>
+                            @endif
+                        @else
+                            <div class="text-sm truncate line-clamp-1">
+                                {!! $module->description !!}
                             </div>
-                        </div>
 
-                        <x-layouts.modules.show.information :module="$module" />
+                            <div class="relative flex flex-col lg:flex-row space-x-4 justify-between">
+                                <x-layouts.modules.show.price :module="$module" />
+
+                                <div class="flex w-1/2 lg:justify-center">
+                                    @if ($module->price != '0.0000')
+                                        <x-layouts.modules.show.toggle />
+                                    @endif
+                                </div>
+                            </div>
+
+                            <x-layouts.modules.show.information :module="$module" />
+                        @endif
                     </div>
 
                     <div class="flex justify-around mt-5">