diff --git a/phpgwapi/templates/default/nextmatchs_filter.tpl b/phpgwapi/templates/default/nextmatchs_filter.tpl
index 27f4145e27..cfdf4a2d2c 100644
--- a/phpgwapi/templates/default/nextmatchs_filter.tpl
+++ b/phpgwapi/templates/default/nextmatchs_filter.tpl
@@ -1 +1 @@
-<td width="14%">{select}<noscript><input type="submit" value="{lang_filter}"></noscript></td>
+<td>{select}<noscript><input type="submit" value="{lang_filter}"></noscript></td>
diff --git a/phpgwapi/templates/default/nextmatchs_search.tpl b/phpgwapi/templates/default/nextmatchs_search.tpl
index bff823df26..7053a84396 100644
--- a/phpgwapi/templates/default/nextmatchs_search.tpl
+++ b/phpgwapi/templates/default/nextmatchs_search.tpl
@@ -1,5 +1,3 @@
-  <td width="40%">
-   <div align="center">
+  <td>
     <input type="text" name="query" value="{query_value}">&nbsp;{searchby}<input type="submit" name="Search" value="{lang_search}">
-   </div>
   </td>
\ No newline at end of file
diff --git a/phpgwapi/templates/idsociety/nextmatchs_filter.tpl b/phpgwapi/templates/idsociety/nextmatchs_filter.tpl
index 27f4145e27..cfdf4a2d2c 100644
--- a/phpgwapi/templates/idsociety/nextmatchs_filter.tpl
+++ b/phpgwapi/templates/idsociety/nextmatchs_filter.tpl
@@ -1 +1 @@
-<td width="14%">{select}<noscript><input type="submit" value="{lang_filter}"></noscript></td>
+<td>{select}<noscript><input type="submit" value="{lang_filter}"></noscript></td>
diff --git a/phpgwapi/templates/idsociety/nextmatchs_search.tpl b/phpgwapi/templates/idsociety/nextmatchs_search.tpl
index bff823df26..7053a84396 100755
--- a/phpgwapi/templates/idsociety/nextmatchs_search.tpl
+++ b/phpgwapi/templates/idsociety/nextmatchs_search.tpl
@@ -1,5 +1,3 @@
-  <td width="40%">
-   <div align="center">
+  <td>
     <input type="text" name="query" value="{query_value}">&nbsp;{searchby}<input type="submit" name="Search" value="{lang_search}">
-   </div>
   </td>
\ No newline at end of file
diff --git a/phpgwapi/templates/justweb/nextmatchs_filter.tpl b/phpgwapi/templates/justweb/nextmatchs_filter.tpl
index 27f4145e27..cfdf4a2d2c 100644
--- a/phpgwapi/templates/justweb/nextmatchs_filter.tpl
+++ b/phpgwapi/templates/justweb/nextmatchs_filter.tpl
@@ -1 +1 @@
-<td width="14%">{select}<noscript><input type="submit" value="{lang_filter}"></noscript></td>
+<td>{select}<noscript><input type="submit" value="{lang_filter}"></noscript></td>
diff --git a/phpgwapi/templates/justweb/nextmatchs_link.tpl b/phpgwapi/templates/justweb/nextmatchs_link.tpl
index 8597bef494..939a964592 100644
--- a/phpgwapi/templates/justweb/nextmatchs_link.tpl
+++ b/phpgwapi/templates/justweb/nextmatchs_link.tpl
@@ -1 +1 @@
-    <td width="2%" align="{align}">{a_open}<img src="{img_src}" border="0" width="12" height="12" alt="{label}">{a_close}</td>
+   <td width="2%" align="{align}"><img src="{img}" border="0" width="12" height="12" alt="{label}"></td>
diff --git a/phpgwapi/templates/justweb/nextmatchs_search.tpl b/phpgwapi/templates/justweb/nextmatchs_search.tpl
index bff823df26..7053a84396 100644
--- a/phpgwapi/templates/justweb/nextmatchs_search.tpl
+++ b/phpgwapi/templates/justweb/nextmatchs_search.tpl
@@ -1,5 +1,3 @@
-  <td width="40%">
-   <div align="center">
+  <td>
     <input type="text" name="query" value="{query_value}">&nbsp;{searchby}<input type="submit" name="Search" value="{lang_search}">
-   </div>
   </td>
\ No newline at end of file
diff --git a/phpgwapi/templates/verdilak/nextmatchs_filter.tpl b/phpgwapi/templates/verdilak/nextmatchs_filter.tpl
index 27f4145e27..cfdf4a2d2c 100644
--- a/phpgwapi/templates/verdilak/nextmatchs_filter.tpl
+++ b/phpgwapi/templates/verdilak/nextmatchs_filter.tpl
@@ -1 +1 @@
-<td width="14%">{select}<noscript><input type="submit" value="{lang_filter}"></noscript></td>
+<td>{select}<noscript><input type="submit" value="{lang_filter}"></noscript></td>
diff --git a/phpgwapi/templates/verdilak/nextmatchs_link.tpl b/phpgwapi/templates/verdilak/nextmatchs_link.tpl
index 8597bef494..939a964592 100644
--- a/phpgwapi/templates/verdilak/nextmatchs_link.tpl
+++ b/phpgwapi/templates/verdilak/nextmatchs_link.tpl
@@ -1 +1 @@
-    <td width="2%" align="{align}">{a_open}<img src="{img_src}" border="0" width="12" height="12" alt="{label}">{a_close}</td>
+   <td width="2%" align="{align}"><img src="{img}" border="0" width="12" height="12" alt="{label}"></td>
diff --git a/phpgwapi/templates/verdilak/nextmatchs_search.tpl b/phpgwapi/templates/verdilak/nextmatchs_search.tpl
index bff823df26..7053a84396 100644
--- a/phpgwapi/templates/verdilak/nextmatchs_search.tpl
+++ b/phpgwapi/templates/verdilak/nextmatchs_search.tpl
@@ -1,5 +1,3 @@
-  <td width="40%">
-   <div align="center">
+  <td>
     <input type="text" name="query" value="{query_value}">&nbsp;{searchby}<input type="submit" name="Search" value="{lang_search}">
-   </div>
   </td>
\ No newline at end of file