diff --git a/UI/GamepadEmu.h b/UI/GamepadEmu.h
index 655fbaf7c3..6cb7090b62 100644
--- a/UI/GamepadEmu.h
+++ b/UI/GamepadEmu.h
@@ -266,6 +266,7 @@ namespace CustomKey {
{ "Arrow down", ImageID("I_DIR"), ImageID("I_DIR_LINE"), 90.0f, false, true },
{ "Arrow left", ImageID("I_DIR"), ImageID("I_DIR_LINE"), 180.0f, false, false },
{ "Arrow right", ImageID("I_DIR"), ImageID("I_DIR_LINE"), 0.0f, false, false },
+ { "Square", ImageID("I_SQUARE_SHAPE"), ImageID("I_SQUARE_SHAPE_LINE"), 0.0f, false, false },
};
// Button list
diff --git a/android/assets/ui_atlas.meta b/android/assets/ui_atlas.meta
index d5adf2b26c..eed0f838b4 100644
Binary files a/android/assets/ui_atlas.meta and b/android/assets/ui_atlas.meta differ
diff --git a/android/assets/ui_atlas.zim b/android/assets/ui_atlas.zim
index 890802642d..5e9faf12d3 100644
Binary files a/android/assets/ui_atlas.zim and b/android/assets/ui_atlas.zim differ
diff --git a/assets/ui_atlas.meta b/assets/ui_atlas.meta
index d5adf2b26c..eed0f838b4 100644
Binary files a/assets/ui_atlas.meta and b/assets/ui_atlas.meta differ
diff --git a/assets/ui_atlas.zim b/assets/ui_atlas.zim
index 890802642d..5e9faf12d3 100644
Binary files a/assets/ui_atlas.zim and b/assets/ui_atlas.zim differ
diff --git a/atlasscript.txt b/atlasscript.txt
index 96aef83457..52d1436525 100644
--- a/atlasscript.txt
+++ b/atlasscript.txt
@@ -58,3 +58,7 @@ image I_C source_assets/image/c.png copy
image I_D source_assets/image/d.png copy
image I_E source_assets/image/e.png copy
image I_F source_assets/image/f.png copy
+image I_SQUARE_SHAPE source_assets/image/square_shape.png copy
+image I_SQUARE_SHAPE_LINE source_assets/image/square_shape_line.png copy
+image I_FOLDER_OPEN source_assets/image/folder_open_line.png copy
+image I_WARNING source_assets/image/warning.png copy
\ No newline at end of file
diff --git a/source_assets/image/buttons.svg b/source_assets/image/buttons.svg
index 644c2bc86b..7d0b8e0b10 100644
--- a/source_assets/image/buttons.svg
+++ b/source_assets/image/buttons.svg
@@ -12,7 +12,7 @@
height="1052.3622047"
id="svg2"
version="1.1"
- inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="buttons.svg">
@@ -657,7 +657,11 @@
+ inkscape:label="Drop Shadow"
+ x="-0.054592123"
+ y="-0.05570625"
+ width="1.1091842"
+ height="1.1114125">
+ inkscape:label="Drop Shadow"
+ x="-0.04962921"
+ y="-0.06902453"
+ width="1.105516"
+ height="1.1380491">
+ inkscape:label="Drop Shadow"
+ x="-0.036887906"
+ y="-0.097644459"
+ width="1.0737758"
+ height="1.1952889">
+ inkscape:label="Drop Shadow"
+ x="-0.02998049"
+ y="-0.081521392"
+ width="1.0568565"
+ height="1.1630411">
+ inkscape:label="Drop Shadow"
+ x="-0.508148"
+ y="-0.254074"
+ width="2.016296"
+ height="1.3785184">
+ inkscape:label="Drop Shadow"
+ x="-0.062045457"
+ y="-0.072835148"
+ width="1.1240909"
+ height="1.1455263">
+ inkscape:label="Drop Shadow"
+ x="-0.1358691"
+ y="-0.11974271"
+ width="1.2717382"
+ height="1.2394854">
+ inkscape:label="Drop Shadow"
+ x="-0.19164064"
+ y="-0.11974273"
+ width="1.3832813"
+ height="1.2394855">
+ inkscape:label="Drop Shadow"
+ x="-0.031096265"
+ y="-0.13509237"
+ width="1.0621925"
+ height="1.2701847">
+ inkscape:label="Drop Shadow"
+ x="-0.026115784"
+ y="-0.13509236"
+ width="1.0522316"
+ height="1.2701847">
+ inkscape:label="Drop Shadow"
+ x="-0.055887848"
+ y="-0.055882291"
+ width="1.1117757"
+ height="1.1117646">
+ inkscape:label="Drop Shadow"
+ x="-0.1428398"
+ y="-0.072277018"
+ width="1.2856796"
+ height="1.144554">
+ inkscape:label="Drop Shadow"
+ x="-0.062221817"
+ y="-0.40834883"
+ width="1.1244436"
+ height="1.8166977">
+ inkscape:label="Drop Shadow"
+ x="-0.053283034"
+ y="-0.061528298"
+ width="1.1065661"
+ height="1.1230566">
+ inkscape:label="Drop Shadow"
+ x="-0.05898663"
+ y="-0.058986649"
+ width="1.1179733"
+ height="1.1179733">
+ inkscape:label="Drop Shadow"
+ x="-0.033653883"
+ y="-0.034340698"
+ width="1.0673078"
+ height="1.0686814">
+ inkscape:label="Drop Shadow"
+ x="-0.01355557"
+ y="-0.013832215"
+ width="1.0271111"
+ height="1.0276644">
+ inkscape:label="Drop Shadow"
+ x="-0.062221817"
+ y="-0.061394242"
+ width="1.1244436"
+ height="1.1227885">
+ inkscape:label="Drop Shadow"
+ x="-0.26503537"
+ y="-0.2139469"
+ width="1.5432305"
+ height="1.634546">
+ width="1.3394475"
+ height="1.3227315"
+ x="-0.16972376"
+ y="-0.16136573">
+ id="filter4775"
+ x="-0.20105123"
+ y="-0.11971503"
+ width="1.4021025"
+ height="1.2394301">
+ id="filter4775-3"
+ x="-0.13065391"
+ y="-0.11971503"
+ width="1.2613078"
+ height="1.2394301">
+ id="filter4775-3-9"
+ x="-0.16877672"
+ y="-0.11971503"
+ width="1.3375534"
+ height="1.2394301">
+ id="filter4775-3-0"
+ x="-0.14845062"
+ y="-0.11538705"
+ width="1.2969012"
+ height="1.2307741">
+ id="filter4775-3-02"
+ x="-0.14241796"
+ y="-0.11971503"
+ width="1.2848359"
+ height="1.2394301">
+ id="filter4775-3-97"
+ x="-0.20831532"
+ y="-0.11971503"
+ width="1.4166306"
+ height="1.2394301">
+ id="filter4775-3-8"
+ x="-0.18579475"
+ y="-0.11971503"
+ width="1.3715895"
+ height="1.2394301">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ inkscape:window-width="1446"
+ inkscape:window-height="906"
+ inkscape:window-x="252"
+ inkscape:window-y="290"
+ inkscape:window-maximized="0"
+ inkscape:document-rotation="0"
+ inkscape:pagecheckerboard="0">
@@ -1637,27 +2033,27 @@
inkscape:export-xdpi="135"
inkscape:export-filename="D:\Dev\Emulatorer\potemkin\gfx\round.png"
transform="matrix(0.12501803,0,0,0.12501803,39.336944,16.936311)"
+ id="path4099"
+ style="fill:#ffffff;fill-opacity:0.67021275;stroke:none"
d="m 257.14286,175.21933 a 142.85715,140 0 1 1 -285.714294,0 142.85715,140 0 1 1 285.714294,0 z"
+ sodipodi:type="arc"
sodipodi:ry="140"
sodipodi:rx="142.85715"
sodipodi:cy="175.21933"
- sodipodi:cx="114.28571"
- id="path4099"
- style="fill:#ffffff;fill-opacity:0.67021275;stroke:none"
- sodipodi:type="arc" />
+ sodipodi:cx="114.28571" />
+ sodipodi:cx="114.28571" />
@@ -1706,6 +2102,33 @@
id="rect4948-9"
style="fill:#ffffff;fill-opacity:0.67021275;stroke:none" />
+
+
+
+
+ sodipodi:cx="114.28571" />
+ sodipodi:cx="114.28571" />
+ inkscape:export-ydpi="135"
+ d="m 257.14286,175.21933 a 142.85715,140 0 1 1 -285.714294,0 142.85715,140 0 1 1 285.714294,0 z"
+ sodipodi:type="arc"
+ sodipodi:ry="140"
+ sodipodi:rx="142.85715"
+ sodipodi:cy="175.21933"
+ sodipodi:cx="114.28571" />
+
+
+
+ inkscape:export-ydpi="135"
+ d="m 257.14286,175.21933 a 142.85715,140 0 1 1 -285.714294,0 142.85715,140 0 1 1 285.714294,0 z"
+ sodipodi:type="arc"
+ sodipodi:ry="140"
+ sodipodi:rx="142.85715"
+ sodipodi:cy="175.21933"
+ sodipodi:cx="114.28571" />
E
+
+
+
+
+
+
+
+
+
+
diff --git a/source_assets/image/buttonsupdated.svg b/source_assets/image/buttonsupdated.svg
new file mode 100644
index 0000000000..be1351c6d3
--- /dev/null
+++ b/source_assets/image/buttonsupdated.svg
@@ -0,0 +1,2503 @@
+
+
diff --git a/source_assets/image/folder_line.png b/source_assets/image/folder_line.png
index 08cd10b575..1d950a4a16 100644
Binary files a/source_assets/image/folder_line.png and b/source_assets/image/folder_line.png differ
diff --git a/source_assets/image/folder_open_line.png b/source_assets/image/folder_open_line.png
new file mode 100644
index 0000000000..d6bbbe5f65
Binary files /dev/null and b/source_assets/image/folder_open_line.png differ
diff --git a/source_assets/image/square_shape.png b/source_assets/image/square_shape.png
new file mode 100644
index 0000000000..2cb47a7455
Binary files /dev/null and b/source_assets/image/square_shape.png differ
diff --git a/source_assets/image/square_shape_line.png b/source_assets/image/square_shape_line.png
new file mode 100644
index 0000000000..c897cc17d1
Binary files /dev/null and b/source_assets/image/square_shape_line.png differ
diff --git a/source_assets/image/warning.png b/source_assets/image/warning.png
new file mode 100644
index 0000000000..4db14b7f8d
Binary files /dev/null and b/source_assets/image/warning.png differ