diff --git a/packages/demo/public/catalogues/catalogue-dktk.json b/packages/demo/public/catalogues/catalogue-dktk.json
index 62266d85..8d9313dc 100644
--- a/packages/demo/public/catalogues/catalogue-dktk.json
+++ b/packages/demo/public/catalogues/catalogue-dktk.json
@@ -24,6 +24,7 @@
                         "key": "other",
                         "name": "Sonstiges / Intersexuell",
                         "description": "Sonstiges / Intersexuell"
+
                     },
                     {
                         "key": "unknown",
diff --git a/packages/demo/src/styles/default/result-table.css b/packages/demo/src/styles/default/result-table.css
index d348bacb..511b713f 100644
--- a/packages/demo/src/styles/default/result-table.css
+++ b/packages/demo/src/styles/default/result-table.css
@@ -54,10 +54,20 @@ lens-result-table {
   }
   
   lens-result-table::part(table-pagination-button) {
-    border: solid 1px var(--gray);
+    border: solid 1px var(--blue);
     background: var(--white);
     border-radius: var(--border-radius-small);
     padding: var(--gap-xxs) var(--gap-s);
+    cursor: pointer;
+  }
+  
+  
+  lens-result-table::part(pagination-button-disabled) {
+    border: solid 1px var(--light-gray);
+    background: var(--white);
+    border-radius: var(--border-radius-small);
+    padding: var(--gap-xxs) var(--gap-s);
+    cursor: auto;
   }
   
   lens-result-table::part(info-button) {
diff --git a/packages/lib/src/components/results/ResultSummaryComponent.wc.svelte b/packages/lib/src/components/results/ResultSummaryComponent.wc.svelte
index 56b2cff6..f6116a8e 100644
--- a/packages/lib/src/components/results/ResultSummaryComponent.wc.svelte
+++ b/packages/lib/src/components/results/ResultSummaryComponent.wc.svelte
@@ -19,10 +19,18 @@ lens-info-button::part(info-button) {
     height: 100%;
     width: 38px;
     background-color: var(--white);
-    border: solid 1px var(--light-blue);
     border-radius: var(--border-radius-small);
+    border: 0;
 }
 
+lens-info-button::part(info-button):hover {background-color: #b8bfb8}
+
+lens-info-button::part(info-button):active {
+  background-color: #585958;
+  transform: translateX(1px);
+}
+
+
 lens-info-button::part(info-button-title) {
     font-family: var(--font-family);
 }
@@ -148,8 +156,9 @@ lens-info-button::part(info-button-dialogue) {
        <div class="info">
         <lens-info-button
         infoIconUrl="info-circle-svgrepo-com.svg"
-        noQueryMessage="Um eine Re-Identifizierung zu erschweren, werden Standortergebnisse modifiziert und auf Zehnerstellen gerundet. Meldet ein Standort keinen Treffer, wird für diesen null angezeigt."
-        showQuery={true}
+        message={[
+            `Um eine Re-Identifizierung zu erschweren, werden Standortergebnisse modifiziert und auf Zehnerstellen gerundet. Meldet ein Standort keinen Treffer, wird für diesen null angezeigt.`
+          ]}
         />
     </div>
     </div>
diff --git a/packages/lib/src/components/results/ResultTableComponent.wc.svelte b/packages/lib/src/components/results/ResultTableComponent.wc.svelte
index 0f7fe5ba..9af2751d 100644
--- a/packages/lib/src/components/results/ResultTableComponent.wc.svelte
+++ b/packages/lib/src/components/results/ResultTableComponent.wc.svelte
@@ -212,7 +212,8 @@
 <slot name="above-pagination"/>
 <div part="table-pagination">
     <button
-        part="table-pagination-button pagination-pagination-previous"
+        part="table-pagination-button pagination-pagination-previous 
+                {activePage === 1 ? 'pagination-button-disabled' : ''}"
         disabled={activePage === 1}
         on:click={() => {
             activePage = activePage - 1;
@@ -220,8 +221,9 @@
     >
     <div part="table-pagination-pagenumber">{activePage}</div>
     <button
-    part="table-pagination-button pagination-pagination-next"
-    disabled={activePage === Math.ceil(tableRowData.length / pageSize)}
+    part="table-pagination-button pagination-pagination-next
+            {activePage === Math.ceil(tableRowData.length / pageSize) || pageItems.length === 0 ? 'pagination-button-disabled' : ''}"
+    disabled={activePage === Math.ceil(tableRowData.length / pageSize)|| pageItems.length === 0}
     on:click={() => {
         activePage = activePage + 1;
     }}>&#8594;</button