diff --git a/desktop/mate/mate-panel/files/1.patch b/desktop/mate/mate-panel/files/1.patch
deleted file mode 100644
index 65270c0a19..0000000000
--- a/desktop/mate/mate-panel/files/1.patch
+++ /dev/null
@@ -1,76 +0,0 @@
---- data/default.layout 2014-06-07 07:42:15.417844985 +0300
-+++ data/pisi.layout 2014-06-10 18:33:36.431919679 +0300
-@@ -1,40 +1,20 @@
--[Toplevel top]
--expand=true
--orientation=top
--size=24
--
- [Toplevel bottom]
- expand=true
- orientation=bottom
- size=24
-
- [Object menu-bar]
--object-type=menu-bar
--toplevel-id=top
--position=0
--locked=true
--
--[Object notification-area]
--object-type=applet
--applet-iid=NotificationAreaAppletFactory::NotificationArea
--toplevel-id=top
--position=10
--panel-right-stick=true
--locked=true
--
--[Object clock]
- object-type=applet
--applet-iid=ClockAppletFactory::ClockApplet
--toplevel-id=top
-+applet-iid=GNOMEMainMenuFactory::GNOMEMainMenu
-+toplevel-id=bottom
- position=0
--panel-right-stick=true
- locked=true
-
--[Object show-desktop]
--object-type=applet
--applet-iid=WnckletFactory::ShowDesktopApplet
-+[Object web-browser]
-+object-type=launcher
-+launcher-location=/usr/share/applications/mozillafirefox.desktop
- toplevel-id=bottom
--position=0
-+position=10
- locked=true
-
- [Object window-list]
-@@ -44,6 +24,14 @@
- position=20
- locked=true
-
-+[Object notification-area]
-+object-type=applet
-+applet-iid=NotificationAreaAppletFactory::NotificationArea
-+toplevel-id=bottom
-+position=10
-+panel-right-stick=true
-+locked=true
-+
- [Object workspace-switcher]
- object-type=applet
- applet-iid=WnckletFactory::WorkspaceSwitcherApplet
-@@ -51,3 +39,11 @@
- position=0
- panel-right-stick=true
- locked=true
-+
-+[Object clock]
-+object-type=applet
-+applet-iid=ClockAppletFactory::ClockApplet
-+toplevel-id=bottom
-+position=10
-+panel-right-stick=true
-+locked=true
diff --git a/desktop/mate/mate-panel/files/a.patch b/desktop/mate/mate-panel/files/a.patch
deleted file mode 100644
index 65270c0a19..0000000000
--- a/desktop/mate/mate-panel/files/a.patch
+++ /dev/null
@@ -1,76 +0,0 @@
---- data/default.layout 2014-06-07 07:42:15.417844985 +0300
-+++ data/pisi.layout 2014-06-10 18:33:36.431919679 +0300
-@@ -1,40 +1,20 @@
--[Toplevel top]
--expand=true
--orientation=top
--size=24
--
- [Toplevel bottom]
- expand=true
- orientation=bottom
- size=24
-
- [Object menu-bar]
--object-type=menu-bar
--toplevel-id=top
--position=0
--locked=true
--
--[Object notification-area]
--object-type=applet
--applet-iid=NotificationAreaAppletFactory::NotificationArea
--toplevel-id=top
--position=10
--panel-right-stick=true
--locked=true
--
--[Object clock]
- object-type=applet
--applet-iid=ClockAppletFactory::ClockApplet
--toplevel-id=top
-+applet-iid=GNOMEMainMenuFactory::GNOMEMainMenu
-+toplevel-id=bottom
- position=0
--panel-right-stick=true
- locked=true
-
--[Object show-desktop]
--object-type=applet
--applet-iid=WnckletFactory::ShowDesktopApplet
-+[Object web-browser]
-+object-type=launcher
-+launcher-location=/usr/share/applications/mozillafirefox.desktop
- toplevel-id=bottom
--position=0
-+position=10
- locked=true
-
- [Object window-list]
-@@ -44,6 +24,14 @@
- position=20
- locked=true
-
-+[Object notification-area]
-+object-type=applet
-+applet-iid=NotificationAreaAppletFactory::NotificationArea
-+toplevel-id=bottom
-+position=10
-+panel-right-stick=true
-+locked=true
-+
- [Object workspace-switcher]
- object-type=applet
- applet-iid=WnckletFactory::WorkspaceSwitcherApplet
-@@ -51,3 +39,11 @@
- position=0
- panel-right-stick=true
- locked=true
-+
-+[Object clock]
-+object-type=applet
-+applet-iid=ClockAppletFactory::ClockApplet
-+toplevel-id=bottom
-+position=10
-+panel-right-stick=true
-+locked=true
diff --git a/desktop/mate/mate-panel/files/default.layout b/desktop/mate/mate-panel/files/default.layout
deleted file mode 100644
index 77923b4203..0000000000
--- a/desktop/mate/mate-panel/files/default.layout
+++ /dev/null
@@ -1,53 +0,0 @@
-[Toplevel top]
-expand=true
-orientation=top
-size=24
-
-[Toplevel bottom]
-expand=true
-orientation=bottom
-size=24
-
-[Object menu-bar]
-object-type=menu-bar
-toplevel-id=top
-position=0
-locked=true
-
-[Object notification-area]
-object-type=applet
-applet-iid=NotificationAreaAppletFactory::NotificationArea
-toplevel-id=top
-position=10
-panel-right-stick=true
-locked=true
-
-[Object clock]
-object-type=applet
-applet-iid=ClockAppletFactory::ClockApplet
-toplevel-id=top
-position=0
-panel-right-stick=true
-locked=true
-
-[Object show-desktop]
-object-type=applet
-applet-iid=WnckletFactory::ShowDesktopApplet
-toplevel-id=bottom
-position=0
-locked=true
-
-[Object window-list]
-object-type=applet
-applet-iid=WnckletFactory::WindowListApplet
-toplevel-id=bottom
-position=20
-locked=true
-
-[Object workspace-switcher]
-object-type=applet
-applet-iid=WnckletFactory::WorkspaceSwitcherApplet
-toplevel-id=bottom
-position=0
-panel-right-stick=true
-locked=true
diff --git a/desktop/mate/mate-panel/files/mate-panel-pisi-linux-configure.patch b/desktop/mate/mate-panel/files/mate-panel-pisi-linux-configure.patch
deleted file mode 100644
index 3fccd72f22..0000000000
--- a/desktop/mate/mate-panel/files/mate-panel-pisi-linux-configure.patch
+++ /dev/null
@@ -1,88 +0,0 @@
---- data/default-layout.mate.OSmanOS 2013-11-15 16:25:41.000000000 +0200
-+++ data/default-layout.mate 2014-02-05 21:33:16.375153580 +0200
-@@ -1,8 +1,3 @@
--[Toplevel top]
--expand=true
--orientation=top
--size=24
--
- [Toplevel bottom]
- expand=true
- orientation=bottom
-@@ -10,38 +5,59 @@
-
- [Object menu-bar]
- object-type=menu-bar
--toplevel-id=top
-+toplevel-id=bottom
- position=0
- locked=true
-
--[Object notification-area]
-+[Object show-desktop]
- object-type=applet
--applet-iid=NotificationAreaAppletFactory::NotificationArea
--toplevel-id=top
-+applet-iid=WnckletFactory::ShowDesktopApplet
-+toplevel-id=bottom
- position=10
--panel-right-stick=true
- locked=true
-
--[Object clock]
--object-type=applet
--applet-iid=ClockAppletFactory::ClockApplet
--toplevel-id=top
--position=0
--panel-right-stick=true
-+[Object file-browser]
-+object-type=launcher
-+launcher-location=/usr/share/applications/caja-browser.desktop
-+toplevel-id=bottom
-+position=20
- locked=true
-
--[Object show-desktop]
--object-type=applet
--applet-iid=WnckletFactory::ShowDesktopApplet
-+[Object terminal]
-+object-type=launcher
-+launcher-location=/usr/share/applications/mate-terminal.desktop
- toplevel-id=bottom
--position=0
-+position=30
-+locked=true
-+
-+[Object web-browser]
-+object-type=launcher
-+launcher-location=/usr/share/applications/mozillafirefox.desktop
-+toplevel-id=bottom
-+position=40
- locked=true
-
- [Object window-list]
- object-type=applet
- applet-iid=WnckletFactory::WindowListApplet
- toplevel-id=bottom
--position=20
-+position=50
-+locked=true
-+
-+[Object notification-area]
-+object-type=applet
-+applet-iid=NotificationAreaAppletFactory::NotificationArea
-+toplevel-id=bottom
-+position=10
-+panel-right-stick=true
-+locked=true
-+
-+[Object clock]
-+object-type=applet
-+applet-iid=ClockAppletFactory::ClockApplet
-+toplevel-id=bottom
-+position=0
-+panel-right-stick=true
- locked=true
-
- [Object workspace-switcher]
-
diff --git a/desktop/mate/mate-panel/files/pisi.layout b/desktop/mate/mate-panel/files/pisi.layout
deleted file mode 100644
index e96b1086e2..0000000000
--- a/desktop/mate/mate-panel/files/pisi.layout
+++ /dev/null
@@ -1,49 +0,0 @@
-[Toplevel bottom]
-expand=true
-orientation=bottom
-size=24
-
-[Object menu-bar]
-object-type=applet
-applet-iid=GNOMEMainMenuFactory::GNOMEMainMenu
-toplevel-id=bottom
-position=0
-locked=true
-
-[Object web-browser]
-object-type=launcher
-launcher-location=/usr/share/applications/mozillafirefox.desktop
-toplevel-id=bottom
-position=10
-locked=true
-
-[Object window-list]
-object-type=applet
-applet-iid=WnckletFactory::WindowListApplet
-toplevel-id=bottom
-position=20
-locked=true
-
-[Object notification-area]
-object-type=applet
-applet-iid=NotificationAreaAppletFactory::NotificationArea
-toplevel-id=bottom
-position=10
-panel-right-stick=true
-locked=true
-
-[Object workspace-switcher]
-object-type=applet
-applet-iid=WnckletFactory::WorkspaceSwitcherApplet
-toplevel-id=bottom
-position=0
-panel-right-stick=true
-locked=true
-
-[Object clock]
-object-type=applet
-applet-iid=ClockAppletFactory::ClockApplet
-toplevel-id=bottom
-position=10
-panel-right-stick=true
-locked=true
diff --git a/desktop/mate/mate-panel/files/pisilinux_layout.patch b/desktop/mate/mate-panel/files/pisilinux_layout.patch
new file mode 100644
index 0000000000..d733dff799
--- /dev/null
+++ b/desktop/mate/mate-panel/files/pisilinux_layout.patch
@@ -0,0 +1,39 @@
+diff -Nuar a/data/default.layout b/data/default.layout
+--- a/data/default.layout 2020-12-16 19:30:37.000000000 +0300
++++ b/data/default.layout 2020-12-16 19:30:37.000000000 +0300
+@@ -14,6 +14,35 @@
+ position=0
+ locked=true
+
++[Object file-browser]
++object-type=launcher
++launcher-location=/usr/share/applications/caja-browser.desktop
++toplevel-id=top
++position=10
++locked=true
++
++[Object terminal]
++object-type=launcher
++launcher-location=/usr/share/applications/mate-terminal.desktop
++toplevel-id=top
++position=20
++locked=true
++
++[Object web-browser]
++object-type=launcher
++launcher-location=/usr/share/applications/firefox.desktop
++toplevel-id=top
++position=30
++locked=true
++
++[Object volume-control]
++object-type=applet
++applet-iid=GvcAppletFactory::GvcApplet
++toplevel-id=top
++position=20
++panel-right-stick=true
++locked=true
++
+ [Object notification-area]
+ object-type=applet
+ applet-iid=NotificationAreaAppletFactory::NotificationArea
diff --git a/desktop/mate/mate-panel/pspec.xml b/desktop/mate/mate-panel/pspec.xml
index b670df1cef..417704af5c 100644
--- a/desktop/mate/mate-panel/pspec.xml
+++ b/desktop/mate/mate-panel/pspec.xml
@@ -29,9 +29,9 @@
intltool
itstool
-
+
+ pisilinux_layout.patch
+