diff --git a/vector/src/main/java/im/vector/riotx/features/login/LoginFragment.kt b/vector/src/main/java/im/vector/riotx/features/login/LoginFragment.kt
index ef8281fa89..3f9cbe443a 100644
--- a/vector/src/main/java/im/vector/riotx/features/login/LoginFragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/login/LoginFragment.kt
@@ -157,8 +157,8 @@ class LoginFragment @Inject constructor() : AbstractLoginFragment() {
                 }
                 ServerType.Modular   -> {
                     loginServerIcon.isVisible = true
-                    loginServerIcon.setImageResource(R.drawable.ic_logo_modular)
-                    loginTitle.text = getString(resId, "Modular")
+                    loginServerIcon.setImageResource(R.drawable.ic_logo_element_matrix_services)
+                    loginTitle.text = getString(resId, "Element Matrix Services")
                     loginNotice.text = getString(R.string.login_server_modular_text)
                 }
                 ServerType.Other     -> {
diff --git a/vector/src/main/java/im/vector/riotx/features/login/LoginSignUpSignInSelectionFragment.kt b/vector/src/main/java/im/vector/riotx/features/login/LoginSignUpSignInSelectionFragment.kt
index 6ac5993f30..d0b814b6d5 100644
--- a/vector/src/main/java/im/vector/riotx/features/login/LoginSignUpSignInSelectionFragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/login/LoginSignUpSignInSelectionFragment.kt
@@ -39,7 +39,7 @@ open class LoginSignUpSignInSelectionFragment @Inject constructor() : AbstractLo
                 loginSignupSigninText.text = getString(R.string.login_server_matrix_org_text)
             }
             ServerType.Modular   -> {
-                loginSignupSigninServerIcon.setImageResource(R.drawable.ic_logo_modular)
+                loginSignupSigninServerIcon.setImageResource(R.drawable.ic_logo_element_matrix_services)
                 loginSignupSigninServerIcon.isVisible = true
                 loginSignupSigninTitle.text = getString(R.string.login_connect_to_modular)
                 loginSignupSigninText.text = state.homeServerUrl.toReducedUrl()
diff --git a/vector/src/main/res/drawable/ic_logo_element_matrix_services.xml b/vector/src/main/res/drawable/ic_logo_element_matrix_services.xml
new file mode 100644
index 0000000000..89824b8168
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_logo_element_matrix_services.xml
@@ -0,0 +1,25 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="208dp"
+    android:height="20dp"
+    android:viewportWidth="334"
+    android:viewportHeight="32">
+    <path
+        android:fillColor="#000000"
+        android:pathData="M56.28,17.24H46.168C46.287,18.298 46.671,19.143 47.32,19.774C47.968,20.389 48.822,20.696 49.88,20.696C50.58,20.696 51.211,20.525 51.774,20.184C52.338,19.843 52.739,19.382 52.978,18.802H56.05C55.64,20.15 54.872,21.242 53.746,22.078C52.636,22.898 51.322,23.307 49.803,23.307C47.823,23.307 46.219,22.65 44.99,21.336C43.779,20.022 43.173,18.358 43.173,16.344C43.173,14.381 43.787,12.734 45.016,11.403C46.245,10.072 47.832,9.406 49.778,9.406C51.723,9.406 53.293,10.064 54.488,11.378C55.7,12.675 56.306,14.313 56.306,16.293L56.28,17.24ZM49.778,11.89C48.822,11.89 48.028,12.171 47.397,12.734C46.765,13.298 46.373,14.049 46.219,14.987H53.285C53.148,14.049 52.773,13.298 52.158,12.734C51.544,12.171 50.75,11.89 49.778,11.89ZM58.402,19.032V3.8H61.448V19.083C61.448,19.766 61.824,20.107 62.575,20.107L63.112,20.082V22.974C62.822,23.026 62.515,23.051 62.191,23.051C60.877,23.051 59.912,22.718 59.298,22.053C58.701,21.387 58.402,20.38 58.402,19.032ZM77.3,17.24H67.188C67.307,18.298 67.691,19.143 68.34,19.774C68.989,20.389 69.842,20.696 70.9,20.696C71.6,20.696 72.231,20.525 72.794,20.184C73.358,19.843 73.759,19.382 73.998,18.802H77.07C76.66,20.15 75.892,21.242 74.766,22.078C73.656,22.898 72.342,23.307 70.823,23.307C68.843,23.307 67.239,22.65 66.01,21.336C64.799,20.022 64.193,18.358 64.193,16.344C64.193,14.381 64.807,12.734 66.036,11.403C67.265,10.072 68.852,9.406 70.798,9.406C72.743,9.406 74.313,10.064 75.508,11.378C76.72,12.675 77.326,14.313 77.326,16.293L77.3,17.24ZM70.798,11.89C69.842,11.89 69.048,12.171 68.417,12.734C67.785,13.298 67.393,14.049 67.239,14.987H74.305C74.168,14.049 73.793,13.298 73.178,12.734C72.564,12.171 71.77,11.89 70.798,11.89ZM91.044,15.371V23H87.998V15.038C87.998,13.024 87.162,12.018 85.489,12.018C84.585,12.018 83.859,12.308 83.313,12.888C82.784,13.468 82.52,14.262 82.52,15.269V23H79.473V9.714H82.289V11.48C82.613,10.883 83.108,10.388 83.774,9.995C84.44,9.603 85.267,9.406 86.257,9.406C88.1,9.406 89.432,10.106 90.251,11.506C91.377,10.106 92.879,9.406 94.756,9.406C96.309,9.406 97.504,9.893 98.34,10.866C99.177,11.821 99.595,13.084 99.595,14.654V23H96.548V15.038C96.548,13.024 95.712,12.018 94.04,12.018C93.118,12.018 92.384,12.316 91.838,12.914C91.309,13.494 91.044,14.313 91.044,15.371ZM114.745,17.24H104.633C104.752,18.298 105.136,19.143 105.785,19.774C106.433,20.389 107.287,20.696 108.345,20.696C109.045,20.696 109.676,20.525 110.239,20.184C110.803,19.843 111.204,19.382 111.443,18.802H114.515C114.105,20.15 113.337,21.242 112.211,22.078C111.101,22.898 109.787,23.307 108.268,23.307C106.288,23.307 104.684,22.65 103.455,21.336C102.244,20.022 101.638,18.358 101.638,16.344C101.638,14.381 102.252,12.734 103.481,11.403C104.71,10.072 106.297,9.406 108.243,9.406C110.188,9.406 111.758,10.064 112.953,11.378C114.165,12.675 114.771,14.313 114.771,16.293L114.745,17.24ZM108.243,11.89C107.287,11.89 106.493,12.171 105.862,12.734C105.23,13.298 104.838,14.049 104.684,14.987H111.75C111.613,14.049 111.238,13.298 110.623,12.734C110.009,12.171 109.215,11.89 108.243,11.89ZM119.734,9.714V11.48C120.041,10.9 120.545,10.413 121.245,10.021C121.961,9.611 122.823,9.406 123.83,9.406C125.4,9.406 126.612,9.884 127.465,10.84C128.336,11.796 128.771,13.067 128.771,14.654V23H125.725V15.038C125.725,14.1 125.503,13.366 125.059,12.837C124.632,12.291 123.975,12.018 123.088,12.018C122.115,12.018 121.347,12.308 120.784,12.888C120.238,13.468 119.965,14.27 119.965,15.294V23H116.918V9.714H119.734ZM137.668,20.286V22.923C137.292,23.026 136.763,23.077 136.081,23.077C133.487,23.077 132.19,21.771 132.19,19.16V12.146H130.167V9.714H132.19V6.258H135.236V9.714H137.719V12.146H135.236V18.853C135.236,19.894 135.731,20.414 136.721,20.414L137.668,20.286ZM156.557,15.397V23H154.739V15.038C154.739,13.861 154.466,12.939 153.92,12.274C153.391,11.591 152.572,11.25 151.462,11.25C150.37,11.25 149.474,11.608 148.774,12.325C148.075,13.042 147.725,14.014 147.725,15.243V23H145.907V9.97H147.648V11.966C148.484,10.43 149.858,9.662 151.77,9.662C153.835,9.662 155.251,10.499 156.019,12.171C156.429,11.472 157.026,10.883 157.811,10.405C158.596,9.91 159.526,9.662 160.602,9.662C162.12,9.662 163.29,10.14 164.109,11.096C164.945,12.035 165.363,13.229 165.363,14.68V23H163.546V15.038C163.546,13.878 163.272,12.956 162.726,12.274C162.197,11.591 161.387,11.25 160.294,11.25C159.219,11.25 158.323,11.608 157.606,12.325C156.907,13.042 156.557,14.066 156.557,15.397ZM178.283,16.805C175.945,16.805 174.349,16.856 173.496,16.958C172.66,17.044 172.045,17.189 171.653,17.394C170.953,17.786 170.603,18.418 170.603,19.288C170.603,20.961 171.593,21.797 173.573,21.797C175.092,21.797 176.252,21.455 177.054,20.773C177.874,20.09 178.283,19.177 178.283,18.034V16.805ZM173.368,23.307C171.883,23.307 170.748,22.949 169.963,22.232C169.195,21.498 168.811,20.534 168.811,19.339C168.811,18.554 169.016,17.854 169.426,17.24C169.852,16.626 170.432,16.173 171.166,15.883C171.781,15.644 172.574,15.491 173.547,15.422C174.52,15.337 176.099,15.294 178.283,15.294V14.45C178.283,12.299 177.054,11.224 174.597,11.224C172.48,11.224 171.252,12.086 170.91,13.81H169.144C169.332,12.547 169.869,11.54 170.757,10.789C171.661,10.038 172.967,9.662 174.674,9.662C176.5,9.662 177.856,10.089 178.744,10.942C179.648,11.796 180.101,12.973 180.101,14.475V23H178.36V21.106C177.455,22.573 175.791,23.307 173.368,23.307ZM189.481,21.285V22.923C189.174,23.008 188.713,23.051 188.099,23.051C185.846,23.051 184.72,21.865 184.72,19.493V11.506H182.237V9.97H184.72V6.258H186.537V9.97H189.533V11.506H186.537V19.365C186.537,20.73 187.135,21.413 188.329,21.413L189.481,21.285ZM198.806,9.867V11.582C198.601,11.565 198.388,11.557 198.166,11.557C197.005,11.557 196.067,11.907 195.35,12.606C194.633,13.289 194.275,14.288 194.275,15.602V23H192.457V9.97H194.198V11.992C194.505,11.429 195.009,10.934 195.708,10.507C196.408,10.064 197.296,9.842 198.371,9.842L198.806,9.867ZM199.768,11.506V9.97H203.736V23H201.919V11.506H199.768ZM203.762,6.411C203.523,6.633 203.216,6.744 202.84,6.744C202.465,6.744 202.149,6.633 201.893,6.411C201.654,6.172 201.535,5.874 201.535,5.515V5.413C201.535,5.225 201.569,5.063 201.637,4.926C201.876,4.431 202.277,4.184 202.84,4.184C203.216,4.184 203.523,4.312 203.762,4.568C204.018,4.807 204.146,5.114 204.146,5.49C204.146,5.865 204.018,6.172 203.762,6.411ZM219.113,9.97L213.942,16.395L219.292,23H217.014L212.866,17.778L208.719,23H206.492L211.791,16.421L206.62,9.97H208.873L212.892,15.013L216.886,9.97H219.113ZM232.855,23.307C231.097,23.307 229.783,22.898 228.913,22.078C228.059,21.242 227.59,20.192 227.505,18.93H229.348C229.416,19.8 229.74,20.483 230.321,20.978C230.918,21.472 231.763,21.72 232.855,21.72C233.93,21.72 234.766,21.524 235.364,21.131C235.978,20.722 236.285,20.184 236.285,19.518C236.285,18.836 236.004,18.332 235.441,18.008C234.894,17.667 234.229,17.436 233.444,17.317C232.659,17.197 231.865,17.052 231.063,16.882C230.278,16.711 229.604,16.353 229.041,15.806C228.494,15.26 228.221,14.492 228.221,13.502C228.221,12.444 228.657,11.54 229.527,10.789C230.397,10.038 231.575,9.662 233.06,9.662C234.698,9.662 235.91,10.08 236.695,10.917C237.48,11.753 237.924,12.709 238.026,13.784H236.209C236.123,13.033 235.816,12.427 235.287,11.966C234.758,11.488 233.998,11.25 233.009,11.25C232.036,11.25 231.285,11.454 230.756,11.864C230.244,12.274 229.988,12.794 229.988,13.426C229.988,13.989 230.184,14.432 230.577,14.757C230.986,15.081 231.49,15.294 232.087,15.397C232.684,15.482 233.324,15.602 234.007,15.755C234.707,15.909 235.355,16.08 235.953,16.267C236.55,16.455 237.045,16.822 237.437,17.368C237.847,17.914 238.052,18.614 238.052,19.467C238.052,20.525 237.599,21.43 236.695,22.181C235.807,22.932 234.527,23.307 232.855,23.307ZM253.256,17.01H242.427C242.512,18.375 242.973,19.493 243.809,20.363C244.646,21.234 245.729,21.669 247.061,21.669C248.033,21.669 248.887,21.421 249.621,20.926C250.354,20.414 250.866,19.749 251.157,18.93H253.051C252.658,20.227 251.933,21.285 250.875,22.104C249.817,22.906 248.537,23.307 247.035,23.307C245.055,23.307 243.485,22.65 242.325,21.336C241.181,20.005 240.609,18.383 240.609,16.472C240.609,14.595 241.198,12.99 242.376,11.659C243.57,10.328 245.115,9.662 247.009,9.662C248.904,9.662 250.423,10.302 251.566,11.582C252.71,12.845 253.281,14.424 253.281,16.318L253.256,17.01ZM247.009,11.301C245.781,11.301 244.757,11.702 243.937,12.504C243.118,13.289 242.632,14.296 242.478,15.525H251.464C251.344,14.245 250.883,13.221 250.081,12.453C249.296,11.685 248.272,11.301 247.009,11.301ZM263.106,9.867V11.582C262.901,11.565 262.688,11.557 262.466,11.557C261.305,11.557 260.367,11.907 259.65,12.606C258.933,13.289 258.575,14.288 258.575,15.602V23H256.757V9.97H258.498V11.992C258.805,11.429 259.309,10.934 260.008,10.507C260.708,10.064 261.596,9.842 262.671,9.842L263.106,9.867ZM270.315,20.901L274.82,9.97H276.715L271.211,23H269.367L263.915,9.97H265.886L270.315,20.901ZM277.693,11.506V9.97H281.661V23H279.844V11.506H277.693ZM281.687,6.411C281.448,6.633 281.141,6.744 280.765,6.744C280.39,6.744 280.074,6.633 279.818,6.411C279.579,6.172 279.46,5.874 279.46,5.515V5.413C279.46,5.225 279.494,5.063 279.562,4.926C279.801,4.431 280.202,4.184 280.765,4.184C281.141,4.184 281.448,4.312 281.687,4.568C281.943,4.807 282.071,5.114 282.071,5.49C282.071,5.865 281.943,6.172 281.687,6.411ZM286.926,21.31C285.748,19.962 285.159,18.358 285.159,16.498C285.159,14.637 285.748,13.033 286.926,11.685C288.12,10.337 289.673,9.662 291.585,9.662C293.257,9.662 294.623,10.14 295.681,11.096C296.739,12.035 297.405,13.204 297.678,14.603H295.835C295.561,13.579 295.058,12.777 294.324,12.197C293.59,11.599 292.677,11.301 291.585,11.301C290.22,11.301 289.11,11.787 288.257,12.76C287.421,13.733 287.003,14.979 287.003,16.498C287.003,18 287.421,19.237 288.257,20.21C289.11,21.182 290.22,21.669 291.585,21.669C292.677,21.669 293.59,21.379 294.324,20.798C295.058,20.201 295.561,19.39 295.835,18.366H297.678C297.405,19.766 296.739,20.944 295.681,21.899C294.623,22.838 293.257,23.307 291.585,23.307C289.673,23.307 288.12,22.642 286.926,21.31ZM312.431,17.01H301.602C301.687,18.375 302.148,19.493 302.984,20.363C303.821,21.234 304.904,21.669 306.236,21.669C307.208,21.669 308.062,21.421 308.796,20.926C309.529,20.414 310.041,19.749 310.332,18.93H312.226C311.833,20.227 311.108,21.285 310.05,22.104C308.992,22.906 307.712,23.307 306.21,23.307C304.23,23.307 302.66,22.65 301.5,21.336C300.356,20.005 299.784,18.383 299.784,16.472C299.784,14.595 300.373,12.99 301.551,11.659C302.745,10.328 304.29,9.662 306.184,9.662C308.079,9.662 309.598,10.302 310.741,11.582C311.885,12.845 312.456,14.424 312.456,16.318L312.431,17.01ZM306.184,11.301C304.956,11.301 303.932,11.702 303.112,12.504C302.293,13.289 301.807,14.296 301.653,15.525H310.639C310.519,14.245 310.059,13.221 309.256,12.453C308.471,11.685 307.447,11.301 306.184,11.301ZM320.105,23.307C318.347,23.307 317.033,22.898 316.163,22.078C315.309,21.242 314.84,20.192 314.755,18.93H316.598C316.666,19.8 316.99,20.483 317.571,20.978C318.168,21.472 319.013,21.72 320.105,21.72C321.18,21.72 322.016,21.524 322.614,21.131C323.228,20.722 323.535,20.184 323.535,19.518C323.535,18.836 323.254,18.332 322.691,18.008C322.144,17.667 321.479,17.436 320.694,17.317C319.909,17.197 319.115,17.052 318.313,16.882C317.528,16.711 316.854,16.353 316.291,15.806C315.744,15.26 315.471,14.492 315.471,13.502C315.471,12.444 315.907,11.54 316.777,10.789C317.647,10.038 318.825,9.662 320.31,9.662C321.948,9.662 323.16,10.08 323.945,10.917C324.73,11.753 325.174,12.709 325.276,13.784H323.459C323.373,13.033 323.066,12.427 322.537,11.966C322.008,11.488 321.248,11.25 320.259,11.25C319.286,11.25 318.535,11.454 318.006,11.864C317.494,12.274 317.238,12.794 317.238,13.426C317.238,13.989 317.434,14.432 317.827,14.757C318.236,15.081 318.74,15.294 319.337,15.397C319.934,15.482 320.574,15.602 321.257,15.755C321.957,15.909 322.605,16.08 323.203,16.267C323.8,16.455 324.295,16.822 324.687,17.368C325.097,17.914 325.302,18.614 325.302,19.467C325.302,20.525 324.849,21.43 323.945,22.181C323.057,22.932 321.777,23.307 320.105,23.307Z" />
+    <path
+        android:fillColor="#000000"
+        android:fillType="evenOdd"
+        android:pathData="M10.968,3.328C10.968,2.374 11.742,1.6 12.696,1.6C19.058,1.6 24.216,6.758 24.216,13.12C24.216,14.074 23.442,14.848 22.488,14.848C21.534,14.848 20.76,14.074 20.76,13.12C20.76,8.666 17.15,5.056 12.696,5.056C11.742,5.056 10.968,4.282 10.968,3.328Z" />
+    <path
+        android:fillColor="#000000"
+        android:fillType="evenOdd"
+        android:pathData="M19.032,28.672C19.032,29.626 18.258,30.4 17.304,30.4C10.942,30.4 5.784,25.242 5.784,18.88C5.784,17.926 6.558,17.152 7.512,17.152C8.466,17.152 9.24,17.926 9.24,18.88C9.24,23.334 12.85,26.944 17.304,26.944C18.258,26.944 19.032,27.718 19.032,28.672Z" />
+    <path
+        android:fillColor="#000000"
+        android:fillType="evenOdd"
+        android:pathData="M2.328,20.032C1.374,20.032 0.6,19.258 0.6,18.304C0.6,11.942 5.758,6.784 12.12,6.784C13.074,6.784 13.848,7.558 13.848,8.512C13.848,9.466 13.074,10.24 12.12,10.24C7.666,10.24 4.056,13.85 4.056,18.304C4.056,19.258 3.282,20.032 2.328,20.032Z" />
+    <path
+        android:fillColor="#000000"
+        android:fillType="evenOdd"
+        android:pathData="M27.672,11.968C28.626,11.968 29.4,12.742 29.4,13.696C29.4,20.058 24.242,25.216 17.88,25.216C16.926,25.216 16.152,24.442 16.152,23.488C16.152,22.534 16.926,21.76 17.88,21.76C22.334,21.76 25.944,18.15 25.944,13.696C25.944,12.742 26.718,11.968 27.672,11.968Z" />
+</vector>
diff --git a/vector/src/main/res/drawable/ic_logo_modular.xml b/vector/src/main/res/drawable/ic_logo_modular.xml
deleted file mode 100644
index c95ee66b86..0000000000
--- a/vector/src/main/res/drawable/ic_logo_modular.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="83dp"
-    android:height="14dp"
-    android:viewportWidth="83"
-    android:viewportHeight="14">
-  <path
-      android:pathData="M21.722,11.239V4.628h1.93v0.739c0.355,-0.584 1.182,-0.973 1.93,-0.973 0.946,0 1.655,0.39 1.97,1.05 0.513,-0.738 1.182,-1.05 2.088,-1.05 1.26,0 2.482,0.74 2.482,2.528V11.2h-1.97V7.389c0,-0.622 -0.354,-1.128 -1.063,-1.128 -0.71,0 -1.103,0.545 -1.103,1.128V11.2h-2.01V7.389c0,-0.622 -0.354,-1.128 -1.063,-1.128s-1.103,0.545 -1.103,1.128V11.2h-2.088v0.039z"
-      android:fillColor="#2E2F32"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M41.459,7.933c0,2.061 -1.537,3.5 -3.546,3.5 -1.97,0 -3.545,-1.477 -3.545,-3.5 0,-2.06 1.575,-3.5 3.545,-3.5 2.01,0 3.546,1.478 3.546,3.5m-2.049,0c0,-1.127 -0.709,-1.633 -1.497,-1.633 -0.748,0 -1.497,0.506 -1.497,1.633 0,1.09 0.749,1.634 1.497,1.634 0.788,0.039 1.497,-0.506 1.497,-1.634"
-      android:fillColor="#2E2F32"
-      android:fillType="nonZero"/>
-  <path
-      android:pathData="M57.807,10.578c-0.354,0.583 -1.103,0.816 -1.773,0.816 -1.615,0 -2.52,-1.166 -2.52,-2.566V4.667h2.048V8.4c0,0.622 0.354,1.128 1.063,1.128 0.67,0 1.103,-0.467 1.103,-1.128V4.667h2.049v5.405c0,0.584 0.04,1.09 0.079,1.167h-1.97c-0.04,-0.117 -0.079,-0.467 -0.079,-0.661"
-      android:fillColor="#2E2F32"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M72.068,10.383c-0.315,0.623 -0.985,1.05 -1.812,1.05 -1.97,0 -3.31,-1.477 -3.31,-3.5 0,-1.944 1.261,-3.46 3.27,-3.46 1.182,0 1.734,0.66 1.852,0.971v-0.777h1.97v5.405c0,0.622 0.039,1.05 0.039,1.167h-1.97c-0.04,-0.156 -0.04,-0.506 -0.04,-0.778v-0.078zM70.531,9.683c0.828,0 1.537,-0.622 1.537,-1.75 0,-1.127 -0.67,-1.75 -1.537,-1.75 -0.866,0 -1.536,0.584 -1.536,1.75 0,1.09 0.71,1.75 1.536,1.75zM80.97,4.55c0.75,0 1.34,0.583 1.34,1.322 0,0.74 -0.59,1.284 -1.34,1.284 -0.748,0 -1.3,-0.584 -1.3,-1.284 0,-0.778 0.552,-1.322 1.3,-1.322zM78.922,11.239h-2.048L76.874,4.628h2.048v6.61z"
-      android:fillColor="#2E2F32"
-      android:fillType="nonZero"/>
-  <path
-      android:pathData="M62.573,2.644h2.048v8.633h-2.048z"
-      android:fillColor="#2E2F32"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M50.716,2.644h-2.009v2.528c-0.158,-0.233 -0.67,-0.66 -1.812,-0.66 -1.891,0 -3.23,1.477 -3.23,3.421 0,2.023 1.418,3.461 3.309,3.461 0.788,0 1.497,-0.35 1.772,-0.777 0,0.272 0.04,0.544 0.04,0.622h1.97c0,-0.156 -0.04,-0.583 -0.04,-1.167V2.644zM47.21,9.606c-0.788,0 -1.497,-0.545 -1.497,-1.634s0.71,-1.633 1.497,-1.633c0.788,0 1.497,0.544 1.497,1.633 0,1.05 -0.709,1.634 -1.497,1.634z"
-      android:fillColor="#2E2F32"
-      android:fillType="nonZero"/>
-  <path
-      android:pathData="M16.374,1.233L14.346,0.09l-2.028,1.142 -0.016,11.534 2.044,1.157 2.028,-1.141zM4.189,7L2.145,5.859 0.117,7v5.767l2.044,1.157 2.028,-1.157zM8.245,8.157l3.035,-1.72V4.124L9.252,2.983l-1.007,0.593 -4.072,-2.328L2.145,0.09 0.117,1.248v2.298l8.128,4.61"
-      android:fillColor="#2E2F32"
-      android:fillType="evenOdd"/>
-</vector>
diff --git a/vector/src/main/res/layout/fragment_login_server_selection.xml b/vector/src/main/res/layout/fragment_login_server_selection.xml
index de7bf65cbb..fe38f46828 100644
--- a/vector/src/main/res/layout/fragment_login_server_selection.xml
+++ b/vector/src/main/res/layout/fragment_login_server_selection.xml
@@ -104,7 +104,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:importantForAccessibility="no"
-                    android:src="@drawable/ic_logo_modular"
+                    android:src="@drawable/ic_logo_element_matrix_services"
                     android:tint="?riotx_text_primary"
                     app:layout_constraintBottom_toTopOf="@+id/loginServerChoiceModularText"
                     app:layout_constraintStart_toStartOf="parent"
diff --git a/vector/src/main/res/layout/fragment_login_server_url_form.xml b/vector/src/main/res/layout/fragment_login_server_url_form.xml
index d623500b0d..0b84c33011 100644
--- a/vector/src/main/res/layout/fragment_login_server_url_form.xml
+++ b/vector/src/main/res/layout/fragment_login_server_url_form.xml
@@ -21,12 +21,13 @@
             style="@style/LoginFormContainer"
             android:orientation="vertical">
 
+            <!-- Displayed only for EMS -->
             <ImageView
                 android:id="@+id/loginServerUrlFormIcon"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:importantForAccessibility="no"
-                android:src="@drawable/ic_logo_modular"
+                android:src="@drawable/ic_logo_element_matrix_services"
                 android:tint="?riotx_text_primary" />
 
             <TextView