diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomHeader.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomHeader.css
index 6450d4192b..900e01d1a1 100644
--- a/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomHeader.css
+++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomHeader.css
@@ -194,7 +194,7 @@ limitations under the License.
 
 .mx_RoomHeader_editable {
     border-bottom: 1px solid #c7c7c7 ! important;
-    min-width: 70px;
+    min-width: 150px;
     cursor: text;
 }
 
diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomSettings.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomSettings.css
index 19031e4a5a..c58c344115 100644
--- a/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomSettings.css
+++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomSettings.css
@@ -60,7 +60,7 @@ limitations under the License.
 */
 
 .mx_RoomSettings .mx_RoomSettings_toggles label {
-    margin-bottom: 10px;
+    margin-bottom: 8px;
     display: block;
 }
 
@@ -74,7 +74,7 @@ limitations under the License.
 }
 
 .mx_RoomSettings .mx_RoomSettings_tags {
-    margin-bottom: 10px;
+    margin-bottom: 8px;
 }
 
 .mx_RoomSettings .mx_RoomSettings_roomColor {
@@ -99,29 +99,48 @@ limitations under the License.
     width: 100%;
 }
 
+.mx_RoomSettings .mx_RoomSettings_aliasLabel {
+    margin-bottom: 8px;
+}
+
 .mx_RoomSettings .mx_RoomSettings_aliasesTable {
     margin-top: 12px;
-    margin-bottom: 12px;
+    margin-bottom: -16px;
     margin-left: 56px;
     display: table;
 }
 
-.mx_RoomSettings .mx_RoomSettings_aliasesRow {
+.mx_RoomSettings .mx_RoomSettings_aliasesTableRow {
     display: table-row;
+    margin-bottom: 16px;
 }
 
 .mx_RoomSettings .mx_RoomSettings_alias {
-    display: table-cell;
-    margin-bottom: 20px;
+    max-width: 400px;
+    margin-bottom: 16px;
+    /* 
+    commented out so margin applies
+    display: table-cell; */
 }
 
 .mx_RoomSettings .mx_RoomSettings_addAlias,
 .mx_RoomSettings .mx_RoomSettings_deleteAlias {
     display: table-cell;
     padding-left: 0.5em;
+    position: relative;
     cursor: pointer;
 }
 
+.mx_RoomSettings .mx_RoomSettings_addAlias img,
+.mx_RoomSettings .mx_RoomSettings_deleteAlias img {
+    visibility: hidden;
+}
+
+.mx_RoomSettings .mx_RoomSettings_aliasesTableRow:hover .mx_RoomSettings_addAlias img,
+.mx_RoomSettings .mx_RoomSettings_aliasesTableRow:hover .mx_RoomSettings_deleteAlias img {
+    visibility: visible;
+}
+
 .mx_RoomSettings_editable {
     border: 0px;
     border-bottom: 1px solid #c7c7c7;