diff --git a/client/src/api/core/OpenAPI.ts b/client/src/api/core/OpenAPI.ts
index 77fa96a..03da729 100644
--- a/client/src/api/core/OpenAPI.ts
+++ b/client/src/api/core/OpenAPI.ts
@@ -29,4 +29,4 @@ export const OpenAPI: OpenAPIConfig = {
     PASSWORD: undefined,
     HEADERS: undefined,
     ENCODE_PATH: undefined,
-};
+};
diff --git a/client/src/api/core/request.ts b/client/src/api/core/request.ts
index 319b00a..6cf8280 100644
--- a/client/src/api/core/request.ts
+++ b/client/src/api/core/request.ts
@@ -2,285 +2,315 @@
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
-import axios from 'axios';
-import type { AxiosError, AxiosRequestConfig, AxiosResponse, AxiosInstance } from 'axios';
-import FormData from 'form-data';
-
-import { ApiError } from './ApiError';
-import type { ApiRequestOptions } from './ApiRequestOptions';
-import type { ApiResult } from './ApiResult';
-import { CancelablePromise } from './CancelablePromise';
-import type { OnCancel } from './CancelablePromise';
-import type { OpenAPIConfig } from './OpenAPI';
-
-export const isDefined = <T>(value: T | null | undefined): value is Exclude<T, null | undefined> => {
-    return value !== undefined && value !== null;
+import axios from "axios";
+import type {
+  AxiosError,
+  AxiosRequestConfig,
+  AxiosResponse,
+  AxiosInstance,
+} from "axios";
+import FormData from "form-data";
+
+import { ApiError } from "./ApiError";
+import type { ApiRequestOptions } from "./ApiRequestOptions";
+import type { ApiResult } from "./ApiResult";
+import { CancelablePromise } from "./CancelablePromise";
+import type { OnCancel } from "./CancelablePromise";
+import type { OpenAPIConfig } from "./OpenAPI";
+
+export const isDefined = <T>(
+  value: T | null | undefined
+): value is Exclude<T, null | undefined> => {
+  return value !== undefined && value !== null;
 };
 
 export const isString = (value: any): value is string => {
-    return typeof value === 'string';
+  return typeof value === "string";
 };
 
 export const isStringWithValue = (value: any): value is string => {
-    return isString(value) && value !== '';
+  return isString(value) && value !== "";
 };
 
 export const isBlob = (value: any): value is Blob => {
-    return (
-        typeof value === 'object' &&
-        typeof value.type === 'string' &&
-        typeof value.stream === 'function' &&
-        typeof value.arrayBuffer === 'function' &&
-        typeof value.constructor === 'function' &&
-        typeof value.constructor.name === 'string' &&
-        /^(Blob|File)$/.test(value.constructor.name) &&
-        /^(Blob|File)$/.test(value[Symbol.toStringTag])
-    );
+  return (
+    typeof value === "object" &&
+    typeof value.type === "string" &&
+    typeof value.stream === "function" &&
+    typeof value.arrayBuffer === "function" &&
+    typeof value.constructor === "function" &&
+    typeof value.constructor.name === "string" &&
+    /^(Blob|File)$/.test(value.constructor.name) &&
+    /^(Blob|File)$/.test(value[Symbol.toStringTag])
+  );
 };
 
 export const isFormData = (value: any): value is FormData => {
-    return value instanceof FormData;
+  return value instanceof FormData;
 };
 
 export const isSuccess = (status: number): boolean => {
-    return status >= 200 && status < 300;
+  return status >= 200 && status < 300;
 };
 
 export const base64 = (str: string): string => {
-    try {
-        return btoa(str);
-    } catch (err) {
-        // @ts-ignore
-        return Buffer.from(str).toString('base64');
-    }
+  try {
+    return btoa(str);
+  } catch (err) {
+    // @ts-ignore
+    return Buffer.from(str).toString("base64");
+  }
 };
 
 export const getQueryString = (params: Record<string, any>): string => {
-    const qs: string[] = [];
+  const qs: string[] = [];
 
-    const append = (key: string, value: any) => {
-        qs.push(`${encodeURIComponent(key)}=${encodeURIComponent(String(value))}`);
-    };
+  const append = (key: string, value: any) => {
+    qs.push(`${encodeURIComponent(key)}=${encodeURIComponent(String(value))}`);
+  };
 
-    const process = (key: string, value: any) => {
-        if (isDefined(value)) {
-            if (Array.isArray(value)) {
-                value.forEach(v => {
-                    process(key, v);
-                });
-            } else if (typeof value === 'object') {
-                Object.entries(value).forEach(([k, v]) => {
-                    process(`${key}[${k}]`, v);
-                });
-            } else {
-                append(key, value);
-            }
-        }
-    };
+  const process = (key: string, value: any) => {
+    if (isDefined(value)) {
+      if (Array.isArray(value)) {
+        value.forEach((v) => {
+          process(key, v);
+        });
+      } else if (typeof value === "object") {
+        Object.entries(value).forEach(([k, v]) => {
+          process(`${key}[${k}]`, v);
+        });
+      } else {
+        append(key, value);
+      }
+    }
+  };
 
-    Object.entries(params).forEach(([key, value]) => {
-        process(key, value);
-    });
+  Object.entries(params).forEach(([key, value]) => {
+    process(key, value);
+  });
 
-    if (qs.length > 0) {
-        return `?${qs.join('&')}`;
-    }
+  if (qs.length > 0) {
+    return `?${qs.join("&")}`;
+  }
 
-    return '';
+  return "";
 };
 
 const getUrl = (config: OpenAPIConfig, options: ApiRequestOptions): string => {
-    const encoder = config.ENCODE_PATH || encodeURI;
-
-    const path = options.url
-        .replace('{api-version}', config.VERSION)
-        .replace(/{(.*?)}/g, (substring: string, group: string) => {
-            if (options.path?.hasOwnProperty(group)) {
-                return encoder(String(options.path[group]));
-            }
-            return substring;
-        });
+  const encoder = config.ENCODE_PATH || encodeURI;
+
+  const path = options.url
+    .replace("{api-version}", config.VERSION)
+    .replace(/{(.*?)}/g, (substring: string, group: string) => {
+      if (options.path?.hasOwnProperty(group)) {
+        return encoder(String(options.path[group]));
+      }
+      return substring;
+    });
 
-    const url = `${config.BASE}${path}`;
-    if (options.query) {
-        return `${url}${getQueryString(options.query)}`;
-    }
-    return url;
+  const url = `${config.BASE}${path}`;
+  if (options.query) {
+    return `${url}${getQueryString(options.query)}`;
+  }
+  return url;
 };
 
-export const getFormData = (options: ApiRequestOptions): FormData | undefined => {
-    if (options.formData) {
-        const formData = new FormData();
+export const getFormData = (
+  options: ApiRequestOptions
+): FormData | undefined => {
+  if (options.formData) {
+    const formData = new FormData();
 
-        const process = (key: string, value: any) => {
-            if (isString(value) || isBlob(value)) {
-                formData.append(key, value);
-            } else {
-                formData.append(key, JSON.stringify(value));
-            }
-        };
+    const process = (key: string, value: any) => {
+      if (isString(value) || isBlob(value)) {
+        formData.append(key, value);
+      } else {
+        formData.append(key, JSON.stringify(value));
+      }
+    };
 
-        Object.entries(options.formData)
-            .filter(([_, value]) => isDefined(value))
-            .forEach(([key, value]) => {
-                if (Array.isArray(value)) {
-                    value.forEach(v => process(key, v));
-                } else {
-                    process(key, value);
-                }
-            });
-
-        return formData;
-    }
-    return undefined;
+    Object.entries(options.formData)
+      .filter(([_, value]) => isDefined(value))
+      .forEach(([key, value]) => {
+        if (Array.isArray(value)) {
+          value.forEach((v) => process(key, v));
+        } else {
+          process(key, value);
+        }
+      });
+
+    return formData;
+  }
+  return undefined;
 };
 
 type Resolver<T> = (options: ApiRequestOptions) => Promise<T>;
 
-export const resolve = async <T>(options: ApiRequestOptions, resolver?: T | Resolver<T>): Promise<T | undefined> => {
-    if (typeof resolver === 'function') {
-        return (resolver as Resolver<T>)(options);
-    }
-    return resolver;
+export const resolve = async <T>(
+  options: ApiRequestOptions,
+  resolver?: T | Resolver<T>
+): Promise<T | undefined> => {
+  if (typeof resolver === "function") {
+    return (resolver as Resolver<T>)(options);
+  }
+  return resolver;
 };
 
-export const getHeaders = async (config: OpenAPIConfig, options: ApiRequestOptions, formData?: FormData): Promise<Record<string, string>> => {
-    const [token, username, password, additionalHeaders] = await Promise.all([
-        resolve(options, config.TOKEN),
-        resolve(options, config.USERNAME),
-        resolve(options, config.PASSWORD),
-        resolve(options, config.HEADERS),
-    ]);
-
-    const formHeaders = typeof formData?.getHeaders === 'function' && formData?.getHeaders() || {}
-
-    const headers = Object.entries({
-        Accept: 'application/json',
-        ...additionalHeaders,
-        ...options.headers,
-        ...formHeaders,
-    })
+export const getHeaders = async (
+  config: OpenAPIConfig,
+  options: ApiRequestOptions,
+  formData?: FormData
+): Promise<Record<string, string>> => {
+  const [token, username, password, additionalHeaders] = await Promise.all([
+    resolve(options, config.TOKEN),
+    resolve(options, config.USERNAME),
+    resolve(options, config.PASSWORD),
+    resolve(options, config.HEADERS),
+  ]);
+
+  const formHeaders =
+    (typeof formData?.getHeaders === "function" && formData?.getHeaders()) ||
+    {};
+
+  const headers = Object.entries({
+    Accept: "application/json",
+    ...additionalHeaders,
+    ...options.headers,
+    ...formHeaders,
+  })
     .filter(([_, value]) => isDefined(value))
-    .reduce((headers, [key, value]) => ({
+    .reduce(
+      (headers, [key, value]) => ({
         ...headers,
         [key]: String(value),
-    }), {} as Record<string, string>);
-
-    if (isStringWithValue(token)) {
-        headers['Authorization'] = `Bearer ${token}`;
-    }
-
-    if (isStringWithValue(username) && isStringWithValue(password)) {
-        const credentials = base64(`${username}:${password}`);
-        headers['Authorization'] = `Basic ${credentials}`;
-    }
+      }),
+      {} as Record<string, string>
+    );
 
-    if (options.body !== undefined) {
-        if (options.mediaType) {
-            headers['Content-Type'] = options.mediaType;
-        } else if (isBlob(options.body)) {
-            headers['Content-Type'] = options.body.type || 'application/octet-stream';
-        } else if (isString(options.body)) {
-            headers['Content-Type'] = 'text/plain';
-        } else if (!isFormData(options.body)) {
-            headers['Content-Type'] = 'application/json';
-        }
+  if (isStringWithValue(token)) {
+    headers["Authorization"] = `Bearer ${token}`;
+  }
+
+  if (isStringWithValue(username) && isStringWithValue(password)) {
+    const credentials = base64(`${username}:${password}`);
+    headers["Authorization"] = `Basic ${credentials}`;
+  }
+
+  if (options.body !== undefined) {
+    if (options.mediaType) {
+      headers["Content-Type"] = options.mediaType;
+    } else if (isBlob(options.body)) {
+      headers["Content-Type"] = options.body.type || "application/octet-stream";
+    } else if (isString(options.body)) {
+      headers["Content-Type"] = "text/plain";
+    } else if (!isFormData(options.body)) {
+      headers["Content-Type"] = "application/json";
     }
+  }
 
-    return headers;
+  return headers;
 };
 
 export const getRequestBody = (options: ApiRequestOptions): any => {
-    if (options.body) {
-        return options.body;
-    }
-    return undefined;
+  if (options.body) {
+    return options.body;
+  }
+  return undefined;
 };
 
 export const sendRequest = async <T>(
-    config: OpenAPIConfig,
-    options: ApiRequestOptions,
-    url: string,
-    body: any,
-    formData: FormData | undefined,
-    headers: Record<string, string>,
-    onCancel: OnCancel,
-    axiosClient: AxiosInstance
+  config: OpenAPIConfig,
+  options: ApiRequestOptions,
+  url: string,
+  body: any,
+  formData: FormData | undefined,
+  headers: Record<string, string>,
+  onCancel: OnCancel,
+  axiosClient: AxiosInstance
 ): Promise<AxiosResponse<T>> => {
-    const source = axios.CancelToken.source();
-
-    const requestConfig: AxiosRequestConfig = {
-        url,
-        headers,
-        data: body ?? formData,
-        method: options.method,
-        withCredentials: config.WITH_CREDENTIALS,
-        withXSRFToken: config.CREDENTIALS === 'include' ? config.WITH_CREDENTIALS : false,
-        cancelToken: source.token,
-    };
-
-    onCancel(() => source.cancel('The user aborted a request.'));
-
-    try {
-        return await axiosClient.request(requestConfig);
-    } catch (error) {
-        const axiosError = error as AxiosError<T>;
-        if (axiosError.response) {
-            return axiosError.response;
-        }
-        throw error;
+  const source = axios.CancelToken.source();
+
+  const requestConfig: AxiosRequestConfig = {
+    url,
+    headers,
+    data: body ?? formData,
+    method: options.method,
+    withCredentials: config.WITH_CREDENTIALS,
+    withXSRFToken:
+      config.CREDENTIALS === "include" ? config.WITH_CREDENTIALS : false,
+    cancelToken: source.token,
+  };
+
+  onCancel(() => source.cancel("The user aborted a request."));
+
+  try {
+    return await axiosClient.request(requestConfig);
+  } catch (error) {
+    const axiosError = error as AxiosError<T>;
+    if (axiosError.response) {
+      return axiosError.response;
     }
+    throw error;
+  }
 };
 
-export const getResponseHeader = (response: AxiosResponse<any>, responseHeader?: string): string | undefined => {
-    if (responseHeader) {
-        const content = response.headers[responseHeader];
-        if (isString(content)) {
-            return content;
-        }
+export const getResponseHeader = (
+  response: AxiosResponse<any>,
+  responseHeader?: string
+): string | undefined => {
+  if (responseHeader) {
+    const content = response.headers[responseHeader];
+    if (isString(content)) {
+      return content;
     }
-    return undefined;
+  }
+  return undefined;
 };
 
 export const getResponseBody = (response: AxiosResponse<any>): any => {
-    if (response.status !== 204) {
-        return response.data;
-    }
-    return undefined;
+  if (response.status !== 204) {
+    return response.data;
+  }
+  return undefined;
 };
 
-export const catchErrorCodes = (options: ApiRequestOptions, result: ApiResult): void => {
-    const errors: Record<number, string> = {
-        400: 'Bad Request',
-        401: 'Unauthorized',
-        403: 'Forbidden',
-        404: 'Not Found',
-        500: 'Internal Server Error',
-        502: 'Bad Gateway',
-        503: 'Service Unavailable',
-        ...options.errors,
-    }
-
-    const error = errors[result.status];
-    if (error) {
-        throw new ApiError(options, result, error);
-    }
-
-    if (!result.ok) {
-        const errorStatus = result.status ?? 'unknown';
-        const errorStatusText = result.statusText ?? 'unknown';
-        const errorBody = (() => {
-            try {
-                return JSON.stringify(result.body, null, 2);
-            } catch (e) {
-                return undefined;
-            }
-        })();
-
-        throw new ApiError(options, result,
-            `Generic Error: status: ${errorStatus}; status text: ${errorStatusText}; body: ${errorBody}`
-        );
-    }
+export const catchErrorCodes = (
+  options: ApiRequestOptions,
+  result: ApiResult
+): void => {
+  const errors: Record<number, string> = {
+    400: "Bad Request",
+    401: "Unauthorized",
+    403: "Forbidden",
+    404: "Not Found",
+    500: "Internal Server Error",
+    502: "Bad Gateway",
+    503: "Service Unavailable",
+    ...options.errors,
+  };
+
+  const error = errors[result.status];
+  if (error) {
+    throw new ApiError(options, result, error);
+  }
+
+  if (!result.ok) {
+    const errorStatus = result.status ?? "unknown";
+    const errorStatusText = result.statusText ?? "unknown";
+    const errorBody = (() => {
+      try {
+        return JSON.stringify(result.body, null, 2);
+      } catch (e) {
+        return undefined;
+      }
+    })();
+
+    throw new ApiError(
+      options,
+      result,
+      `Generic Error: status: ${errorStatus}; status text: ${errorStatusText}; body: ${errorBody}`
+    );
+  }
 };
 
 /**
@@ -291,33 +321,49 @@ export const catchErrorCodes = (options: ApiRequestOptions, result: ApiResult):
  * @returns CancelablePromise<T>
  * @throws ApiError
  */
-export const request = <T>(config: OpenAPIConfig, options: ApiRequestOptions, axiosClient: AxiosInstance = axios): CancelablePromise<T> => {
-    return new CancelablePromise(async (resolve, reject, onCancel) => {
-        try {
-            const url = getUrl(config, options);
-            const formData = getFormData(options);
-            const body = getRequestBody(options);
-            const headers = await getHeaders(config, options, formData);
-
-            if (!onCancel.isCancelled) {
-                const response = await sendRequest<T>(config, options, url, body, formData, headers, onCancel, axiosClient);
-                const responseBody = getResponseBody(response);
-                const responseHeader = getResponseHeader(response, options.responseHeader);
-
-                const result: ApiResult = {
-                    url,
-                    ok: isSuccess(response.status),
-                    status: response.status,
-                    statusText: response.statusText,
-                    body: responseHeader ?? responseBody,
-                };
-
-                catchErrorCodes(options, result);
-
-                resolve(result.body);
-            }
-        } catch (error) {
-            reject(error);
-        }
-    });
-};
+export const request = <T>(
+  config: OpenAPIConfig,
+  options: ApiRequestOptions,
+  axiosClient: AxiosInstance = axios
+): CancelablePromise<T> => {
+  return new CancelablePromise(async (resolve, reject, onCancel) => {
+    try {
+      const url = getUrl(config, options);
+      const formData = getFormData(options);
+      const body = getRequestBody(options);
+      const headers = await getHeaders(config, options, formData);
+
+      const axiosOptions = {
+        url,
+        method: options.method,
+        data: body,
+        headers,
+        params: url.includes("?") ? undefined : options.query,
+        withCredentials: true,
+      };
+
+      if (!onCancel.isCancelled) {
+        const response = await axiosClient.request<T>(axiosOptions);
+        const responseBody = getResponseBody(response);
+        const responseHeader = getResponseHeader(
+          response,
+          options.responseHeader
+        );
+
+        const result: ApiResult = {
+          url,
+          ok: isSuccess(response.status),
+          status: response.status,
+          statusText: response.statusText,
+          body: responseHeader ?? responseBody,
+        };
+
+        catchErrorCodes(options, result);
+
+        resolve(result.body);
+      }
+    } catch (error) {
+      reject(error);
+    }
+  });
+};
diff --git a/client/src/api/services/DefaultService.ts b/client/src/api/services/DefaultService.ts
index 4ceef98..93bed92 100644
--- a/client/src/api/services/DefaultService.ts
+++ b/client/src/api/services/DefaultService.ts
@@ -137,6 +137,7 @@ export class DefaultService {
   /**
    * Delete an expense
    * @param id
+   * @param id
    * @returns void
    * @throws ApiError
    */
@@ -149,86 +150,6 @@ export class DefaultService {
       },
     });
   }
-  /**
-   * Get system income categories
-   * @returns any List of system income categories"
-   * @throws ApiError
-   */
-  public static getIncomesCategories(): CancelablePromise<any> {
-    return __request(OpenAPI, {
-      method: "GET",
-      url: "/incomes/categories",
-    });
-  }
-  /**
-   * Get user's custom income categories
-   * @returns any List of user's custom income categories
-   * @throws ApiError
-   */
-  public static getIncomesCustomCategories(): CancelablePromise<any> {
-    return __request(OpenAPI, {
-      method: "GET",
-      url: "/incomes/custom-categories",
-    });
-  }
-  /**
-   * Create a new custom income category
-   * @param requestBody
-   * @returns any Income category created
-   * @throws ApiError
-   */
-  public static postIncomesCustomCategories(requestBody: {
-    category_name: string;
-    icon_url?: string;
-  }): CancelablePromise<any> {
-    return __request(OpenAPI, {
-      method: "POST",
-      url: "/incomes/custom-categories",
-      body: requestBody,
-      mediaType: "application/json",
-    });
-  }
-  /**
-   * Update an income category
-   * @param id
-   * @param requestBody
-   * @returns any Income category updated
-   * @throws ApiError
-   */
-  public static putIncomesCustomCategories(
-    id: string,
-    requestBody: {
-      category_name: string;
-      icon_url?: string;
-    }
-  ): CancelablePromise<any> {
-    return __request(OpenAPI, {
-      method: "PUT",
-      url: "/incomes/custom-categories/{id}",
-      path: {
-        id: id,
-      },
-      body: requestBody,
-      mediaType: "application/json",
-    });
-  }
-  /**
-   * Delete an income category
-   * @param id
-   * @returns void
-   * @throws ApiError
-   */
-  public static deleteIncomesCustomCategories(
-    id: string
-  ): CancelablePromise<void> {
-    return __request(OpenAPI, {
-      method: "DELETE",
-      url: "/incomes/custom-categories/{id}",
-      path: {
-        id: id,
-      },
-    });
-  }
   /**
    * List all incomes
    * @param start
@@ -257,10 +178,9 @@ export class DefaultService {
    */
   public static postIncomes(requestBody?: {
     amount: number;
-    date?: string;
+    date: string;
     source?: string;
     description?: string;
-    category_id?: number;
   }): CancelablePromise<any> {
     return __request(OpenAPI, {
       method: "POST",
@@ -313,6 +233,7 @@ export class DefaultService {
   /**
    * Delete an income entry
    * @param id
+   * @param id
    * @returns void
    * @throws ApiError
    */
diff --git a/client/src/components/IncomeForm.tsx b/client/src/components/IncomeForm.tsx
index eac4750..8dff09c 100644
--- a/client/src/components/IncomeForm.tsx
+++ b/client/src/components/IncomeForm.tsx
@@ -1,8 +1,8 @@
 import React, { useState, useEffect } from "react";
 import type { Income, IncomeFormData } from "../types/Income";
-import { useIncomeCategories } from "../hooks/useIncomeCategories";
-import { Button, TextField, Select, Dialog, Skeleton } from "../ui";
+import { Button, TextField, Dialog, DatePicker } from "../ui";
 import { useMascot } from "../hooks/useMascot";
+import { validateIncomeData } from "../utils/validators";
 
 interface IncomeFormProps {
   income?: Income;
@@ -17,7 +17,6 @@ export const IncomeForm: React.FC<IncomeFormProps> = ({
   onCancel,
   open,
 }) => {
-  const { categories, loading: categoriesLoading } = useIncomeCategories();
   const [saving, setSaving] = useState(false);
   const { showSuccess, showError } = useMascot();
 
@@ -28,9 +27,10 @@ export const IncomeForm: React.FC<IncomeFormProps> = ({
       : new Date().toISOString().split("T")[0],
     source: income?.source || "",
     description: income?.description || "",
-    category_id: income?.category_id || 1,
   });
 
+  const [errors, setErrors] = useState<Record<string, string>>({});
+
   useEffect(() => {
     if (income) {
       setFormData({
@@ -38,7 +38,6 @@ export const IncomeForm: React.FC<IncomeFormProps> = ({
         date: new Date(income.date).toISOString().split("T")[0],
         source: income.source,
         description: income.description || "",
-        category_id: income.category_id,
       });
     } else {
       setFormData({
@@ -46,15 +45,20 @@ export const IncomeForm: React.FC<IncomeFormProps> = ({
         date: new Date().toISOString().split("T")[0],
         source: "",
         description: "",
-        category_id: 1,
       });
     }
+    setErrors({});
   }, [income, open]);
 
   const handleSubmit = async (e: React.FormEvent) => {
     e.preventDefault();
-    setSaving(true);
+    const validationErrors = validateIncomeData(formData);
+    if (Object.keys(validationErrors).length > 0) {
+      setErrors(validationErrors);
+      return;
+    }
 
+    setSaving(true);
     try {
       await onSave(formData);
       showSuccess();
@@ -72,9 +76,16 @@ export const IncomeForm: React.FC<IncomeFormProps> = ({
   ) => {
     setFormData((prev) => ({
       ...prev,
-      [field]:
-        field === "amount" || field === "category_id" ? Number(value) : value,
+      [field]: field === "amount" ? Number(value) : value,
     }));
+    setErrors((prev) => ({ ...prev, [field]: "" }));
+  };
+
+  const handleDateChange = (date: Date | null) => {
+    if (date) {
+      const formattedDate = date.toISOString().split("T")[0];
+      handleChange("date", formattedDate);
+    }
   };
 
   return (
@@ -91,14 +102,17 @@ export const IncomeForm: React.FC<IncomeFormProps> = ({
           onChange={(e) => handleChange("amount", e.target.value)}
           required
           fullWidth
+          min={0}
+          error={!!errors.amount}
+          helperText={errors.amount}
         />
 
-        <TextField
+        <DatePicker
+          value={formData.date ? new Date(formData.date) : new Date()}
+          onChange={handleDateChange}
           label="Date"
-          type="date"
-          value={formData.date ?? ""}
-          onChange={(e) => handleChange("date", e.target.value)}
-          fullWidth
+          size="medium"
+          required
         />
 
         <TextField
@@ -106,31 +120,17 @@ export const IncomeForm: React.FC<IncomeFormProps> = ({
           value={formData.source ?? ""}
           onChange={(e) => handleChange("source", e.target.value)}
           fullWidth
+          error={!!errors.source}
+          helperText={errors.source}
         />
 
-        {categoriesLoading ? (
-          <Skeleton variant="rect" height={56} rounded="rounded-md" />
-        ) : (
-          <div>
-            <label className="block mb-1 text-sm font-medium text-gray-700">
-              Category
-            </label>
-            <Select
-              value={formData.category_id ?? null}
-              onChange={(value) => handleChange("category_id", value)}
-              options={categories.map((cat) => ({
-                label: cat.category_name,
-                value: cat.category_id,
-              }))}
-            />
-          </div>
-        )}
-
         <TextField
           label="Description"
           value={formData.description || ""}
           onChange={(e) => handleChange("description", e.target.value)}
           fullWidth
+          error={!!errors.description}
+          helperText={errors.description}
         />
 
         <div className="flex gap-3 justify-end pt-4">
diff --git a/client/src/components/IncomeList.tsx b/client/src/components/IncomeList.tsx
index 1adfadf..eae35b2 100644
--- a/client/src/components/IncomeList.tsx
+++ b/client/src/components/IncomeList.tsx
@@ -1,7 +1,7 @@
 import { forwardRef, useImperativeHandle } from "react";
 import type { Income } from "../types/Income";
 import { useIncomes } from "../hooks/useIncomes";
-import { Button, Chip } from "../ui";
+import { Button } from "../ui";
 
 interface IncomeListProps {
   startDate?: string;
@@ -65,13 +65,6 @@ export const IncomeList = forwardRef<IncomeListRef, IncomeListProps>(
                       <h3 className="font-medium text-lg">
                         {income.amount.toFixed(2)} MGA
                       </h3>
-                      {income.category && (
-                        <Chip
-                          label={income.category.category_name}
-                          size="small"
-                          className="bg-blue-100 text-blue-800"
-                        />
-                      )}
                     </div>
                     <p className="text-gray-600 mb-1">{income.source}</p>
                     {income.description && (
diff --git a/client/src/hooks/useIncomeCategories.ts b/client/src/hooks/useIncomeCategories.ts
deleted file mode 100644
index 7684f7e..0000000
--- a/client/src/hooks/useIncomeCategories.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import type { IncomeCategory } from "../types/Income";
-import { IncomeService } from "../services/IncomeService";
-import { useState, useEffect } from "react";
-
-export const useIncomeCategories = () => {
-  const [categories, setCategories] = useState<IncomeCategory[]>([]);
-  const [loading, setLoading] = useState(true);
-  const [error, setError] = useState<string | null>(null);
-
-  useEffect(() => {
-    const fetchCategories = async () => {
-      try {
-        setLoading(true);
-        setError(null);
-        const data = await IncomeService.getIncomeCategories();
-        setCategories(data);
-      } catch (err) {
-        setError(
-          err instanceof Error ? err.message : "Failed to fetch categories"
-        );
-      } finally {
-        setLoading(false);
-      }
-    };
-
-    fetchCategories();
-  }, []);
-
-  const refetch = async () => {
-    try {
-      setLoading(true);
-      setError(null);
-      const data = await IncomeService.getIncomeCategories();
-      setCategories(data);
-    } catch (err) {
-      setError(
-        err instanceof Error ? err.message : "Failed to refetch categories"
-      );
-    } finally {
-      setLoading(false);
-    }
-  };
-
-  return { categories, loading, error, refetch };
-};
diff --git a/client/src/pages/IncomesPage.tsx b/client/src/pages/IncomesPage.tsx
index bc88eeb..c6be2b4 100644
--- a/client/src/pages/IncomesPage.tsx
+++ b/client/src/pages/IncomesPage.tsx
@@ -1,17 +1,20 @@
 import { useState, useRef } from "react";
 import type { Income } from "../types/Income";
 import { IncomeList } from "../components/IncomeList";
-import { Button, TextField, Dialog, useToast } from "../ui";
+import { Button, Dialog, useToast, DatePicker } from "../ui";
 import { IncomeService } from "../services/IncomeService";
 import { useNavigate } from "react-router-dom";
+import { validateDateRange } from "../utils/validators";
 
 export const IncomesPage = () => {
   const [dateFilter, setDateFilter] = useState<{
     start?: string;
     end?: string;
   }>({});
+  const [dateError, setDateError] = useState<string | null>(null);
   const [deleteConfirmOpen, setDeleteConfirmOpen] = useState(false);
   const [incomeToDelete, setIncomeToDelete] = useState<Income | null>(null);
+
   const toast = useToast();
   const incomeListRef = useRef<{ refetch: () => void }>(null);
   const navigate = useNavigate();
@@ -33,7 +36,6 @@ export const IncomesPage = () => {
       toast.success("Income deleted successfully");
       setDeleteConfirmOpen(false);
       setIncomeToDelete(null);
-      //refresh after every operations
       incomeListRef.current?.refetch();
     } catch (error) {
       const message =
@@ -46,6 +48,20 @@ export const IncomesPage = () => {
     navigate("/incomes/new");
   };
 
+  const handleStartDateChange = (date: Date | null) => {
+    const newStart = date ? date.toISOString().split("T")[0] : undefined;
+    const err = validateDateRange(newStart, dateFilter.end);
+    setDateError(err);
+    setDateFilter((prev) => ({ ...prev, start: newStart }));
+  };
+
+  const handleEndDateChange = (date: Date | null) => {
+    const newEnd = date ? date.toISOString().split("T")[0] : undefined;
+    const err = validateDateRange(dateFilter.start, newEnd);
+    setDateError(err);
+    setDateFilter((prev) => ({ ...prev, end: newEnd }));
+  };
+
   return (
     <div className="p-6 max-w-4xl mx-auto relative z-2">
       <div className="flex pt-20 justify-between items-center mb-6">
@@ -58,29 +74,25 @@ export const IncomesPage = () => {
         </Button>
       </div>
 
-      <div className="bg-white rounded-lg shadow p-6 mb-6">
+      <div className="bg-white rounded-lg shadow p-6 mb-6 relative">
+        {dateError && (
+          <div className="absolute -top-10 left-1/2 transform -translate-x-1/2 bg-rose-50 border border-rose-200 text-rose-700 px-4 py-2 rounded-xl shadow-md animate-bounce">
+            {dateError}
+          </div>
+        )}
+
         <div className="grid grid-cols-1 md:grid-cols-2 gap-4 mb-6">
-          <TextField
-            label="From Date"
-            type="date"
-            value={dateFilter.start || ""}
-            onChange={(e) =>
-              setDateFilter((prev) => ({
-                ...prev,
-                start: e.target.value || undefined,
-              }))
-            }
+          <DatePicker
+            value={dateFilter.start ? new Date(dateFilter.start) : null}
+            onChange={handleStartDateChange}
+            label="Start Date"
+            size="medium"
           />
-          <TextField
-            label="To Date"
-            type="date"
-            value={dateFilter.end || ""}
-            onChange={(e) =>
-              setDateFilter((prev) => ({
-                ...prev,
-                end: e.target.value || undefined,
-              }))
-            }
+          <DatePicker
+            value={dateFilter.end ? new Date(dateFilter.end) : null}
+            onChange={handleEndDateChange}
+            label="End Date"
+            size="medium"
           />
         </div>
 
@@ -118,10 +130,12 @@ export const IncomesPage = () => {
         {incomeToDelete && (
           <div className="mt-3 p-3 bg-gray-50 rounded">
             <p>
-              <strong>Amount:</strong> ${incomeToDelete.amount.toFixed(2)}
+              <strong>Amount: </strong>
+              {incomeToDelete.amount.toFixed(2)} MGA
             </p>
             <p>
-              <strong>Source:</strong> {incomeToDelete.source}
+              <strong>Source:</strong>{" "}
+              {incomeToDelete.source.length > 0 ? incomeToDelete.source : "-"}
             </p>
             <p>
               <strong>Date:</strong>{" "}
diff --git a/client/src/services/IncomeService.ts b/client/src/services/IncomeService.ts
index 30ed6c9..5dfc3bf 100644
--- a/client/src/services/IncomeService.ts
+++ b/client/src/services/IncomeService.ts
@@ -2,7 +2,6 @@ import { DefaultService } from "../api/services/DefaultService";
 import { useMascotStore } from "../stores/mascotStore";
 import type {
   Income,
-  IncomeCategory,
   CreateIncomeRequest,
   UpdateIncomeRequest,
 } from "../types/Income";
@@ -16,7 +15,6 @@ export class IncomeService {
       return response as Income[];
     } catch (error) {
       useMascotStore.getState().setExpression("error");
-
       console.error("Error fetching incomes:", error);
       throw new Error("Failed to fetch incomes");
     }
@@ -27,11 +25,9 @@ export class IncomeService {
     try {
       const response = await DefaultService.getIncomes1(id);
       useMascotStore.getState().setExpression("success");
-
       return response as Income;
     } catch (error) {
       useMascotStore.getState().setExpression("error");
-
       console.error(`Error fetching income ${id}:`, error);
       throw new Error("Failed to fetch income");
     }
@@ -45,9 +41,6 @@ export class IncomeService {
         amount: Number(incomeData.amount),
       };
 
-      if (incomeData.date) {
-        requestData.date = incomeData.date;
-      }
       const response = await DefaultService.postIncomes(requestData);
       useMascotStore.getState().setExpression("success");
       return response as Income;
@@ -68,11 +61,9 @@ export class IncomeService {
 
       const response = await DefaultService.putIncomes(id, requestData);
       useMascotStore.getState().setExpression("success");
-
       return response as Income;
     } catch (error) {
       useMascotStore.getState().setExpression("error");
-
       console.error(`Error updating income ${id}:`, error);
       throw new Error("Failed to update income");
     }
@@ -85,90 +76,8 @@ export class IncomeService {
       useMascotStore.getState().setExpression("success");
     } catch (error) {
       useMascotStore.getState().setExpression("error");
-
       console.error(`Error deleting income ${id}:`, error);
       throw new Error("Failed to delete income");
     }
   }
-
-  //GET ALL income categories (custom and system)
-  static async getIncomeCategories() {
-    try {
-      const response = await DefaultService.getIncomesCategories();
-      useMascotStore.getState().setExpression("success");
-
-      return response as IncomeCategory[];
-    } catch (error) {
-      useMascotStore.getState().setExpression("error");
-
-      console.error("Error fetching income categories:", error);
-      throw new Error("Failed to fetch income categories");
-    }
-  }
-
-  //GET custom categories
-  static async getCustomIncomeCategories() {
-    try {
-      const response = await DefaultService.getIncomesCustomCategories();
-      useMascotStore.getState().setExpression("success");
-
-      return response as IncomeCategory[];
-    } catch (error) {
-      useMascotStore.getState().setExpression("error");
-
-      console.error("Error fetching custom income categories:", error);
-      throw new Error("Failed to fetch custom income categories");
-    }
-  }
-
-  //POST new category
-  static async createIncomeCategory(name: string) {
-    try {
-      const response = await DefaultService.postIncomesCustomCategories({
-        category_name: name,
-      });
-      useMascotStore.getState().setExpression("success");
-
-      return response as IncomeCategory;
-    } catch (error) {
-      useMascotStore.getState().setExpression("error");
-
-      console.error("Error creating income category:", error);
-      throw new Error("Failed to create income category");
-    }
-  }
-
-  //UPDATE a category
-  static async updateIncomeCategory(
-    id: string,
-    name: string
-  ): Promise<IncomeCategory> {
-    try {
-      const response = await DefaultService.putIncomesCustomCategories(id, {
-        category_name: name,
-      });
-      useMascotStore.getState().setExpression("success");
-
-      return response as IncomeCategory;
-    } catch (error) {
-      useMascotStore.getState().setExpression("error");
-
-      console.error(`Error updating income category ${id}:`, error);
-      throw new Error("Failed to update income category");
-    }
-  }
-
-  //DELETE category
-  static async deleteIncomeCategory(id: string) {
-    try {
-      useMascotStore.getState().setExpression("success");
-
-      await DefaultService.deleteIncomesCustomCategories(id);
-    } catch (error) {
-      useMascotStore.getState().setExpression("error");
-
-      console.error(`Error deleting income category ${id}:`, error);
-      throw new Error("Failed to delete income category");
-    }
-  }
 }
diff --git a/client/src/types/Income.ts b/client/src/types/Income.ts
index 1a11bb1..e9ca23f 100644
--- a/client/src/types/Income.ts
+++ b/client/src/types/Income.ts
@@ -6,8 +6,6 @@ export interface Income {
   description?: string;
   creation_date: string;
   user_id: number;
-  category_id: number;
-  category?: IncomeCategory;
 }
 
 export interface IncomeFormData {
@@ -15,25 +13,13 @@ export interface IncomeFormData {
   date: string;
   source: string;
   description: string;
-  category_id: number;
-}
-
-export interface IncomeCategory {
-  category_id: number;
-  category_name: string;
-  icon_url?: string;
-  is_custom: boolean;
-  user_id?: number;
-  created_at: string;
-  updated_at: string;
 }
 
 export interface CreateIncomeRequest {
   amount: number;
-  date?: string;
+  date: string;
   source: string;
   description?: string;
-  category_id: number;
 }
 
 export interface UpdateIncomeRequest {
@@ -41,5 +27,4 @@ export interface UpdateIncomeRequest {
   date?: string;
   source?: string;
   description?: string;
-  category_id?: number;
 }
diff --git a/client/src/utils/validators.ts b/client/src/utils/validators.ts
new file mode 100644
index 0000000..278f8be
--- /dev/null
+++ b/client/src/utils/validators.ts
@@ -0,0 +1,32 @@
+import type { IncomeFormData } from "../types/Income";
+
+export const validateIncomeData = (data: IncomeFormData) => {
+  const errors: Record<string, string> = {};
+
+  const amount = data.amount;
+  if (isNaN(amount) || amount <= 0) {
+    errors.amount = "Amount must be greater than 0";
+  }
+
+  if (data.source && data.source.length > 100) {
+    errors.source = "Source cannot exceed 100 characters";
+  }
+
+  if (data.description && data.description.length > 500) {
+    errors.description = "Description cannot exceed 500 characters";
+  }
+
+  return errors;
+};
+
+export const validateDateRange = (start?: string, end?: string) => {
+  if (!start || !end) return null;
+
+  const startDate = new Date(start);
+  const endDate = new Date(end);
+
+  if (startDate > endDate) {
+    return "Start date cannot be after end date";
+  }
+  return null;
+};
diff --git a/server/controllers/income.controller.js b/server/controllers/income.controller.js
index 2226afa..fed4fcf 100644
--- a/server/controllers/income.controller.js
+++ b/server/controllers/income.controller.js
@@ -4,35 +4,15 @@ import { asyncHandler } from "../utils/asyncHandler.js";
 //---------------INCOME---------------//
 
 export const createIncome = asyncHandler(async (req, res) => {
-  const { amount, date, source, description, category_id } = req.body;
-
-  if (!amount) {
-    return res.status(400).json({ error: "Missing required fields" });
-  }
+  const { amount, date, source, description } = req.body;
 
   const incomeData = {
     amount: parseFloat(amount),
     source: source || "",
     description: description || "",
+    date: new Date(date),
   };
 
-  if (category_id) {
-    incomeData.category = { connect: { category_id: parseInt(category_id) } };
-  } else {
-    incomeData.category = { connect: { category_id: 1 } };
-  }
-
-  if (date) {
-    const parsedDate = new Date(date);
-    if (!isNaN(parsedDate.getTime())) {
-      incomeData.date = parsedDate;
-    } else {
-      return res.status(400).json({ error: "Invalid date format" });
-    }
-  } else {
-    incomeData.date = new Date();
-  }
-
   try {
     const income = await incomeService.createIncome(
       req.user.user_id,
@@ -41,14 +21,6 @@ export const createIncome = asyncHandler(async (req, res) => {
     res.status(201).json(income);
   } catch (error) {
     console.error("Error creating income:", error);
-
-    if (
-      error.message.includes("category") ||
-      error.message.includes("Category")
-    ) {
-      return res.status(400).json({ error: "Invalid category specified" });
-    }
-
     res.status(500).json({ error: "Failed to create income" });
   }
 });
@@ -61,8 +33,6 @@ export const getIncomes = asyncHandler(async (req, res) => {
     const parsedStart = new Date(start);
     if (!isNaN(parsedStart.getTime())) {
       filters.start = parsedStart;
-    } else {
-      return res.status(400).json({ error: "Invalid start date format" });
     }
   }
 
@@ -70,8 +40,6 @@ export const getIncomes = asyncHandler(async (req, res) => {
     const parsedEnd = new Date(end);
     if (!isNaN(parsedEnd.getTime())) {
       filters.end = parsedEnd;
-    } else {
-      return res.status(400).json({ error: "Invalid end date format" });
     }
   }
 
@@ -87,10 +55,6 @@ export const getIncomes = asyncHandler(async (req, res) => {
 export const getIncome = asyncHandler(async (req, res) => {
   const { id } = req.params;
 
-  if (!id || isNaN(parseInt(id))) {
-    return res.status(400).json({ error: "Invalid income ID" });
-  }
-
   try {
     const income = await incomeService.getIncomeById(id, req.user.user_id);
 
@@ -108,38 +72,20 @@ export const getIncome = asyncHandler(async (req, res) => {
 export const updateIncome = asyncHandler(async (req, res) => {
   const { id } = req.params;
 
-  if (!id || isNaN(parseInt(id))) {
-    return res.status(400).json({ error: "Invalid income ID" });
+  if (Object.keys(req.body).length === 0) {
+    return res.status(400).json({
+      error: "No update data provided",
+    });
   }
 
-  const updates = req.body;
+  const updates = { ...req.body };
 
   if (updates.amount !== undefined) {
-    if (isNaN(parseFloat(updates.amount))) {
-      return res.status(400).json({ error: "Invalid amount" });
-    }
     updates.amount = parseFloat(updates.amount);
   }
 
   if (updates.date) {
-    const parsedDate = new Date(updates.date);
-    if (isNaN(parsedDate.getTime())) {
-      return res.status(400).json({ error: "Invalid date format" });
-    }
-    updates.date = parsedDate;
-  }
-
-  if (updates.category_id !== undefined) {
-    if (updates.category_id === null || updates.category_id === "") {
-      updates.category = { connect: { category_id: 1 } };
-    } else {
-      const categoryId = parseInt(updates.category_id);
-      if (isNaN(categoryId)) {
-        return res.status(400).json({ error: "Invalid category ID" });
-      }
-      updates.category = { connect: { category_id: categoryId } };
-    }
-    delete updates.category_id;
+    updates.date = new Date(updates.date);
   }
 
   try {
@@ -148,6 +94,11 @@ export const updateIncome = asyncHandler(async (req, res) => {
       req.user.user_id,
       updates
     );
+
+    if (!income) {
+      return res.status(404).json({ error: "Income not found" });
+    }
+
     res.json(income);
   } catch (error) {
     console.error("Error updating income:", error);
@@ -161,13 +112,6 @@ export const updateIncome = asyncHandler(async (req, res) => {
         .json({ error: "Income not found or not authorized" });
     }
 
-    if (
-      error.message.includes("category") ||
-      error.message.includes("Category")
-    ) {
-      return res.status(400).json({ error: "Invalid category specified" });
-    }
-
     res.status(500).json({ error: "Failed to update income" });
   }
 });
@@ -175,12 +119,9 @@ export const updateIncome = asyncHandler(async (req, res) => {
 export const deleteIncome = asyncHandler(async (req, res) => {
   const { id } = req.params;
 
-  if (!id || isNaN(parseInt(id))) {
-    return res.status(400).json({ error: "Invalid income ID" });
-  }
-
   try {
     await incomeService.deleteIncome(id, req.user.user_id);
+
     res.status(204).send();
   } catch (error) {
     console.error("Error deleting income:", error);
@@ -197,122 +138,3 @@ export const deleteIncome = asyncHandler(async (req, res) => {
     res.status(500).json({ error: "Failed to delete income" });
   }
 });
-
-//---------------INCOME CATEGORIES---------------//
-
-export const getIncomeCategories = asyncHandler(async (req, res) => {
-  try {
-    const categories = await incomeService.getIncomeCategories(
-      req.user.user_id
-    );
-    res.json(categories);
-  } catch (error) {
-    console.error("Error fetching income categories:", error);
-    res.status(500).json({ error: "Failed to fetch income categories" });
-  }
-});
-
-export const getIncomeCategoriesByUser = asyncHandler(async (req, res) => {
-  try {
-    const categories = await incomeService.getIncomeCategoriesByUser(
-      req.user.user_id
-    );
-    res.json(categories);
-  } catch (error) {
-    console.error("Error fetching user income categories:", error);
-    res.status(500).json({ error: "Failed to fetch user income categories" });
-  }
-});
-
-export const createIncomeCategory = asyncHandler(async (req, res) => {
-  try {
-    const { category_name, icon_url, icon_emoji } = req.body;
-
-    if (!category_name) {
-      return res.status(400).json({ error: "Category name is required" });
-    }
-
-    const category = await incomeService.createIncomeCategory(
-      req.user.user_id,
-      {
-        category_name,
-        icon_url,
-        icon_emoji,
-      }
-    );
-    res.status(201).json(category);
-  } catch (error) {
-    console.error("Error creating income category:", error);
-
-    if (error.message.includes("already exists")) {
-      return res.status(409).json({ error: error.message });
-    }
-
-    res.status(500).json({ error: "Failed to create income category" });
-  }
-});
-
-export const updateIncomeCategory = asyncHandler(async (req, res) => {
-  try {
-    const { id } = req.params;
-    const { category_name, icon_url, icon_emoji } = req.body;
-
-    if (!category_name) {
-      return res.status(400).json({ error: "Category name is required" });
-    }
-
-    if (!id || isNaN(parseInt(id))) {
-      return res.status(400).json({ error: "Invalid category ID" });
-    }
-
-    const category = await incomeService.updateIncomeCategory(
-      id,
-      req.user.user_id,
-      { category_name, icon_url, icon_emoji }
-    );
-    res.json(category);
-  } catch (error) {
-    console.error("Error updating income category:", error);
-
-    if (
-      error.message.includes("not found") ||
-      error.message.includes("not authorized")
-    ) {
-      return res.status(404).json({ error: error.message });
-    }
-
-    if (error.message.includes("already exists")) {
-      return res.status(409).json({ error: error.message });
-    }
-
-    res.status(500).json({ error: "Failed to update income category" });
-  }
-});
-
-export const deleteIncomeCategory = asyncHandler(async (req, res) => {
-  try {
-    const { id } = req.params;
-
-    if (!id || isNaN(parseInt(id))) {
-      return res.status(400).json({ error: "Invalid category ID" });
-    }
-
-    await incomeService.deleteIncomeCategory(id, req.user.user_id);
-    res.status(204).send();
-  } catch (error) {
-    console.error("Error deleting income category:", error);
-
-    if (
-      error.message.includes("not found") ||
-      error.message.includes("not authorized")
-    ) {
-      return res.status(404).json({ error: error.message });
-    }
-
-    if (error.message.includes("being used")) {
-      return res.status(409).json({ error: error.message });
-    }
-
-    res.status(500).json({ error: "Failed to delete income category" });
-  }
-});
diff --git a/server/docs/Expense Tracker API.yaml b/server/docs/Expense Tracker API.yaml
index 5564428..be252b6 100644
--- a/server/docs/Expense Tracker API.yaml	
+++ b/server/docs/Expense Tracker API.yaml	
@@ -143,67 +143,15 @@ paths:
           description: Expense updated
     delete:
       summary: Delete an expense
+      parameters:
+        - in: path
+          name: id
+          required: true
+          schema:
+            type: string
       responses:
         "204":
           description: Expense deleted
-  /incomes/categories:
-    get:
-      summary: Get system income categories
-      responses:
-        "200":
-          description: List of system income categories
-  /incomes/custom-categories:
-    get:
-      summary: Get user's custom income categories
-      responses:
-        "200":
-          description: List of user's custom income categories
-    post:
-      summary: Create a new custom income category
-      requestBody:
-        required: true
-        content:
-          application/json:
-            schema:
-              type: object
-              required: [category_name]
-              properties:
-                category_name:
-                  type: string
-                icon_url:
-                  type: string
-      responses:
-        "201":
-          description: Income category created
-  /incomes/custom-categories/{id}:
-    parameters:
-      - in: path
-        name: id
-        required: true
-        schema:
-          type: string
-    put:
-      summary: Update an income category
-      requestBody:
-        required: true
-        content:
-          application/json:
-            schema:
-              type: object
-              required: [category_name]
-              properties:
-                category_name:
-                  type: string
-                icon_url:
-                  type: string
-      responses:
-        "200":
-          description: Income category updated
-    delete:
-      summary: Delete an income category
-      responses:
-        "204":
-          description: Income category deleted
   /incomes:
     get:
       summary: List all incomes
@@ -226,7 +174,7 @@ paths:
           application/json:
             schema:
               type: object
-              required: [amount]
+              required: [amount, date]
               properties:
                 amount:
                   type: number
@@ -236,8 +184,6 @@ paths:
                   type: string
                 description:
                   type: string
-                category_id:
-                  type: number
       responses:
         "201":
           description: Income created
@@ -275,6 +221,12 @@ paths:
           description: Income updated
     delete:
       summary: Delete an income entry
+      parameters:
+        - in: path
+          name: id
+          required: true
+          schema:
+            type: string
       responses:
         "204":
           description: Income deleted
@@ -301,14 +253,14 @@ paths:
           description: Category created
 
   /categories/{id}:
-    parameters:
-      - in: path
-        name: id
-        required: true
-        schema:
-          type: string
     put:
       summary: Rename a category
+      parameters:
+        - in: path
+          name: id
+          required: true
+          schema:
+            type: string
       requestBody:
         content:
           application/json:
@@ -322,6 +274,12 @@ paths:
           description: Category updated
     delete:
       summary: Delete a category
+      parameters:
+        - in: path
+          name: id
+          required: true
+          schema:
+            type: string
       responses:
         "204":
           description: Category deleted
diff --git a/server/middleware/incomeValidation.js b/server/middleware/incomeValidation.js
new file mode 100644
index 0000000..5dbb76f
--- /dev/null
+++ b/server/middleware/incomeValidation.js
@@ -0,0 +1,105 @@
+import { BadRequestError } from "../utils/errors.js";
+
+export const validateIncomeData = () => (req, _res, next) => {
+  const { amount, source, description } = req.body;
+  const errors = [];
+
+  if (amount !== undefined) {
+    const parsedAmount = parseFloat(amount);
+    if (isNaN(parsedAmount) || parsedAmount <= 0) {
+      errors.push("Amount must be greater than 0");
+    }
+  }
+
+  if (source && source.length > 100) {
+    errors.push("Source cannot exceed 100 characters");
+  }
+
+  if (description && description.length > 500) {
+    errors.push("Description cannot exceed 500 characters");
+  }
+
+  if (errors.length > 0) {
+    return next(new BadRequestError("Validation failed", errors));
+  }
+
+  next();
+};
+
+export const validateDateRange = () => (req, _res, next) => {
+  const { start, end } = req.query;
+  const errors = [];
+
+  if (start && end) {
+    const startDate = new Date(start);
+    const endDate = new Date(end);
+
+    if (startDate > endDate) {
+      errors.push("Start date cannot be after end date");
+    }
+  }
+
+  if (errors.length > 0) {
+    return next(new BadRequestError("Invalid date range", errors));
+  }
+
+  next();
+};
+
+export const requireIncomeFields = () => (req, _res, next) => {
+  const { amount, date } = req.body;
+
+  if (!amount || !date) {
+    return next(
+      new BadRequestError(
+        "Missing required fields: amount and date are required"
+      )
+    );
+  }
+
+  next();
+};
+
+export const validateDateFormat = () => (req, _res, next) => {
+  const { date } = req.body;
+
+  if (date) {
+    const parsedDate = new Date(date);
+    if (isNaN(parsedDate.getTime())) {
+      return next(new BadRequestError("Invalid date format"));
+    }
+  }
+
+  next();
+};
+
+
+
+export const sanitizeIncomeData = () => (req, _res, next) => {
+  const { source, description } = req.body;
+
+  if (typeof source === "string") {
+    req.body.source = source.trim();
+  }
+
+  if (typeof description === "string") {
+    req.body.description = description.trim();
+  }
+
+  next();
+};
+
+export const validateIncomeCreate = [
+  requireIncomeFields(),
+  sanitizeIncomeData(),
+  validateDateFormat(),
+  validateIncomeData(),
+];
+
+export const validateIncomeUpdate = [
+  sanitizeIncomeData(),
+  validateDateFormat(),
+  validateIncomeData(),
+];
+
+export const validateIncomeQuery = [validateDateRange()];
diff --git a/server/prisma/schema.prisma b/server/prisma/schema.prisma
index 7f9dd94..7235f00 100644
--- a/server/prisma/schema.prisma
+++ b/server/prisma/schema.prisma
@@ -14,62 +14,48 @@ datasource db {
 }
 
 model User {
-  user_id           Int              @id @default(autoincrement())
-  username          String           @db.VarChar(50)
-  email             String           @unique @db.VarChar(255)
-  hashed_password   String           @db.VarChar(255)
-  firstname         String           @db.VarChar(100)
-  lastname          String           @db.VarChar(100)
-  created_at        DateTime         @default(now())
-  updated_at        DateTime         @updatedAt
-  expenses          Expense[]
-  incomes           Income[]
-  expense_categories ExpenseCategory[]
-  income_categories IncomeCategory[]
+  user_id         Int      @id @default(autoincrement())
+  username        String?  @db.VarChar(50)
+  email           String   @unique @db.VarChar(255)
+  hashed_password String   @db.VarChar(255)
+  firstname       String?  @db.VarChar(100)
+  lastname        String?  @db.VarChar(100)
+  created_at      DateTime @default(now())
+  updated_at      DateTime @updatedAt
+
+  expenses   Expense[]
+  incomes    Income[]
+  categories ExpenseCategory[]
 
   @@map("user")
 }
 
 model ExpenseCategory {
-  category_id   Int      @id @default(autoincrement())
-  category_name String   @db.VarChar(50)
-  icon_url      String?  @db.VarChar(500)
-  is_custom     Boolean  @default(false)
-  user_id       Int?
-  user          User?    @relation(fields: [user_id], references: [user_id], onDelete: Cascade)
-  expenses      Expense[]
-  created_at    DateTime @default(now())
-  updated_at    DateTime @updatedAt
-
-  @@map("expense_category")
-}
-
-model IncomeCategory {
   category_id   Int       @id @default(autoincrement())
   category_name String    @db.VarChar(50)
   icon_url      String?   @db.VarChar(500)
   is_custom     Boolean   @default(false)
   user_id       Int?
   user          User?     @relation(fields: [user_id], references: [user_id], onDelete: Cascade)
-  incomes       Income[]
+  expenses      Expense[]
   created_at    DateTime  @default(now())
   updated_at    DateTime  @updatedAt
 
-  @@map("income_category")
+  @@map("expense_category")
 }
 
 model Expense {
-  expense_id     Int      @id @default(autoincrement())
+  expense_id     Int             @id @default(autoincrement())
   amount         Float
-  description    String?  @db.VarChar(2000)
-  type           String   @default("ONE_TIME") @db.VarChar(20)
-  receipt_upload String?  @db.VarChar(2000)
-  creation_date  DateTime @default(now())
+  description    String?         @db.VarChar(2000)
+  type           String          @default("ONE_TIME") @db.VarChar(20)
+  receipt_upload String?         @db.VarChar(2000)
+  creation_date  DateTime        @default(now())
   expense_date   DateTime?
   start_date     DateTime?
   end_date       DateTime?
   user_id        Int
-  user           User     @relation(fields: [user_id], references: [user_id], onDelete: Cascade)
+  user           User            @relation(fields: [user_id], references: [user_id], onDelete: Cascade)
   category_id    Int
   category       ExpenseCategory @relation(fields: [category_id], references: [category_id], onDelete: Cascade)
 
@@ -77,16 +63,20 @@ model Expense {
 }
 
 model Income {
-  income_id      Int      @id @default(autoincrement())
-  amount         Float
-  date           DateTime @default(now())
-  source         String   @db.VarChar(100)
-  description    String?  @db.VarChar(2000)
-  creation_date  DateTime @default(now())
-  user_id        Int
-  user           User     @relation(fields: [user_id], references: [user_id], onDelete: Cascade)
-  category_id    Int
-  category       IncomeCategory @relation(fields: [category_id], references: [category_id], onDelete: Cascade)
+  income_id     Int      @id @default(autoincrement()) @map("id")
+  amount        Float
+  date          DateTime @default(now())
+  source        String?  @db.VarChar(100)
+  description   String?  @db.VarChar(2000)
+  creation_date DateTime @default(now())
+
+  user_id Int
+  user    User @relation(fields: [user_id], references: [user_id], onDelete: Cascade)
 
   @@map("income")
 }
+
+enum ExpenseType {
+  ONE_TIME
+  RECURRING
+}
diff --git a/server/routes/income.route.js b/server/routes/income.route.js
index 32e8cc8..90889f9 100644
--- a/server/routes/income.route.js
+++ b/server/routes/income.route.js
@@ -1,22 +1,25 @@
-import { Router } from 'express';
-import { createIncome, getIncomes, getIncome, updateIncome, deleteIncome, getIncomeCategories, getIncomeCategoriesByUser,createIncomeCategory, updateIncomeCategory, deleteIncomeCategory } from '../controllers/income.controller.js';
+import { Router } from "express";
+import {
+  createIncome,
+  getIncomes,
+  getIncome,
+  updateIncome,
+  deleteIncome,
+} from "../controllers/income.controller.js";
+import {
+  validateIncomeCreate,
+  validateIncomeUpdate,
+  validateIncomeQuery,
+} from "../middleware/incomeValidation.js";
+import { validateIdParam } from "../middleware/validate.js";
 
 const router = Router();
 
-//INCOME CATEGORY
-router.get('/categories', getIncomeCategories);
-router.get('/custom-categories', getIncomeCategoriesByUser)
-router.post('/custom-categories', createIncomeCategory);
-router.put('/custom-categories/:id', updateIncomeCategory);
-router.delete('/custom-categories/:id', deleteIncomeCategory);
+// INCOME ROUTES
+router.get("/", validateIncomeQuery, getIncomes);
+router.get("/:id", validateIdParam("id"), getIncome);
+router.post("/", validateIncomeCreate, createIncome);
+router.put("/:id", validateIdParam("id"), validateIncomeUpdate, updateIncome);
+router.delete("/:id", validateIdParam("id"), deleteIncome);
 
-//INCOME
-router.get('/', getIncomes);
-router.get('/:id', getIncome);
-router.post('/', createIncome);
-router.put('/:id', updateIncome);
-router.delete('/:id', deleteIncome);
-
-
-
-export default router;
\ No newline at end of file
+export default router;
diff --git a/server/server.js b/server/server.js
index 67dd472..623554c 100644
--- a/server/server.js
+++ b/server/server.js
@@ -28,24 +28,26 @@ app.use('/api/categories', categoryRoutes);
 // Initialize a single Prisma client instance
 const prisma = new PrismaClient();
 
-app.get('/', (req, res) => {
-  res.json({ message: 'Expense Tracker API', status: 'running' });
+app.get("/", (req, res) => {
+  res.json({ message: "Expense Tracker API", status: "running" });
 });
 
-app.get('/api/health', (req, res) => {
-  res.json({ status: 'OK' });
+app.get("/api/health", (req, res) => {
+  res.json({ status: "OK" });
 });
 
 // DB health check using Prisma raw query; does not require any models
-app.get('/api/db-check', async (_req, res) => {
+app.get("/api/db-check", async (_req, res) => {
   try {
     const result = await prisma.$queryRaw`SELECT NOW() as now`;
     // Result shape differs by driver; normalize to { now }
-    const now = Array.isArray(result) ? result[0]?.now ?? result[0]?.NOW ?? result[0] : result?.now ?? result;
+    const now = Array.isArray(result)
+      ? result[0]?.now ?? result[0]?.NOW ?? result[0]
+      : result?.now ?? result;
     res.json({ ok: true, now });
   } catch (err) {
-    console.error('DB check failed:', err);
-    res.status(500).json({ ok: false, error: 'DB connection failed' });
+    console.error("DB check failed:", err);
+    res.status(500).json({ ok: false, error: "DB connection failed" });
   }
 });
 
@@ -53,10 +55,10 @@ app.get('/api/db-check', async (_req, res) => {
 // eslint-disable-next-line no-unused-vars
 app.use((err, _req, res, _next) => {
   const status = err?.status || 500;
-  const payload = { error: err?.message || 'Internal Server Error' };
+  const payload = { error: err?.message || "Internal Server Error" };
   if (err?.details) payload.details = err.details;
   if (status >= 500) {
-    console.error('Unhandled error:', err);
+    console.error("Unhandled error:", err);
   }
   res.status(status).json(payload);
 });
diff --git a/server/services/income.service.js b/server/services/income.service.js
index d285487..b5d9c00 100644
--- a/server/services/income.service.js
+++ b/server/services/income.service.js
@@ -3,19 +3,18 @@ import { prisma } from "../db/prisma.js";
 //---------------INCOME---------------//
 
 //POST
-const createIncome = async (userId, data) => {
+const createIncome = async (user_id, data) => {
   return await prisma.income.create({
     data: {
       ...data,
-      user: { connect: { user_id: userId } },
+      user: { connect: { user_id } },
     },
-    include: { category: true },
   });
 };
 
 //GET ALL (with start and end date query params)
-const getIncomes = async (userId, filters = {}) => {
-  const where = { user_id: userId };
+const getIncomes = async (user_id, filters = {}) => {
+  const where = { user_id };
 
   if (filters.start || filters.end) {
     where.date = {};
@@ -25,26 +24,21 @@ const getIncomes = async (userId, filters = {}) => {
 
   return await prisma.income.findMany({
     where,
-    include: { category: true },
-    orderBy: [
-      { date: "desc" },
-      { creation_date: "desc" }, // might change { income_id: "desc" } if that doesnt work
-    ],
+    orderBy: [{ date: "desc" }, { creation_date: "desc" }],
   });
 };
 
 //GET BY ID
-const getIncomeById = async (id, userId) => {
+const getIncomeById = async (id, user_id) => {
   return await prisma.income.findFirst({
-    where: { income_id: parseInt(id), user_id: userId },
-    include: { category: true },
+    where: { income_id: parseInt(id), user_id },
   });
 };
 
 //UPDATE
-const updateIncome = async (id, userId, data) => {
+const updateIncome = async (id, user_id, data) => {
   const income = await prisma.income.findFirst({
-    where: { income_id: parseInt(id), user_id: userId },
+    where: { income_id: parseInt(id), user_id },
   });
 
   if (!income) {
@@ -54,14 +48,13 @@ const updateIncome = async (id, userId, data) => {
   return await prisma.income.update({
     where: { income_id: parseInt(id) },
     data,
-    include: { category: true },
   });
 };
 
 //DELETE
-const deleteIncome = async (id, userId) => {
+const deleteIncome = async (id, user_id) => {
   const income = await prisma.income.findFirst({
-    where: { income_id: parseInt(id), user_id: userId },
+    where: { income_id: parseInt(id), user_id },
   });
 
   if (!income) {
@@ -73,112 +66,10 @@ const deleteIncome = async (id, userId) => {
   });
 };
 
-//---------------INCOME CATEGORY---------------//
-
-//GET ALL
-const getIncomeCategories = async (userId) => {
-  return await prisma.incomeCategory.findMany({
-    where: {
-      OR: [{ user_id: null }, { user_id: userId }],
-    },
-    orderBy: [{ is_custom: "asc" }, { category_name: "asc" }],
-  });
-};
-
-//GET ALL BY USER
-const getIncomeCategoriesByUser = async (userId) => {
-  return await prisma.incomeCategory.findMany({
-    where: {
-      user_id: userId,
-    },
-    orderBy: [{ is_custom: "asc" }, { category_name: "asc" }],
-  });
-};
-
-//POST
-const createIncomeCategory = async (userId, data) => {
-  const existingCategory = await prisma.incomeCategory.findFirst({
-    where: {
-      category_name: data.category_name,
-      user_id: userId,
-    },
-  });
-
-  if (existingCategory) {
-    throw new Error("Category already exists");
-  }
-
-  return await prisma.incomeCategory.create({
-    data: {
-      ...data,
-      is_custom: true,
-      user: { connect: { user_id: userId } },
-    },
-  });
-};
-
-//UPDATE
-const updateIncomeCategory = async (id, userId, data) => {
-  const category = await prisma.incomeCategory.findFirst({
-    where: { category_id: parseInt(id), user_id: userId },
-  });
-
-  if (!category) {
-    throw new Error("Category not found or not authorized");
-  }
-
-  if (data.category_name) {
-    const duplicateCategory = await prisma.incomeCategory.findFirst({
-      where: {
-        category_name: data.category_name,
-        user_id: userId,
-        NOT: { category_id: parseInt(id) },
-      },
-    });
-
-    if (duplicateCategory) {
-      throw new Error("Category name already exists");
-    }
-  }
-
-  return await prisma.incomeCategory.update({
-    where: { category_id: parseInt(id) },
-    data,
-  });
-};
-
-//DELETE
-const deleteIncomeCategory = async (id, userId) => {
-  const category = await prisma.incomeCategory.findFirst({
-    where: { category_id: parseInt(id), user_id: userId },
-  });
-
-  if (!category) {
-    throw new Error("Category not found or not authorized");
-  }
-
-  const incomesUsingCategory = await prisma.income.count({
-    where: { category_id: parseInt(id) },
-  });
-
-  if (incomesUsingCategory > 0) {
-    throw new Error("Cannot delete category that is being used by incomes");
-  }
-
-  await prisma.incomeCategory.delete({
-    where: { category_id: parseInt(id) },
-  });
-};
-
 export default {
   createIncome,
   getIncomes,
   getIncomeById,
   updateIncome,
   deleteIncome,
-  getIncomeCategories,
-  createIncomeCategory,
-  getIncomeCategoriesByUser,
-  updateIncomeCategory,
-  deleteIncomeCategory,
 };