diff --git a/projects/srm/src/app/branch-container/branch-container.component.less b/projects/srm/src/app/branch-container/branch-container.component.less
index 882fa69b..754dc3f4 100644
--- a/projects/srm/src/app/branch-container/branch-container.component.less
+++ b/projects/srm/src/app/branch-container/branch-container.component.less
@@ -89,8 +89,7 @@
             border: 1px solid @color-gray-5;
             box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.1);
             border-radius: 24px;
-            .button-image;
-            .background-image;
+            .button-image(none);
             background-size: 24px;
             display: flex;
             flex-flow: column;
diff --git a/projects/srm/src/app/branch-header/branch-header.component.less b/projects/srm/src/app/branch-header/branch-header.component.less
index 9193f834..8a95cdca 100644
--- a/projects/srm/src/app/branch-header/branch-header.component.less
+++ b/projects/srm/src/app/branch-header/branch-header.component.less
@@ -18,8 +18,7 @@
     padding-bottom: 8px;
 
     .control-icon {
-        .button-image;
-        .background-image;
+        .button-image(none);
         background-image: url(../../assets/img/icon-close.svg);
         width: 12px;
         height: 12px;
@@ -33,8 +32,7 @@
         }
     }
     .back-icon {
-        .button-image;
-        .background-image;
+        .button-image(none);
         background-image: url(../../assets/img/icon-arrow-right-gray-3.svg);
         background-size: 24px;
         background-position: center right 12px;
diff --git a/projects/srm/src/app/card-container/card-container.component.less b/projects/srm/src/app/card-container/card-container.component.less
index b0cb6fba..8a8ab5a9 100644
--- a/projects/srm/src/app/card-container/card-container.component.less
+++ b/projects/srm/src/app/card-container/card-container.component.less
@@ -86,8 +86,7 @@
                 border: 1px solid @color-gray-5;
                 box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.1);
                 border-radius: 24px;
-                .button-image;
-                .background-image;
+                .button-image(none);
                 background-size: 24px;
                 display: flex;
                 flex-flow: column;
diff --git a/projects/srm/src/app/click-on-return.directive.ts b/projects/srm/src/app/click-on-return.directive.ts
index e93733ed..49043739 100644
--- a/projects/srm/src/app/click-on-return.directive.ts
+++ b/projects/srm/src/app/click-on-return.directive.ts
@@ -17,6 +17,7 @@ export class ClickOnReturnDirective implements AfterViewInit{
       }
     });
     el.addEventListener('click', (event: MouseEvent) => {
+      event.stopPropagation();
       this.activated.emit(event);
     });
     el.setAttribute('tabindex', '0');
diff --git a/projects/srm/src/app/image-button/image-button.component.less b/projects/srm/src/app/image-button/image-button.component.less
index 0ba24c64..8f0d6705 100644
--- a/projects/srm/src/app/image-button/image-button.component.less
+++ b/projects/srm/src/app/image-button/image-button.component.less
@@ -6,8 +6,7 @@
     height: 100%;
 
     button {
-        .button-image;
-        .background-image;    
+        .button-image(none);
         width: 100%;
         height: 100%;
         display: block;
diff --git a/projects/srm/src/app/menu-icon/menu-icon.component.less b/projects/srm/src/app/menu-icon/menu-icon.component.less
index 035d60d1..9dd0dadb 100644
--- a/projects/srm/src/app/menu-icon/menu-icon.component.less
+++ b/projects/srm/src/app/menu-icon/menu-icon.component.less
@@ -6,8 +6,7 @@
     display: flex;
 
     .menu-icon {
-        .button-image;
-        .background-image;
+        .button-image(none);
         width: 24px;
         height: 24px;
         background-image: url(../../assets/img/icon-hamburger-gray-3.svg);
diff --git a/projects/srm/src/app/search-filters/search-filters.component.html b/projects/srm/src/app/search-filters/search-filters.component.html
index 349206cd..864401f5 100644
--- a/projects/srm/src/app/search-filters/search-filters.component.html
+++ b/projects/srm/src/app/search-filters/search-filters.component.html
@@ -11,27 +11,35 @@
     </div>
 </ng-container>
 <ng-container *ngIf='active'>
-    <div class='situations'>
-        <div class='section' *ngIf='responseItems && responseItems.length'>
-            <div class='section-header'>
-                <!-- <div class='title' *ngIf='!searchParams.response'>סוגי שירות:</div>
-                <div class='title' *ngIf='!!searchParams.response'>סוגי שירות נוספים:</div> -->
-                <div class='title'>סוגי שירות:</div>
-                <a class='clear' (activated)='currentSearchParams.filter_responses = []; pushSearchParams()' clickOnReturn role='button' tabindex="0" aria-label="ניקוי המסננים לסוגי השירותים">ניקוי</a>
-            </div>
-            <app-response-selection-widget [responses]='responseItems' [selectedResponses]='this.currentSearchParams?.filter_responses || []' (toggle)='toggleResponse($event)'></app-response-selection-widget>
+    <div class='filtering-header layout-desktop'>
+        <button class='back' (activated)='clear()' aria-label='סגירת הסינון וחזרה לרשימת התוצאות' clickOnReturn></button>
+        <div class='geo-filter'>
+
         </div>
-        <app-search-filters-situation-section title='קהלי יעד' [situations]='audiences' [searchParams]='currentSearchParams' [field]='"filter_situations"' (push)='pushSearchParams()'></app-search-filters-situation-section>
-        <app-search-filters-situation-section title='מצבים רפואיים ומוגבלויות' [situations]='health_issues' [searchParams]='currentSearchParams' [field]='"filter_health"' (push)='pushSearchParams()'></app-search-filters-situation-section>
-        <app-search-filters-situation-section title='מוכרות ממשלתית' [situations]='others.benefit_holders' [searchParams]='currentSearchParams' [field]='"filter_benefit_holders"' (push)='pushSearchParams()'></app-search-filters-situation-section>
-        <app-search-filters-situation-section title='מצב תעסוקתי' [situations]='others.employment' [searchParams]='currentSearchParams' [field]='"filter_employment"' (push)='pushSearchParams()'></app-search-filters-situation-section>
-        <app-search-filters-situation-section title='אירועי חיים' [situations]='others.life_events' [searchParams]='currentSearchParams' [field]='"filter_life_events"' (push)='pushSearchParams()'></app-search-filters-situation-section>
-        <app-search-filters-situation-section title='דחיפות' [situations]='others.urgency' [searchParams]='currentSearchParams' [field]='"filter_urgency"' (push)='pushSearchParams()'></app-search-filters-situation-section>
-        <app-search-filters-situation-section title='קהילה' [situations]='others.community' [searchParams]='currentSearchParams' [field]='"filter_community"' (push)='pushSearchParams()'></app-search-filters-situation-section>
-        <app-search-filters-situation-section title='תפקיד' [situations]='others.role' [searchParams]='currentSearchParams' [field]='"filter_role"' (push)='pushSearchParams()'></app-search-filters-situation-section>
-        <app-search-filters-situation-section title='קבוצות גיל' [situations]='age_groups' [searchParams]='currentSearchParams' [field]='"filter_age_groups"' (push)='pushSearchParams()'></app-search-filters-situation-section>
-        <app-search-filters-situation-section title='מיועד עבור' [situations]='others.gender' [searchParams]='currentSearchParams' [field]='"filter_gender"' (push)='pushSearchParams()'></app-search-filters-situation-section>
-        <app-search-filters-situation-section title='לדוברי שפות (שאינן עברית)' [situations]='languages' [searchParams]='currentSearchParams' [field]='"filter_languages"' (push)='pushSearchParams()'></app-search-filters-situation-section>
+    </div>
+    <div class='situations-container'>
+        <div class='situations'>
+            <div class='section' *ngIf='responseItems && responseItems.length'>
+                <div class='section-header'>
+                    <!-- <div class='title' *ngIf='!searchParams.response'>סוגי שירות:</div>
+                    <div class='title' *ngIf='!!searchParams.response'>סוגי שירות נוספים:</div> -->
+                    <div class='title'>סוגי שירות:</div>
+                    <a class='clear' (activated)='currentSearchParams.filter_responses = []; pushSearchParams()' clickOnReturn role='button' tabindex="0" aria-label="ניקוי המסננים לסוגי השירותים">ניקוי</a>
+                </div>
+                <app-response-selection-widget [responses]='responseItems' [selectedResponses]='this.currentSearchParams?.filter_responses || []' (toggle)='toggleResponse($event)'></app-response-selection-widget>
+            </div>
+            <app-search-filters-situation-section title='קהלי יעד' [situations]='audiences' [searchParams]='currentSearchParams' [field]='"filter_situations"' (push)='pushSearchParams()'></app-search-filters-situation-section>
+            <app-search-filters-situation-section title='מצבים רפואיים ומוגבלויות' [situations]='health_issues' [searchParams]='currentSearchParams' [field]='"filter_health"' (push)='pushSearchParams()'></app-search-filters-situation-section>
+            <app-search-filters-situation-section title='מוכרות ממשלתית' [situations]='others.benefit_holders' [searchParams]='currentSearchParams' [field]='"filter_benefit_holders"' (push)='pushSearchParams()'></app-search-filters-situation-section>
+            <app-search-filters-situation-section title='מצב תעסוקתי' [situations]='others.employment' [searchParams]='currentSearchParams' [field]='"filter_employment"' (push)='pushSearchParams()'></app-search-filters-situation-section>
+            <app-search-filters-situation-section title='אירועי חיים' [situations]='others.life_events' [searchParams]='currentSearchParams' [field]='"filter_life_events"' (push)='pushSearchParams()'></app-search-filters-situation-section>
+            <app-search-filters-situation-section title='דחיפות' [situations]='others.urgency' [searchParams]='currentSearchParams' [field]='"filter_urgency"' (push)='pushSearchParams()'></app-search-filters-situation-section>
+            <app-search-filters-situation-section title='קהילה' [situations]='others.community' [searchParams]='currentSearchParams' [field]='"filter_community"' (push)='pushSearchParams()'></app-search-filters-situation-section>
+            <app-search-filters-situation-section title='תפקיד' [situations]='others.role' [searchParams]='currentSearchParams' [field]='"filter_role"' (push)='pushSearchParams()'></app-search-filters-situation-section>
+            <app-search-filters-situation-section title='קבוצות גיל' [situations]='age_groups' [searchParams]='currentSearchParams' [field]='"filter_age_groups"' (push)='pushSearchParams()'></app-search-filters-situation-section>
+            <app-search-filters-situation-section title='מיועד עבור' [situations]='others.gender' [searchParams]='currentSearchParams' [field]='"filter_gender"' (push)='pushSearchParams()'></app-search-filters-situation-section>
+            <app-search-filters-situation-section title='לדוברי שפות (שאינן עברית)' [situations]='languages' [searchParams]='currentSearchParams' [field]='"filter_languages"' (push)='pushSearchParams()'></app-search-filters-situation-section>
+        </div>    
     </div>
     <div class='submit'>
         <div class='inner'>
@@ -43,8 +51,8 @@
                 </span>
                 <span *ngIf='resultCountBounded > 0 && resultCountBounded !== resultCount' class='bounded'>
                     &nbsp;
-                    <span *ngIf='resultCountBounded > 1'>({{resultCountBounded.toLocaleString()}} תוצאות באיזור המפה)</span>
-                    <span *ngIf='resultCountBounded === 1'>(תוצאה אחת באיזור המפה)</span>
+                    <span *ngIf='resultCountBounded > 1'>({{resultCountBounded.toLocaleString()}} באיזור המפה)</span>
+                    <span *ngIf='resultCountBounded === 1'>(אחת באיזור המפה)</span>
                 </span>
                 <div class='count' *ngIf='totalFilters'>{{totalFilters}}</div>
             </button>
diff --git a/projects/srm/src/app/search-filters/search-filters.component.less b/projects/srm/src/app/search-filters/search-filters.component.less
index 2184170f..4f8971db 100644
--- a/projects/srm/src/app/search-filters/search-filters.component.less
+++ b/projects/srm/src/app/search-filters/search-filters.component.less
@@ -30,47 +30,74 @@
         flex-flow: column;
         align-items: center;
 
-        .desktop({
-            padding: 16px 56px;
-            padding-bottom: 48px;
-        });
-        .mobile({
-            padding: 16px 16px;
-            padding-bottom: 48px;
-        });
-
-        .situations {
+        .filtering-header {
             width: 100%;
-            .section {
-                padding: 0;
-    
-                .section-header {
-                    display: flex;
-                    flex-flow: row; 
-                    align-items: center;
-                    justify-content: space-between;
-                    .title {
-                        .font-rag-sans;
-                        font-weight: 600;
-                        font-size: 16px;
-                        line-height: 21px;
-                        color: @color-gray-1;
-                        padding: 0 8px;
-                    }
-                    .clear {
-                        .font-rag-sans;
-                        font-weight: 400;
-                        font-size: 13px;
-                        line-height: 17px;
-                        color: @color-gray-3;
-                        cursor: pointer;
-                        margin: 0 8px;
+            display: flex;
+            flex-flow: row;
+            gap: 8px;
+            align-items: center;
+            border-bottom: 1px solid @color-blue-7;
+            background: @color-white;
+            .desktop({
+                height: 56px;
+                padding: 0 8px;
+                .back {
+                    .button-image(@color-blue-8);
+                    width: 40px;
+                    height: 40px;
+                    background-image: url('../../assets/img/icon-back-blue-1.svg');
+                    background-size: 30px;
+                    border-radius: 24px;
+                    border: 1px solid @color-blue-6;
+                }
+            });
+        }
+        .situations-container {
+            width: 100%;
+            display: flex;
+            flex-flow: column;
+            align-items: center;
+            .desktop({
+                padding: 16px 56px;
+                padding-bottom: 48px;
+            });
+            .mobile({
+                padding: 16px 16px;
+                padding-bottom: 48px;
+            });    
+            .situations {
+                width: 100%;
+                .section {
+                    padding: 0;
+        
+                    .section-header {
+                        display: flex;
+                        flex-flow: row; 
+                        align-items: center;
+                        justify-content: space-between;
+                        .title {
+                            .font-rag-sans;
+                            font-weight: 600;
+                            font-size: 16px;
+                            line-height: 21px;
+                            color: @color-gray-1;
+                            padding: 0 8px;
+                        }
+                        .clear {
+                            .font-rag-sans;
+                            font-weight: 400;
+                            font-size: 13px;
+                            line-height: 17px;
+                            color: @color-gray-3;
+                            cursor: pointer;
+                            margin: 0 8px;
+                        }
                     }
+                    padding-bottom: 16px;
+                    margin-bottom: 16px;
+                    border-bottom: 1px solid @color-gray-6;
                 }
-                padding-bottom: 16px;
-                margin-bottom: 16px;
-                border-bottom: 1px solid @color-gray-6;
-            }
+            }    
         }
 
         .submit {
diff --git a/projects/srm/src/app/search/search.less b/projects/srm/src/app/search/search.less
index e7701f15..69736f12 100644
--- a/projects/srm/src/app/search/search.less
+++ b/projects/srm/src/app/search/search.less
@@ -1,8 +1,7 @@
 @import url(../../common.less);
 
 .search-icon {
-    .button-image;
-    .background-image;
+    .button-image(none);
     flex: 0 0 auto;
     width: 32px;
     height: 32px;
diff --git a/projects/srm/src/app/searchbox-header/searchbox-header.component.less b/projects/srm/src/app/searchbox-header/searchbox-header.component.less
index 8cf317db..82e5ec0e 100644
--- a/projects/srm/src/app/searchbox-header/searchbox-header.component.less
+++ b/projects/srm/src/app/searchbox-header/searchbox-header.component.less
@@ -139,8 +139,7 @@
         }
 
         .search-icon {
-            .button-image;
-            .background-image;
+            .button-image(none);
             width: 24px;
             height: 24px;
             flex: 0 0 auto;
diff --git a/projects/srm/src/assets/img/icon-back-blue-1.svg b/projects/srm/src/assets/img/icon-back-blue-1.svg
new file mode 100644
index 00000000..5061d0d4
--- /dev/null
+++ b/projects/srm/src/assets/img/icon-back-blue-1.svg
@@ -0,0 +1,7 @@
+<svg width="31" height="30" viewBox="0 0 31 30" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="mi:arrow-right">
+<g id="Group">
+<path id="Vector" d="M16.0303 6.61598C16.2647 6.38164 16.5826 6.25 16.9141 6.25C17.2455 6.25 17.5634 6.38164 17.7978 6.61598L25.2978 14.116C25.5322 14.3504 25.6638 14.6683 25.6638 14.9997C25.6638 15.3312 25.5322 15.6491 25.2978 15.8835L17.7978 23.3835C17.5621 23.6112 17.2463 23.7372 16.9186 23.7343C16.5908 23.7315 16.2773 23.6 16.0455 23.3683C15.8138 23.1365 15.6823 22.823 15.6795 22.4952C15.6766 22.1675 15.8026 21.8517 16.0303 21.616L21.3966 16.2497H6.91406C6.58254 16.2497 6.2646 16.118 6.03018 15.8836C5.79576 15.6492 5.66406 15.3313 5.66406 14.9997C5.66406 14.6682 5.79576 14.3503 6.03018 14.1159C6.2646 13.8814 6.58254 13.7497 6.91406 13.7497H21.3966L16.0303 8.38348C15.796 8.14907 15.6643 7.83119 15.6643 7.49973C15.6643 7.16828 15.796 6.85039 16.0303 6.61598Z" fill="#1F37F6"/>
+</g>
+</g>
+</svg>
diff --git a/projects/srm/src/common.less b/projects/srm/src/common.less
index 894108b8..75e0c27e 100644
--- a/projects/srm/src/common.less
+++ b/projects/srm/src/common.less
@@ -70,12 +70,13 @@
     background-size: contain;
 }
 
-.button-image {
+.button-image(@color) {
     border: none;
-    background: none;
     margin: 0;
     padding: 0;
     cursor: pointer;
+    background: @color;
+    .background-image;
 }
 
 .tags-container {