diff --git a/android/app/build.gradle b/android/app/build.gradle
index de714fb6..f1d756cd 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -29,7 +29,7 @@ if (keystorePropertiesFile.exists()) {
 }
 
 android {
-    compileSdkVersion 35
+    compileSdkVersion 36
     ndkVersion "27.2.12479018"
     namespace "com.coinerella.peercoin"
 
@@ -44,7 +44,7 @@ android {
     defaultConfig {
         applicationId "com.coinerella.peercoin"
         minSdkVersion 26
-        targetSdkVersion 35
+        targetSdkVersion 36
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
         multiDexEnabled true
diff --git a/lib/screens/settings/app_settings_wallet_order.dart b/lib/screens/settings/app_settings_wallet_order.dart
index d99f79cf..d21f2542 100644
--- a/lib/screens/settings/app_settings_wallet_order.dart
+++ b/lib/screens/settings/app_settings_wallet_order.dart
@@ -95,11 +95,7 @@ class _AppSettingsWalletOrderScreenState
                   child: PeerContainer(
                     noSpacers: true,
                     child: ReorderableListView.builder(
-                      onReorder: (oldIndex, newIndex) async {
-                        if (oldIndex < newIndex) {
-                          newIndex -= 1;
-                        }
-
+                      onReorderItem: (oldIndex, newIndex) async {
                         setState(() {
                           final item = _walletOrder.removeAt(oldIndex);
                           _walletOrder.insert(newIndex, item);
diff --git a/lib/screens/settings/server_settings/server_settings.dart b/lib/screens/settings/server_settings/server_settings.dart
index df4d7d8a..642bf4f8 100644
--- a/lib/screens/settings/server_settings/server_settings.dart
+++ b/lib/screens/settings/server_settings/server_settings.dart
@@ -110,11 +110,8 @@ class _ServerSettingsScreenState extends State<ServerSettingsScreen> {
           child: _servers.isEmpty
               ? const Center(child: CircularProgressIndicator())
               : ReorderableListView.builder(
-                  onReorder: (oldIndex, newIndex) {
+                  onReorderItem: (oldIndex, newIndex) {
                     if (_servers[oldIndex].connectable == false) return;
-                    if (oldIndex < newIndex) {
-                      newIndex -= 1;
-                    }
                     setState(() {
                       final item = _servers.removeAt(oldIndex);
                       _servers.insert(newIndex, item);
diff --git a/lib/widgets/expanded_section.dart b/lib/widgets/expanded_section.dart
index 3f240f20..bb40f27d 100644
--- a/lib/widgets/expanded_section.dart
+++ b/lib/widgets/expanded_section.dart
@@ -56,7 +56,7 @@ class _ExpandedSectionState extends State<ExpandedSection>
   @override
   Widget build(BuildContext context) {
     return SizeTransition(
-      axisAlignment: 1.0,
+      alignment: const Alignment(0.0, 1.0),
       sizeFactor: animation,
       child: widget.child,
     );