diff --git a/.github/workflows/ruby-ci.yml b/.github/workflows/ruby-ci.yml
index afb145f9b..16a4974ed 100644
--- a/.github/workflows/ruby-ci.yml
+++ b/.github/workflows/ruby-ci.yml
@@ -17,26 +17,16 @@ jobs:
     strategy:
       matrix:
         version:
-          - 2.6
-          - 2.7
-          - 3.0
           - 3.1
           - 3.2
+          - 3.3
         gemfile:
-          - gemfiles/rails-6-0.gemfile
+          - gemfiles/rails-7-0.gemfile
           - gemfiles/rails-latest-release.gemfile
           - gemfiles/rails-edge.gemfile
         exclude:
-          - version: 2.6
-            gemfile: gemfiles/rails-edge.gemfile
-          - version: 2.7
-            gemfile: gemfiles/rails-edge.gemfile
-          - version: 3.0
-            gemfile: gemfiles/rails-6-0.gemfile
           - version: 3.1
-            gemfile: gemfiles/rails-6-0.gemfile
-          - version: 3.2
-            gemfile: gemfiles/rails-6-0.gemfile
+            gemfile: gemfiles/rails-edge.gemfile
     steps:
       - uses: actions/checkout@v3
 
diff --git a/.ruby-version b/.ruby-version
index 7bde84d06..f13c6f452 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-ruby-3.1.2
+ruby-3.3.5
diff --git a/Gemfile.lock b/Gemfile.lock
index 2b466a4ba..ee90bb01c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    payment_icons (1.7.45)
+    payment_icons (1.7.47)
       frozen_record
       railties (>= 5.0)
       sassc-rails
@@ -95,10 +95,10 @@ GEM
       activemodel
     globalid (1.2.1)
       activesupport (>= 6.1)
-    i18n (1.14.5)
+    i18n (1.14.6)
       concurrent-ruby (~> 1.0)
     io-console (0.7.2)
-    irb (1.14.0)
+    irb (1.14.1)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     logger (1.6.1)
@@ -174,7 +174,7 @@ GEM
     rake (13.2.1)
     rdoc (6.7.0)
       psych (>= 4.0.0)
-    reline (0.5.9)
+    reline (0.5.10)
       io-console (~> 0.5)
     sassc (2.4.0)
       ffi (~> 1.9)
@@ -199,7 +199,7 @@ GEM
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     useragent (0.16.10)
-    webrick (1.8.1)
+    webrick (1.8.2)
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
diff --git a/app/assets/images/payment_icons/codensa.svg b/app/assets/images/payment_icons/codensa.svg
new file mode 100644
index 000000000..17b047d23
--- /dev/null
+++ b/app/assets/images/payment_icons/codensa.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" aria-labelledby="pi-codensa" viewBox="0 0 38 24" role="img" width="38" height="24"><title id="pi-codensa">Codensa</title><g clip-path="url(#pi-codensa-clip0_3405_1787)"><path fill="#000" d="M35 0H3C1.3 0 0 1.3 0 3v18a3 3 0 0 0 3 3h32c1.7 0 3-1.3 3-3V3a3 3 0 0 0-3-3z" opacity=".07"/><path fill="#F3CE13" d="M35 1a2 2 0 0 1 2 2v18a2 2 0 0 1-2 2H3a2 2 0 0 1-2-2V3c0-1.1.9-2 2-2h32z"/><path fill="#000" d="M5.95 7.46a1.83 1.83 0 0 0-.9.22c-.26.14-.44.33-.57.57a1.81 1.81 0 0 0-.18.83c0 .23.03.44.1.63.07.2.17.36.3.51.13.14.31.26.53.34.21.07.46.12.74.12.35 0 .72-.07 1.1-.23l.1.38c-.3.17-.73.25-1.27.25a2.7 2.7 0 0 1-.94-.15 1.79 1.79 0 0 1-.68-.42 1.83 1.83 0 0 1-.42-.64 2.28 2.28 0 0 1-.14-.82 2 2 0 0 1 .15-.81c.1-.24.25-.46.44-.63A2 2 0 0 1 5 7.2c.28-.1.6-.15.93-.15.52 0 .96.1 1.31.29l-.21.36a2.43 2.43 0 0 0-1.1-.26l.01.02zm5.95 1.62c0 .3-.04.56-.15.81a1.62 1.62 0 0 1-.42.63c-.18.18-.41.31-.7.42a2.94 2.94 0 0 1-.93.15c-.47 0-.88-.09-1.2-.26a1.71 1.71 0 0 1-.76-.7 2.1 2.1 0 0 1-.25-1.05c0-.62.2-1.12.58-1.48.39-.36.93-.53 1.63-.53s1.22.17 1.6.54c.39.37.58.86.58 1.48l.02-.01zm-3.82 0c0 .5.14.89.42 1.17.27.28.67.43 1.2.43.54 0 .95-.14 1.22-.42.27-.28.4-.68.4-1.17 0-.5-.14-.92-.41-1.2-.27-.28-.68-.42-1.2-.42s-.93.14-1.21.42c-.29.28-.42.68-.42 1.2v-.01zm8.35 0c0 .63-.21 1.11-.64 1.44-.43.33-1.02.5-1.8.5h-1.37V7.13h1.29c.38 0 .73.04 1.04.11.3.08.57.2.8.35.22.16.39.36.51.61a2 2 0 0 1 .18.88zm-.58 0c0-.54-.17-.93-.5-1.18a2.45 2.45 0 0 0-1.46-.37h-.73v3.1h.82a2.2 2.2 0 0 0 1.39-.38c.32-.26.48-.64.48-1.16zm1.4 1.94V7.13h3v.4h-2.46v1.28h2v.4h-2v1.41h2.45v.4h-2.98zm7.81 0h-.66l-2.61-3.06-.17-.18.02.99v2.25h-.55V7.13h.66l2.62 3.06.17.18a55.67 55.67 0 0 1-.03-.97V7.13h.54v3.89h.01zm.87-.64c.48.2 1 .3 1.55.3.67 0 1.02-.26 1.02-.78 0-.17-.06-.3-.16-.41-.1-.11-.3-.19-.6-.24l-.91-.2c-.7-.15-1.05-.46-1.05-.95a.9.9 0 0 1 .45-.83c.3-.18.72-.27 1.26-.27.28 0 .54.03.79.07.24.05.45.13.6.21l-.15.37a2.6 2.6 0 0 0-.56-.17 3.52 3.52 0 0 0-.7-.08c-.76 0-1.14.22-1.14.66 0 .15.06.27.18.36.11.1.29.16.53.2l.88.18c.37.08.66.2.85.37.2.17.3.4.3.7 0 .4-.15.7-.44.9-.29.2-.68.3-1.18.3-.38 0-.7-.03-1-.1a3.08 3.08 0 0 1-.68-.22l.16-.38v.01zm6.98.64-.54-1.23h-1.85l-.56 1.23h-.56l1.79-3.9h.55l1.73 3.9h-.56zM32.2 9.4a77.8 77.8 0 0 1-.73-1.8l-.76 1.8h1.49z"/><path fill="#00559E" d="M24.54 13.93h-.4l-.26.46h.2l.46-.46zm-12.37 1.44h.79v-.22h-.8v-.44H13l.01-.22h-1.1v1.6H13l.01-.21h-.85v-.51zm-3.7-.61a.66.66 0 0 1 .34-.09c.15 0 .3.04.43.1h.02l.12-.17h-.03a.97.97 0 0 0-.54-.13c-.14 0-.26.01-.37.05a.73.73 0 0 0-.47.43.93.93 0 0 0-.01.67.7.7 0 0 0 .45.43c.11.04.24.06.39.06.21 0 .38-.04.51-.1h.02l-.05-.22h-.02a.94.94 0 0 1-.72.06.5.5 0 0 1-.2-.13.77.77 0 0 1-.1-.18.67.67 0 0 1-.05-.25.84.84 0 0 1 .07-.32.48.48 0 0 1 .21-.21zm6.45-.08a.87.87 0 0 0-.33-.14 1.87 1.87 0 0 0-.42-.04h-.54v1.6h.57c.32 0 .56-.07.74-.22.18-.14.26-.33.26-.6a.87.87 0 0 0-.07-.35.63.63 0 0 0-.22-.26v.01zm-1 .03h.26c.24 0 .43.05.56.14.12.1.19.25.19.45s-.06.34-.18.43c-.12.1-.3.15-.54.15h-.29v-1.17zm-.92-.78h-.4l-.26.46h.2l.46-.46zm-2.04 1.49-.05-.09a.45.45 0 0 0 .23-.14.4.4 0 0 0 .1-.27c0-.06 0-.1-.02-.14a.32.32 0 0 0-.06-.12l-.08-.08-.12-.06c-.03 0-.08-.03-.14-.03l-.16-.01h-.8v1.61h.28v-.72h.5c.01.04.06.1.12.21l.26.5h.31l-.32-.58-.06-.08h.02zm0-.51c0 .08-.02.15-.08.19-.06.03-.16.05-.31.05h-.42v-.47h.46c.13 0 .22.02.28.06.06.04.07.1.07.17zm16.54-.42h-.27v1.6h.27v-1.6zm-3.62 0-.73 1.6h.28l.22-.49h.7l.21.5h.29l-.72-1.62h-.25zm.37.9h-.5l.25-.61.24.6h.01zm1.54-.63a.66.66 0 0 1 .34-.09c.15 0 .3.04.43.1h.02l.12-.17h-.03a.96.96 0 0 0-.54-.13c-.14 0-.26.01-.37.05a.73.73 0 0 0-.47.43.98.98 0 0 0-.07.33 1 1 0 0 0 .06.34.7.7 0 0 0 .45.43c.11.04.24.06.38.06.22 0 .39-.04.52-.1h.02l-.05-.22h-.03a.94.94 0 0 1-.71.06.5.5 0 0 1-.2-.13.77.77 0 0 1-.11-.18.7.7 0 0 1-.04-.25.7.7 0 0 1 .08-.32.48.48 0 0 1 .21-.21h-.01zm2.71 1.12V14.5h-.28v1.6h1.08v-.22h-.8zm-12.39-1.39h-.27v1.6h.27v-1.6zm5.7 1.6h.27v-.7h.76v-.2h-.76v-.48h.8v-.22H21.8v1.6zm-5.2-1.38h.57v1.38h.27v-1.38h.58v-.21h-1.41v.21zm2.71-.24c-.28 0-.5.07-.66.22a.78.78 0 0 0-.24.6c0 .16.04.31.1.43.07.13.17.22.31.3.14.06.3.1.5.1.13 0 .27-.02.38-.06a.7.7 0 0 0 .45-.43.97.97 0 0 0 .06-.33.81.81 0 0 0-.24-.6.92.92 0 0 0-.66-.23zm0 .21c.2 0 .36.06.46.16.1.1.15.26.15.45a.69.69 0 0 1-.15.45c-.1.1-.25.16-.46.16-.2 0-.35-.05-.46-.16a.6.6 0 0 1-.16-.45c0-.2.06-.34.16-.45.1-.1.27-.16.46-.16z"/><path fill="#000" d="M34.2 12.5H3v.28h31.2v-.29z"/></g><defs><clipPath id="pi-codensa-clip0_3405_1787"><path fill="#fff" d="M0 0h38v24H0z"/></clipPath></defs></svg>
\ No newline at end of file
diff --git a/app/assets/images/payment_icons/fintoc.svg b/app/assets/images/payment_icons/fintoc.svg
index 609edacf2..af8ac70b5 100644
--- a/app/assets/images/payment_icons/fintoc.svg
+++ b/app/assets/images/payment_icons/fintoc.svg
@@ -1 +1 @@
-<svg width="38" height="24" viewBox="0 0 38 24" role="img" aria-labelledby="pi-fintoc" fill="none" xmlns="http://www.w3.org/2000/svg"><title id="pi-fintoc">Fintoc</title><rect x="1" y="1.122" width="36" height="22" rx="2" fill="#3753FF"/><rect x=".5" y=".622" width="37" height="23" rx="2.5" stroke="#000" stroke-opacity=".07"/><path d="M15.401 13.484c.78 0 1.413-.624 1.413-1.394 0-.77-.632-1.394-1.413-1.394-.78 0-1.413.624-1.413 1.394 0 .77.633 1.394 1.413 1.394z" fill="#fff"/><path d="M21.476 11.472a1.879 1.879 0 000-2.684l-2.243-2.206a1.427 1.427 0 00-2.004 0 1.387 1.387 0 000 1.977l3.6 3.552.647-.639z" fill="#B6B5C2"/><path d="M21.476 11.472l-.647.638-2.7 2.664-.907.895a1.38 1.38 0 000 1.977 1.427 1.427 0 002.004 0l4.24-4.183a1.9 1.9 0 000-2.712l-1.99-1.963a1.879 1.879 0 010 2.684z" fill="#fff"/></svg>
\ No newline at end of file
+<svg width="38" height="24" viewBox="0 0 38 24" fill="none" xmlns="http://www.w3.org/2000/svg" role="img" aria-labelledby="pi-fintoc"><title id="pi-fintoc">Fintoc</title><rect width="38" height="24" rx="2" fill="#000" fill-opacity=".07"/><path d="M35 1.122H3a2 2 0 00-2 2v18a2 2 0 002 2h32a2 2 0 002-2v-18a2 2 0 00-2-2z" fill="#000"/><path d="M17.279 18.192h1.25a.925.925 0 00.925-.926V6.928a.925.925 0 00-.925-.926h-1.25a.925.925 0 00-.926.926v10.338c0 .511.414.926.926.926zM14.444 18.19h.001a.619.619 0 00.619-.62V6.619a.619.619 0 10-1.238 0v10.953c0 .341.277.618.618.618zM12.268 18.19h.001c.149 0 .269-.12.269-.269V6.268a.268.268 0 00-.538 0v11.653c0 .148.12.268.268.268zM24.491 6.001h-2.24c-.833 0-1.508.676-1.508 1.51v9.17c0 .834.675 1.51 1.509 1.51h2.24c.833 0 1.508-.676 1.508-1.51v-9.17C26 6.676 25.325 6 24.491 6z" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/payment_icons/rivertypaynlversion.svg b/app/assets/images/payment_icons/rivertypaynlversion.svg
index 3bc239bf1..3c684f3e1 100644
--- a/app/assets/images/payment_icons/rivertypaynlversion.svg
+++ b/app/assets/images/payment_icons/rivertypaynlversion.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" role="img" viewBox="0 0 38 24" width="38" height="24" aria-labelledby="pi-rivertypaynlversion"><title id="pi-rivertypaynlversion">Riverty (PAY. version)</title><path d="M35 0H3C1.3 0 0 1.3 0 3v18c0 1.7 1.4 3 3 3h32c1.7 0 3-1.3 3-3V3c0-1.7-1.4-3-3-3z" fill="#000" fill-rule="nonzero" opacity=".07" vector-effect="non-scaling-stroke"/><path d="M36.977 11.532L36.948 21c0 1.1-.9 2-2 2h-32c-1.1 0-2-.9-2-2v-9.83" fill="#282828" fill-rule="nonzero" vector-effect="non-scaling-stroke"/><path d="M34.948 1c1.1 0 2 .9 2 2l.026 8.96-36.039-.017L.948 3c0-1.1.9-2 2-2h32" fill="#255a57" fill-rule="nonzero" vector-effect="non-scaling-stroke"/><path d="M21.746 6.051c-.012-.051-.028-.095-.039-.134l-.012-.036c-.203-.573-.672-.91-1.25-.906-.101 0-.187.008-.277.028-.461.103-1.008.44-1.008 1.461v1.614c0 .115.028.183.056.238a.286.286 0 00.175.139c.02.004.043.008.066.008a.256.256 0 00.16-.052c.122-.083.122-.227.122-.346v-1.6c0-.54.168-.803.559-.883.261-.06.52.028.68.222a.697.697 0 01.144.266c.059.287.09.374.13.43l.012.015a.304.304 0 00.363.064c.177-.099.158-.334.119-.528zM7.733 3.986a1.599 1.599 0 00-.645 0c-.769.158-1.27.778-1.27 1.58v2.515c0 .103.013.175.044.234l.004.005a.286.286 0 00.176.14c.078.02.16.004.226-.045.13-.087.145-.238.145-.345V7.057h2v1.02c0 .124.036.195.055.238a.286.286 0 00.176.14c.02.004.043.008.066.008a.256.256 0 00.16-.052c.117-.08.133-.211.133-.346V5.563c-.005-.803-.5-1.42-1.27-1.577zm.676 2.506H6.416v-.921c0-.398.137-.676.437-.874a.996.996 0 01.762-.155c.133.024.25.076.351.15l.005.005c.297.202.437.48.437.874v.921h0zM18.734 6.31c-.25-.95-1.203-1.498-2.171-1.252a1.768 1.768 0 00-1.133.862 1.845 1.845 0 00-.121 1.442c.234.736.901 1.196 1.663 1.196a1.848 1.848 0 001.036-.31 1.5 1.5 0 00.32-.278c.097-.12.157-.215.145-.326a.276.276 0 00-.325-.243l-.012.005a.432.432 0 00-.18.103l-.05.064-.075.068-.004.004a1.133 1.133 0 01-.579.326 1.167 1.167 0 01-1.405-.875h2.554l.056-.008.086-.004c.094-.008.164-.044.21-.111.087-.124.082-.307-.015-.664zm-2.899.245c.008-.051.023-.095.039-.147a1.172 1.172 0 011.477-.798 1.2 1.2 0 01.837.965l-2.353-.02zM14.917 7.092a.278.278 0 00-.165-.143.293.293 0 00-.223.024c-.137.067-.164.219-.172.27l-.023.127-.005.04c-.09.392-.401.607-.8.547-.258-.039-.602-.178-.602-.901v-.047h.782c.094 0 .379 0 .379-.287 0-.142-.106-.262-.231-.27-.059-.008-.11-.008-.168-.008h-.762v-1.1a.496.496 0 00-.043-.235v-.004a.286.286 0 00-.175-.14.268.268 0 00-.227.044c-.117.08-.132.211-.132.346v1.64c0 .934.332 1.402 1.079 1.526.086.016.172.024.258.024.586 0 1.078-.37 1.234-.958.012-.047.02-.091.028-.135V7.45c.023-.172.015-.267-.032-.358zM29.152 6.596a1.681 1.681 0 00-.863-1.394 1.786 1.786 0 00-1.394-.143 1.752 1.752 0 00-1.219 1.335c-.191.96.34 1.859 1.234 2.093.165.044.332.064.496.064.25 0 .492-.051.71-.15.18-.083.34-.194.466-.33v.008c0 .107 0 .17.03.234l.005.005a.286.286 0 00.175.139c.079.02.16.004.227-.044.121-.083.14-.222.14-.346V6.663l-.007-.067zM27.683 7.95a1.156 1.156 0 01-1.414-.85v-.005a1.109 1.109 0 01-.047-.25c-.035-.568.3-1.08.82-1.244.125-.04.255-.06.38-.06.241 0 .472.072.672.215.3.214.48.564.492.958.023.608-.337 1.105-.903 1.236zM25.144 4.498a1.497 1.497 0 00-1.191-.548c-.88.012-1.473.659-1.473 1.613v2.515c0 .115.028.183.055.238a.286.286 0 00.176.139c.02.004.043.008.066.008a.256.256 0 00.16-.052c.121-.083.137-.222.137-.346v-1.14h.855c.809 0 1.36-.43 1.512-1.176.09-.449-.016-.901-.297-1.251zm-1.219 1.859h-.012l-.832-.013V5.51c0-.374.055-.548.23-.73a.859.859 0 01.668-.267c.528.013.894.398.891.938-.011.536-.397.906-.945.906zM32.25 5.213a.286.286 0 00-.176-.14.268.268 0 00-.226.044c-.117.08-.13.215-.13.346v1.6c0 .315-.093.569-.26.72-.149.13-.348.182-.58.15-.398-.056-.616-.346-.616-.819V5.455a.548.548 0 00-.039-.238.286.286 0 00-.175-.14.268.268 0 00-.227.045c-.121.083-.14.222-.14.345v1.66c0 .664.297 1.132.84 1.323.419.147.876.075 1.191-.163V8.3c-.05.349-.226.56-.538.643a.662.662 0 01-.473-.031.624.624 0 01-.234-.187l-.086-.11-.055-.065a.4.4 0 00-.079-.083l-.015-.016-.016-.008a.274.274 0 00-.258-.012.29.29 0 00-.164.211c-.02.127.03.235.121.374l.004.005c.067.095.157.19.254.27.211.17.488.258.782.258.125 0 .25-.015.375-.047.63-.163.977-.676.977-1.442V5.455c.005-.123-.03-.19-.05-.235l-.007-.007zM11.964 5.917l-.012-.036c-.204-.573-.673-.91-1.25-.906a1.19 1.19 0 00-.277.028c-.462.103-1.008.44-1.008 1.461v1.614c0 .123.035.194.055.234v.005a.286.286 0 00.176.139c.02.004.043.008.066.008a.256.256 0 00.16-.052c.117-.08.132-.214.132-.346v-.381l-.012-.672h.833c.273 0 .34-.142.347-.266a.275.275 0 00-.066-.202c-.058-.064-.152-.095-.281-.095H9.99c.004-.524.172-.783.558-.866.262-.06.52.028.68.223a.722.722 0 01.145.266c.059.286.09.373.13.428l.011.016a.304.304 0 00.364.064c.183-.099.164-.333.124-.529a.955.955 0 00-.04-.135zM33.293 4.216a.412.412 0 00-.304-.127.409.409 0 00-.305.127.441.441 0 00-.125.31c0 .119.043.222.125.31a.4.4 0 00.305.13.413.413 0 00.304-.13.441.441 0 00.125-.31.41.41 0 00-.125-.31zm-.047.576a.346.346 0 01-.262.11.351.351 0 01-.262-.11.374.374 0 01-.109-.27.377.377 0 01.371-.378c.102 0 .188.036.262.111.074.072.109.163.109.266a.38.38 0 01-.11.27z" stroke="null" fill="#fff"/><path d="M33.18 4.419c0-.064-.028-.103-.074-.124a.346.346 0 00-.13-.015h-.164v.48h.086v-.19h.066c.047 0 .074.004.094.015.028.02.043.056.043.111v.064h.079l-.005-.004c-.004-.005-.004-.013-.004-.024V4.66a.15.15 0 00-.028-.075.143.143 0 00-.082-.047.164.164 0 00.071-.024c.032-.02.048-.051.048-.095zm-.133.083a.19.19 0 01-.078.012h-.074V4.34h.07c.047 0 .082.008.102.02.023.013.03.036.03.068 0 .036-.019.063-.05.075z" stroke="null" fill="#fff"/><path d="M32.218 15.95l-1.244 1.543v1.256h-.684v-1.256l-1.244-1.544h.848l.757.951.753-.95h.814zm-6.93 0v.55h1.097v2.249h.679v-2.248h1.097v-.552h-2.873zm-3.395.55h1.01c.3 0 .44.108.44.334 0 .227-.14.334-.44.334h-1.01v-.667zm2.285 2.249L23.4 17.67c.418-.107.636-.391.636-.836 0-.576-.37-.885-1.058-.885h-1.762v2.8h.678v-1.03h.75l.735 1.03h.8zm-7.512-2.8v2.8h2.676v-.552h-1.997v-.58h1.715v-.552h-1.715v-.564h1.997v-.551h-2.676 0zm-2.129 0l-.874 2.071-.88-2.07h-.735l1.249 2.799h.696l1.249-2.8h-.705 0zm-4.6 2.8h.678v-2.8h-.679v2.8zm-4.118 0h.679v-2.158h-.68v2.158zm.679-2.158h2.28v-.642h-2.28v.642z" stroke="null" fill="#E7E4E2"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" role="img" viewBox="0 0 38 24" width="38" height="24" aria-labelledby="pi-rivertypaynlversion"><title id="pi-rivertypaynlversion">Riverty (PAY. version)</title><path d="M35 0H3C1.3 0 0 1.3 0 3v18c0 1.7 1.4 3 3 3h32c1.7 0 3-1.3 3-3V3c0-1.7-1.4-3-3-3z" fill="#000" fill-rule="nonzero" opacity=".07" vector-effect="non-scaling-stroke"/><path fill="#527a42" d="M35 1c1.1 0 2 .9 2 2v18c0 1.1-.9 2-2 2H3c-1.1 0-2-.9-2-2V3c0-1.1.9-2 2-2h32"/><path fill="#e7e4e2" d="M31.943 10.57l-.79 1.04-.788-1.04h-.897l1.291 1.685v1.399h.717v-1.399l1.291-1.685h-.86.036zM25.56 10.57v.61h1.147v2.474h.717v-2.475h1.148v-.61h-3.013zM22.045 11.897h1.04c.322 0 .466-.108.466-.359s-.144-.359-.466-.359h-1.04v.754-.036zm1.542 1.757l-.753-1.148h-.79v1.148h-.717V10.57h1.83c.717 0 1.111.358 1.111.968s-.215.79-.645.933l.824 1.183h-.86zM16.593 10.57v3.084h2.798v-.61h-2.08V12.4h1.793v-.61H17.31v-.61h2.08v-.61h-2.798zM14.37 10.57l-.897 2.295-.932-2.295h-.753l1.29 3.084h.718l1.291-3.084h-.753.036zM9.564 13.654h.718V10.57h-.718v3.084zM5.26 13.654h.718v-2.367h-.717v2.367zM5.978 11.287h2.367v-.717H5.978v.717z" class="cls-2"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/payment_icons/satispay.svg b/app/assets/images/payment_icons/satispay.svg
index e46aeb074..196cffabf 100644
--- a/app/assets/images/payment_icons/satispay.svg
+++ b/app/assets/images/payment_icons/satispay.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" role="img" viewBox="0 0 38 24" width="38" height="24" aria-labelledby="pi-satispay"><title id="pi-satispay">Satispay</title><path fill="#000" opacity=".07" d="M35 0H3C1.3 0 0 1.3 0 3v18c0 1.7 1.4 3 3 3h32c1.7 0 3-1.3 3-3V3c0-1.7-1.4-3-3-3z"/><path fill="#fff" d="M35 1c1.1 0 2 .9 2 2v18c0 1.1-.9 2-2 2H3c-1.1 0-2-.9-2-2V3c0-1.1.9-2 2-2h32"/><path d="M35 0H3a2.946 2.946 0 00-3 3v18a3.009 3.009 0 003 3h32a2.946 2.946 0 003-3V3a3.009 3.009 0 00-3-3z" fill="#f94c43"/><path d="M23.774 4.226a.129.129 0 00.028-.144A.127.127 0 0023.68 4h-3.474l1.9 1.9zM18.42 14.431l-2.426-2.426 2.426-2.426-2.522-2.523-4.856 4.855a.132.132 0 000 .188l4.856 4.854zm3.683 3.681L20.219 20h3.456a.133.133 0 00.093-.227z" fill="#fff"/><path d="M19.087 4.039a.135.135 0 00-.09-.038h-4.676a.127.127 0 00-.122.082.129.129 0 00.028.144l7.78 7.78-7.773 7.767a.133.133 0 00.093.227h4.672a.141.141 0 00.1-.038l7.864-7.864a.135.135 0 000-.188z" fill="#fff"/></svg>
\ No newline at end of file
+<svg width="38" height="24" viewBox="0 0 38 24" xmlns="http://www.w3.org/2000/svg" role="img" xml:space="preserve" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2" aria-labelledby="pi-satispay"><title id="pi-satispay">Satispay</title><path d="M35 0H3C1.3 0 0 1.3 0 3v18c0 1.7 1.4 3 3 3h32c1.7 0 3-1.3 3-3V3c0-1.7-1.4-3-3-3Z" style="fill-opacity:.07;fill-rule:nonzero"/><path d="M35 1c1.1 0 2 .9 2 2v18c0 1.1-.9 2-2 2H3c-1.1 0-2-.9-2-2V3c0-1.1.9-2 2-2h32" style="fill:#ef4323;fill-rule:nonzero"/><path d="M673.066 283.461h640.814l1012.66 924.379c50.64 46.22 79.68 112.06 79.68 180.62 0 68.57-29.04 134.4-79.68 180.63l-1012.66 924.37H673.066c-24.632 0-39.66-16.09-45.492-31.15-5.847-15.06-5.605-37.06 12.582-53.68L1724.9 1418.47a40.74 40.74 0 0 0 13.24-30.01c0-11.39-4.83-22.32-13.24-30L640.156 368.289c-18.187-16.609-18.429-38.617-12.582-53.668 5.832-15.062 20.86-31.16 45.492-31.16" style="fill:#fffcf0;fill-rule:nonzero" transform="matrix(.00765 0 0 -.00765 8.716 22.617)"/><path d="m868.125 2030.03-504.973-460.94c-50.636-46.23-79.683-112.06-79.683-180.63 0-68.56 29.047-134.4 79.683-180.62l504.973-460.949L1251.45 1096.8l-286.657 261.66a40.723 40.723 0 0 0-13.242 30 40.723 40.723 0 0 0 13.242 30.01l286.657 261.66-383.325 349.9Zm1148.515 463.43h-515.95l320.89-292.91 227.95 208.08c18.19 16.62 18.44 38.62 12.6 53.68-5.85 15.06-20.86 31.15-45.49 31.15M1821.58 576.379l-320.89-292.918h515.95c24.63 0 39.64 16.098 45.49 31.16 5.84 15.051 5.59 37.059-12.6 53.668l-227.95 208.09Z" style="fill:#fffcf0;fill-rule:nonzero" transform="matrix(.00765 0 0 -.00765 8.716 22.617)"/></svg>
\ No newline at end of file
diff --git a/app/assets/images/payment_icons/zustaina.svg b/app/assets/images/payment_icons/zustaina.svg
new file mode 100644
index 000000000..a6fcd6464
--- /dev/null
+++ b/app/assets/images/payment_icons/zustaina.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" role="img" viewBox="0 0 38 24" width="38" height="24" aria-labelledby="pi-zustaina"><title id="pi-zustaina">Zustaina</title><path opacity=".07" d="M35 0H3C1.3 0 0 1.3 0 3v18c0 1.7 1.4 3 3 3h32c1.7 0 3-1.3 3-3V3c0-1.7-1.4-3-3-3z"/><path d="M35 1c1.1 0 2 .9 2 2v18c0 1.1-.9 2-2 2H3c-1.1 0-2-.9-2-2V3c0-1.1.9-2 2-2h32z" fill="#2f5252"/><path fill="#FFF" opacity=".2" d="M32.531 20.868c-.03-.411-.03-4.364-.09-4.775-.06-8.38-8.072-14.703-15.755-12.395 0 1.391-.06 2.814 0 4.237.299 6.356 4.125 11.352 9.716 12.711 1.854.443 4.216.253 6.129.222"/><path fill="#FFF" d="M9.331 9.358v.696c0 .253-.06.442-.21.632-.777.949-1.554 1.866-2.301 2.814-.06.032-.09.064-.12.158H8.524c.508 0 .867.443.807 1.012H5.384v-.822c.06-.316.27-.537.45-.759.687-.853 1.404-1.707 2.092-2.561a.435.435 0 00.09-.126H6.282c-.539 0-.778-.19-.927-.728v-.031-.253c1.345-.032 2.66-.032 3.976-.032zM23.592 9.358c.06 0 .09.032.15.032.418.126.717.506.747.948v.348c-.748.158-1.286-.38-1.286-1.043v-.285h.389zM26.133 11.002v.348c.03 0 .03-.031.06-.031.538-.728 1.584-.57 2.063.284.12.221.18.474.18.727v2.309h-.808c-.12 0-.15-.032-.15-.158v-1.834c0-.348-.179-.601-.448-.696-.419-.158-.837.19-.837.632v2.024h-.987v-.158-2.783c0-.284.09-.41.33-.506.149 0 .358-.063.597-.158zM10.676 11.034v1.992c0 .348.21.6.509.696.299.063.598-.064.717-.348.06-.095.06-.222.06-.348v-1.265c0-.253.09-.41.329-.506.21-.063.418-.158.628-.221v3.636c-.36.032-.688.032-.957-.284-.03.031-.06.031-.06.063-.448.38-.927.443-1.405.221-.508-.253-.777-.695-.777-1.265v-1.644c0-.221.09-.38.299-.442.209-.127.418-.222.657-.285zM16.058 11.508c-.24.127-.449.285-.658.411-.06.032-.15 0-.21-.031-.179-.127-.328-.158-.537-.127a.329.329 0 00-.27.253c0 .158.03.221.21.285.269.095.538.19.807.316a2 2 0 01.329.221c.448.411.478 1.044.06 1.486-.419.443-.927.538-1.495.348a2.195 2.195 0 01-.598-.316c-.12-.063-.18-.221-.299-.316.269-.127.508-.222.747-.348.06-.032.15.032.18.063.21.158.418.19.628.127.12-.032.209-.127.209-.253 0-.127-.06-.222-.18-.253l-.358-.095c-.33-.063-.598-.221-.867-.443-.419-.41-.359-1.075-.09-1.391.329-.443.777-.57 1.316-.506.448 0 .807.19 1.076.57zM18.629 13.69v.98c-.359-.031-.747.064-1.076-.126-.389-.222-.598-.538-.598-1.012v-1.36-.158h-.449v-.948c0-.032.06-.064.09-.064h.359v-.442c0-.285.09-.411.329-.475.209-.063.418-.158.627-.221v1.17h.598v1.012h-.478c-.09 0-.12.031-.12.126v1.17c0 .222.09.316.3.316.149 0 .268 0 .418.032-.03-.032 0-.032 0 0zM24.489 10.781v3.731c0 .19 0 .19-.18.19h-.657c-.09 0-.15-.032-.12-.127v-2.909c0-.253.12-.442.329-.569.18-.126.389-.221.628-.316zM31.634 11.16c0-.126.03-.158.15-.158h.837v3.542c0 .158.03.126-.12.126-.269 0-.538 0-.777-.19-.03-.031-.09 0-.15.032-.927.538-2.092.158-2.54-.854-.39-.853-.15-1.897.627-2.466.538-.38 1.256-.411 1.854-.095.03.032.06.032.12.063zm-1.913 1.645c0 .569.418 1.012.956 1.012.509 0 .957-.443.957-1.012 0-.538-.418-1.012-.957-1.012a1.014 1.014 0 00-.956 1.012zM21.828 11.16c0-.126.03-.158.15-.158h.836v3.542c0 .158.03.126-.12.126-.268 0-.537 0-.776-.19-.03-.031-.09 0-.15.032-.927.538-2.093.158-2.541-.854-.389-.853-.15-1.897.628-2.466.538-.38 1.255-.411 1.853-.095.03.032.06.032.12.063zm-1.913 1.645c0 .569.418 1.012.956 1.012.508 0 .957-.443.957-1.012 0-.538-.419-1.012-.957-1.012a1.014 1.014 0 00-.956 1.012z" class="st2"/></svg>
\ No newline at end of file
diff --git a/db/payment_icons.yml b/db/payment_icons.yml
index 4921b707d..fa693c43e 100644
--- a/db/payment_icons.yml
+++ b/db/payment_icons.yml
@@ -2330,6 +2330,10 @@
   name: cembrapay
   label: CembraPay
   group: other
+-
+  name: zustaina
+  label: Zustaina
+  group: other
 -
   name: payright
   label: Payright
@@ -2362,3 +2366,7 @@
   name: yape
   label: Yape
   group: wallets
+-
+  name: codensa
+  label: Codensa
+  group: credit_cards
diff --git a/gemfiles/rails-6-0.gemfile b/gemfiles/rails-7-0.gemfile
similarity index 77%
rename from gemfiles/rails-6-0.gemfile
rename to gemfiles/rails-7-0.gemfile
index 46cce4858..f9c0666d4 100644
--- a/gemfiles/rails-6-0.gemfile
+++ b/gemfiles/rails-7-0.gemfile
@@ -2,5 +2,5 @@ source "https://rubygems.org"
 
 gemspec path: '..'
 
-gem 'rails', '~> 6.0.0'
+gem 'rails', '~> 7.0.0'
 gem 'frozen_record', '~> 0.18.0'
diff --git a/lib/payment_icons/version.rb b/lib/payment_icons/version.rb
index cd611c6be..c24c14ce3 100644
--- a/lib/payment_icons/version.rb
+++ b/lib/payment_icons/version.rb
@@ -1,3 +1,3 @@
 module PaymentIcons
-  VERSION = "1.7.45"
+  VERSION = "1.7.47"
 end