diff --git a/src/pages/DemandNote/Search_Public/SearchForm.js b/src/pages/DemandNote/Search_Public/SearchForm.js
index cd5f59b..da02d3c 100644
--- a/src/pages/DemandNote/Search_Public/SearchForm.js
+++ b/src/pages/DemandNote/Search_Public/SearchForm.js
@@ -13,6 +13,8 @@ import * as ComboData from "utils/ComboData";
 import * as DateUtils from "utils/DateUtils";
 import * as FormatUtils from "utils/FormatUtils";
 import {FormattedMessage, useIntl} from "react-intl";
+import {PNSPS_BUTTON_THEME} from "../../../themes/buttonConst";
+import {ThemeProvider} from "@emotion/react";
 // ==============================|| DASHBOARD - DEFAULT ||============================== //
 
 
@@ -76,12 +78,12 @@ const SearchDemandNoteForm = ({ applySearch, searchCriteria, issueComboData
         >
 
             <form onSubmit={handleSubmit(onSubmit)}>
-                <Grid container sx={{ backgroundColor: '#ffffff', ml: 2, mt: 3, mb: 3 }} width="98%">
+                <Grid container sx={{ backgroundColor: '#ffffff' }} width="98%">
                     {/*row 1*/}
                     <Grid item xs={12}>
                         <CardContent sx={{ px: 2.5, pt: 3 }}>
-                            <Grid item justifyContent="space-between" alignItems="center">
-                                <Typography variant="h5">
+                            <Grid item justifyContent="space-between" alignItems="center" >
+                                <Typography variant="h4">
                                     <FormattedMessage id="search"/>
                                 </Typography>
                             </Grid>
@@ -210,35 +212,25 @@ const SearchDemandNoteForm = ({ applySearch, searchCriteria, issueComboData
 
                     {/*last row*/}
                     <Grid container maxWidth justifyContent="flex-end">
-                        <Grid item sx={{ ml: 3, mr: 3, mb: 3, mt: 3 }}>
-                            <Button
-                                size="large"
-                                variant="contained"
-                                onClick={resetForm}
-                                sx={{
-                                    textTransform: 'capitalize',
-                                    alignItems: 'end'
-                                }}>
-                                <Typography variant="h5">
+                        <ThemeProvider theme={PNSPS_BUTTON_THEME}>
+                            <Grid item sx={{mr: 3, mb: 3}}>
+                                <Button
+                                    variant="contained"
+                                    onClick={resetForm}
+                                >
                                     <FormattedMessage id="reset"/>
-                                </Typography>
-                            </Button>
-                        </Grid>
+                                </Button>
+                            </Grid>
 
-                        <Grid item sx={{ ml: 3, mr: 3, mb: 3, mt: 3 }}>
-                            <Button
-                                size="large"
-                                variant="contained"
-                                type="submit"
-                                sx={{
-                                    textTransform: 'capitalize',
-                                    alignItems: 'end'
-                                }}>
-                                <Typography variant="h5">
+                            <Grid item sx={{ mb: 3 }}>
+                                <Button
+                                    variant="contained"
+                                    type="submit"
+                                >
                                     <FormattedMessage id="submit" />
-                                </Typography>
-                            </Button>
-                        </Grid>
+                                </Button>
+                            </Grid>
+                        </ThemeProvider>
                     </Grid>
                 </Grid>
             </form>
diff --git a/src/pages/DemandNote/Search_Public/index.js b/src/pages/DemandNote/Search_Public/index.js
index 8c246f3..a3bb149 100644
--- a/src/pages/DemandNote/Search_Public/index.js
+++ b/src/pages/DemandNote/Search_Public/index.js
@@ -105,7 +105,7 @@ const UserSearchPage_Individual = () => {
                     </div>
                 </Grid>
                 {/*row 1*/}
-                <Grid item xs={12} md={12} lg={12}>
+                <Grid item xs={12} md={12} lg={12} sx={{mb:-1}}>
                     <SearchForm
                         applySearch={applySearch}
                         orgComboData={orgCombo}
diff --git a/src/pages/Payment/Search_Public/SearchForm.js b/src/pages/Payment/Search_Public/SearchForm.js
index 4030aed..2cbae3e 100644
--- a/src/pages/Payment/Search_Public/SearchForm.js
+++ b/src/pages/Payment/Search_Public/SearchForm.js
@@ -184,15 +184,17 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => {
                         <Button
                             variant="contained"
                             onClick={resetForm}
+                            aria-label={intl.formatMessage({id: 'reset'})}
                         >
                             <FormattedMessage id="reset"/>
                         </Button>
                     </Grid>
 
-                    <Grid item sx={{ ml: 3, mr: 3, mb: 3 }}>
+                    <Grid item sx={{mr: 3, mb: 3 }}>
                         <Button
                             variant="contained"
                             type="submit"
+                            aria-label={intl.formatMessage({id: 'submit'})}
                         >
                             <FormattedMessage id="submit"/>
                         </Button>
diff --git a/src/pages/Proof/Search_Public/SearchForm.js b/src/pages/Proof/Search_Public/SearchForm.js
index ced7420..06964fd 100644
--- a/src/pages/Proof/Search_Public/SearchForm.js
+++ b/src/pages/Proof/Search_Public/SearchForm.js
@@ -283,7 +283,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria, issueComboData
                         </Button>
                     </Grid>
 
-                    <Grid item sx={{ ml: 3, mr: 3, mb: 3 }}>
+                    <Grid item sx={{mr: 3, mb: 3 }}>
                         <Button
                             variant="contained"
                             type="submit"
diff --git a/src/pages/PublicNotice/ListPanel/SearchPublicNoticeForm.js b/src/pages/PublicNotice/ListPanel/SearchPublicNoticeForm.js
index f7e209d..ed035ef 100644
--- a/src/pages/PublicNotice/ListPanel/SearchPublicNoticeForm.js
+++ b/src/pages/PublicNotice/ListPanel/SearchPublicNoticeForm.js
@@ -226,7 +226,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => {
                         </Button>
                     </Grid>
 
-                    <Grid item sx={{ ml: 3, mr: 3}}>
+                    <Grid item>
                         <Button
                             variant="contained"
                             type="submit"
diff --git a/src/pages/User/DetailsPage_Individual/UserInformationCard_Individual_Pub.js b/src/pages/User/DetailsPage_Individual/UserInformationCard_Individual_Pub.js
index 4c9f5ac..0cad3b4 100644
--- a/src/pages/User/DetailsPage_Individual/UserInformationCard_Individual_Pub.js
+++ b/src/pages/User/DetailsPage_Individual/UserInformationCard_Individual_Pub.js
@@ -116,6 +116,7 @@ const UserInformationCard_Individual_Pub = ({ formData, loadDataFun }) => {
                                 <ThemeProvider theme={PNSPS_BUTTON_THEME}>
                                 <Grid item sx={{ mr: 3 }}>
                                         <Button
+                                            aria-label={intl.formatMessage({id: 'back'})}
                                             variant="contained"
                                             onClick={loadDataFun}
                                         >
@@ -125,6 +126,7 @@ const UserInformationCard_Individual_Pub = ({ formData, loadDataFun }) => {
 
                                     <Grid item sx={{ ml: 3, mr: 3 }}>
                                         <Button
+                                            aria-label={intl.formatMessage({id: 'save'})}
                                             variant="contained"
                                             type="submit"
                                             color="success"
@@ -139,6 +141,7 @@ const UserInformationCard_Individual_Pub = ({ formData, loadDataFun }) => {
                                 <ThemeProvider theme={PNSPS_BUTTON_THEME}>
                                 <Grid item sx={{ mr: 3 }}>
                                         <Button
+                                            aria-label={intl.formatMessage({id: 'edit'})}
                                             variant="contained"
                                             onClick={onEditClick}
                                         >
diff --git a/src/pages/User/DetailsPage_Individual/index.js b/src/pages/User/DetailsPage_Individual/index.js
index a587d6b..c780d1e 100644
--- a/src/pages/User/DetailsPage_Individual/index.js
+++ b/src/pages/User/DetailsPage_Individual/index.js
@@ -135,7 +135,10 @@ const UserMaintainPage_Individual = () => {
                     </div>
                 </Grid>
                 <Grid item xs={12}>
-                    <Button title="Back" sx={{ ml: 3.5, mt: 2 }} style={{ border: '2px solid' }} variant="outlined" onClick={() => { navigate("/indUser") }}>
+                    <Button title="Back"
+                            sx={{ ml: 3.5, mt: 2 }} style={{ border: '2px solid' }}
+                            variant="outlined" onClick={() => { navigate("/indUser") }}
+                    >
                         <ForwardIcon style={{ height: 30, width: 50, transform: "rotate(180deg)" }} />
                     </Button>
                 </Grid>