diff --git a/frontend/src/components/layout/sidebar.rs b/frontend/src/components/layout/sidebar.rs
index 4e70d92..daee297 100644
--- a/frontend/src/components/layout/sidebar.rs
+++ b/frontend/src/components/layout/sidebar.rs
@@ -146,48 +146,50 @@ pub fn Sidebar() -> impl IntoView {
             </SidenavGroup>
         </SidenavContent>
 
-        <SidenavFooter class="p-4 space-y-4">
-            // Push Notification Toggle
-            <div class="flex items-center justify-between px-2 py-1 bg-muted/20 rounded-md border border-border/50">
-                <div class="flex flex-col gap-0.5">
-                    <span class="text-[10px] font-bold uppercase tracking-wider text-foreground/70">"Bildirimler"</span>
-                    <span class="text-[9px] text-muted-foreground">"Web Push"</span>
+        <SidenavFooter>
+            <div class="flex flex-col gap-4 p-4">
+                // Push Notification Toggle
+                <div class="flex items-center justify-between px-2 py-1 bg-muted/20 rounded-md border border-border/50">
+                    <div class="flex flex-col gap-0.5">
+                        <span class="text-[10px] font-bold uppercase tracking-wider text-foreground/70">"Bildirimler"</span>
+                        <span class="text-[9px] text-muted-foreground">"Web Push"</span>
+                    </div>
+                    <Switch 
+                        checked=Signal::from(store.push_enabled) 
+                        on_checked_change=Callback::new(on_push_toggle)
+                    />
                 </div>
-                <Switch 
-                    checked=store.push_enabled.into() 
-                    on_checked_change=Callback::new(on_push_toggle)
-                />
-            </div>
 
-            <div class="flex items-center gap-3 p-2 rounded-lg border bg-muted/30 shadow-xs overflow-hidden">
-                <div class="h-8 w-8 rounded-full bg-primary text-primary-foreground flex items-center justify-center text-xs font-medium shrink-0 border border-primary-foreground/10">
-                    {first_letter}
-                </div>
-                <div class="flex-1 overflow-hidden">
-                    <div class="font-medium text-[11px] truncate text-foreground leading-tight">{username}</div>
-                    <div class="text-[9px] text-muted-foreground truncate opacity-70">"Yönetici"</div>
-                </div>
-                
-                <div class="flex items-center gap-1">
-                    <ThemeToggle />
+                <div class="flex items-center gap-3 p-2 rounded-lg border bg-muted/30 shadow-xs overflow-hidden">
+                    <div class="h-8 w-8 rounded-full bg-primary text-primary-foreground flex items-center justify-center text-xs font-medium shrink-0 border border-primary-foreground/10">
+                        {first_letter}
+                    </div>
+                    <div class="flex-1 overflow-hidden">
+                        <div class="font-medium text-[11px] truncate text-foreground leading-tight">{username}</div>
+                        <div class="text-[9px] text-muted-foreground truncate opacity-70">"Yönetici"</div>
+                    </div>
                     
-                    <Button
-                        variant=ButtonVariant::Ghost
-                        size=ButtonSize::Icon
-                        class="size-7 text-destructive hover:bg-destructive/10"
-                        on:click=move |_| {
-                            spawn_local(async move {
-                                if shared::server_fns::auth::logout().await.is_ok() {
-                                    let window = web_sys::window().expect("window should exist");
-                                    let _ = window.location().set_href("/login");
-                                }
-                            });
-                        }
-                    >
-                        <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-4">
-                            <path stroke-linecap="round" stroke-linejoin="round" d="M15.75 9V5.25A2.25 2.25 0 0013.5 3h-6a2.25 2.25 0 00-2.25 2.25v13.5A2.25 2.25 0 007.5 21h6a2.25 2.25 0 002.25-2.25V15M12 9l-3 3m0 0l3 3m-3-3h12.75" />
-                        </svg>
-                    </Button>
+                    <div class="flex items-center gap-1">
+                        <ThemeToggle />
+                        
+                        <Button
+                            variant=ButtonVariant::Ghost
+                            size=ButtonSize::Icon
+                            class="size-7 text-destructive hover:bg-destructive/10"
+                            on:click=move |_| {
+                                spawn_local(async move {
+                                    if shared::server_fns::auth::logout().await.is_ok() {
+                                        let window = web_sys::window().expect("window should exist");
+                                        let _ = window.location().set_href("/login");
+                                    }
+                                });
+                            }
+                        >
+                            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-4">
+                                <path stroke-linecap="round" stroke-linejoin="round" d="M15.75 9V5.25A2.25 2.25 0 0013.5 3h-6a2.25 2.25 0 00-2.25 2.25v13.5A2.25 2.25 0 007.5 21h6a2.25 2.25 0 002.25-2.25V15M12 9l-3 3m0 0l3 3m-3-3h12.75" />
+                            </svg>
+                        </Button>
+                    </div>
                 </div>
             </div>
         </SidenavFooter>
diff --git a/frontend/src/store.rs b/frontend/src/store.rs
index 8618736..8edb028 100644
--- a/frontend/src/store.rs
+++ b/frontend/src/store.rs
@@ -162,7 +162,7 @@ pub async fn is_push_subscribed() -> Result<bool, String> {
         .dyn_into::<web_sys::ServiceWorkerRegistration>()
         .map_err(|_| "not a registration")?;
 
-    let push_manager = registration.push_manager();
+    let push_manager = registration.push_manager().map_err(|e| format!("{:?}", e))?;
     let subscription = wasm_bindgen_futures::JsFuture::from(push_manager.get_subscription().map_err(|e| format!("{:?}", e))?)
         .await
         .map_err(|e| format!("{:?}", e))?;
@@ -181,7 +181,8 @@ pub async fn subscribe_to_push_notifications() {
     };
 
     // 1. Get Public Key from Backend
-    let public_key = match shared::server_fns::push::get_push_public_key().await {
+    let public_key_res: Result<String, _> = shared::server_fns::push::get_public_key().await;
+    let public_key = match public_key_res {
         Ok(key) => key,
         Err(e) => { log::error!("Failed to get public key: {:?}", e); return; }
     };
@@ -192,25 +193,25 @@ pub async fn subscribe_to_push_notifications() {
 
     // 3. Prepare Options
     let mut options = web_sys::PushSubscriptionOptionsInit::new();
-    options.user_visible_only(true);
-    options.application_server_key(Some(&key_array.into()));
+    options.set_user_visible_only(true);
+    options.set_application_server_key(&key_array.into());
 
     // 4. Subscribe
-    let push_manager = registration.push_manager();
+    let push_manager = registration.push_manager().expect("no push manager");
     match wasm_bindgen_futures::JsFuture::from(push_manager.subscribe_with_options(&options).expect("subscribe failed")).await {
         Ok(subscription) => {
-            let sub = subscription.dyn_into::<web_sys::PushSubscription>().expect("not a sub");
-            let json = sub.to_json().expect("sub to json failed");
+            let sub_js = subscription.clone();
             
-            // Extract keys from JSON
-            let sub_obj: serde_json::Value = serde_wasm_bindgen::from_value(json).expect("serde from value failed");
+            // Use JS to extract JSON string representation
+            let json_str = js_sys::JSON::stringify(&sub_js).expect("stringify failed").as_string().expect("not a string");
+            let sub_obj: serde_json::Value = serde_json::from_str(&json_str).expect("serde from str failed");
             
             let endpoint = sub_obj["endpoint"].as_str().expect("no endpoint").to_string();
             let p256dh = sub_obj["keys"]["p256dh"].as_str().expect("no p256dh").to_string();
             let auth = sub_obj["keys"]["auth"].as_str().expect("no auth").to_string();
 
             // 5. Save to Backend
-            match shared::server_fns::push::save_push_subscription(endpoint, p256dh, auth).await {
+            match shared::server_fns::push::subscribe_push(endpoint, p256dh, auth).await {
                 Ok(_) => {
                     log::info!("Push subscription saved successfully");
                     toast_success("Bildirimler aktif edildi");
@@ -229,7 +230,7 @@ pub async fn unsubscribe_from_push_notifications() {
     let registration = wasm_bindgen_futures::JsFuture::from(sw_container.ready().expect("sw not ready")).await
         .unwrap().dyn_into::<web_sys::ServiceWorkerRegistration>().unwrap();
 
-    let push_manager = registration.push_manager();
+    let push_manager = registration.push_manager().unwrap();
     if let Ok(sub_future) = push_manager.get_subscription() {
         if let Ok(subscription) = wasm_bindgen_futures::JsFuture::from(sub_future).await {
             if !subscription.is_null() {
@@ -240,7 +241,7 @@ pub async fn unsubscribe_from_push_notifications() {
                 let _ = wasm_bindgen_futures::JsFuture::from(sub.unsubscribe().unwrap()).await;
                 
                 // 2. Remove from Backend
-                let _ = shared::server_fns::push::remove_push_subscription(endpoint).await;
+                let _ = shared::server_fns::push::unsubscribe_push(endpoint).await;
                 log::info!("Push subscription removed");
                 show_toast(NotificationLevel::Info, "Bildirimler kapatıldı");
             }
diff --git a/shared/src/server_fns/push.rs b/shared/src/server_fns/push.rs
index 72db4a7..fc5d4b0 100644
--- a/shared/src/server_fns/push.rs
+++ b/shared/src/server_fns/push.rs
@@ -20,3 +20,13 @@ pub async fn subscribe_push(
         .await
         .map_err(|e| ServerFnError::new(format!("Failed to save subscription: {}", e)))
 }
+
+#[server(UnsubscribePush, "/api/server_fns")]
+pub async fn unsubscribe_push(endpoint: String) -> Result<(), ServerFnError> {
+    let db_ctx = expect_context::<crate::DbContext>();
+    db_ctx
+        .db
+        .remove_push_subscription(&endpoint)
+        .await
+        .map_err(|e| ServerFnError::new(format!("Failed to remove subscription: {}", e)))
+}