diff --git a/addons/default/visiosoft/advs-module/resources/css/list.css b/addons/default/visiosoft/advs-module/resources/css/list.css
index 8d2a263b3..18f2e8896 100644
--- a/addons/default/visiosoft/advs-module/resources/css/list.css
+++ b/addons/default/visiosoft/advs-module/resources/css/list.css
@@ -135,11 +135,11 @@ a.sort-by-open-dropdown:hover {
     color: #8598AA;
 }
 
-.list-view-type a:hover {
-    color: #8598AA !important;
+.list-view-type button:focus {
+    outline: none;
 }
 
-.list-view-type a small {
+.list-view-type button small {
     font-weight: 500;
     color: #8598AA;
 }
\ No newline at end of file
diff --git a/addons/default/visiosoft/advs-module/resources/js/list.js b/addons/default/visiosoft/advs-module/resources/js/list.js
index f02f22799..ecf5f4b07 100644
--- a/addons/default/visiosoft/advs-module/resources/js/list.js
+++ b/addons/default/visiosoft/advs-module/resources/js/list.js
@@ -173,4 +173,9 @@ $("#listFilterForm").submit(function(e) {
             }
         }
     });
-});
\ No newline at end of file
+});
+
+// Change view type
+function changeViewType(viewLink) {
+    window.location.href = viewLink
+}
\ No newline at end of file
diff --git a/addons/default/visiosoft/advs-module/resources/views/list/partials/display-mode.twig b/addons/default/visiosoft/advs-module/resources/views/list/partials/display-mode.twig
index e50d02321..3b2e9c73e 100644
--- a/addons/default/visiosoft/advs-module/resources/views/list/partials/display-mode.twig
+++ b/addons/default/visiosoft/advs-module/resources/views/list/partials/display-mode.twig
@@ -1,32 +1,34 @@
 <div class="row text-center list-view-type justify-content-center">
-    <div class="col-3">
+    <div class="col-4 col-md-3">
         {% if setting_value('visiosoft.module.location::list_page_location') %}
-            <a href="{{ url_route('visiosoft.module.advs::view_type',['map']) }}"
-               class="text-dark d-flex align-items-center justify-content-center">
+            <button onclick="changeViewType('{{ url_route('visiosoft.module.advs::view_type', ['map']) }}')"
+               class="mx-auto border-0 text-dark d-flex align-items-center justify-content-center">
                 <img src="{{ img('visiosoft.module.advs::images/map-icon.svg').url }}" alt="map icon" class="mr-1">
                 <small>{{ trans("visiosoft.module.advs::field.show_display_mode.map") }}</small>
-            </a>
+            </button>
         {% endif %}
     </div>
-    <div class="col-3">
-        <a href="{{ url_route('visiosoft.module.advs::view_type',['list']) }}"
-           class="text-dark d-flex align-items-center justify-content-center">
+    <div class="col-4 col-md-3">
+        <button onclick="changeViewType('{{ url_route('visiosoft.module.advs::view_type', ['list']) }}')"
+           class="mx-auto border-0 text-dark d-flex align-items-center justify-content-center">
             <img src="{{ img('visiosoft.module.advs::images/list-icon.svg').url }}" alt="list icon" class="mr-1">
             <small>{{ trans('visiosoft.module.advs::field.show_list_view.name') }}</small>
-        </a>
+        </button>
     </div>
     <div class="col-3 list-table-view d-none d-md-block">
-        <a href="{{ url_route('visiosoft.module.advs::view_type',['table']) }}"
-           class="text-dark d-flex align-items-center justify-content-center">
+        <button onclick="changeViewType('{{ url_route('visiosoft.module.advs::view_type', ['table']) }}')"
+           class="border-0 text-dark d-flex align-items-center justify-content-center">
             <img src="{{ img('visiosoft.module.advs::images/table-icon.svg').url }}" alt="table icon" class="mr-1">
             <small>{{ trans('visiosoft.module.advs::field.show_table_view.name') }}</small>
-        </a>
+        </button>
     </div>
-    <div class="col-3 pr-0">
-        <a href="{{ url_route('visiosoft.module.advs::view_type',['gallery']) }}"
-           class="text-dark d-flex align-items-center justify-content-center">
+    <div class="col-4 col-md-3 pr-0">
+        <button onclick="changeViewType('{{ url_route('visiosoft.module.advs::view_type', ['gallery']) }}')"
+           class="mx-auto border-0 text-dark d-flex align-items-center justify-content-center">
             <img src="{{ img('visiosoft.module.advs::images/gallery-icon.svg').url }}" alt="gallery icon" class="mr-1">
             <small> {{ trans('visiosoft.module.advs::field.gallery') }}</small>
-        </a>
+        </button>
     </div>
-</div>
\ No newline at end of file
+</div>
+
+{{ asset_add('scripts.js', 'visiosoft.module.advs::js/list.js') }}
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/css/base.css b/addons/default/visiosoft/base-theme/resources/css/base.css
index 37ff534e9..3e9bebe6a 100644
--- a/addons/default/visiosoft/base-theme/resources/css/base.css
+++ b/addons/default/visiosoft/base-theme/resources/css/base.css
@@ -1,3 +1,8 @@
+.link-unstyled, .link-unstyled:link, .link-unstyled:hover {
+    color: inherit;
+    text-decoration: inherit;
+}
+
 .left-categories-section .categories-list,
 .left-categories-section .categories-list li ul {
     list-style: none;