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 c0e919b88f..2c132640c4 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
@@ -164,7 +164,7 @@ limitations under the License.
 .mx_RoomHeader_settingsButton {
     display: inline-block;
     position: relative;
-    bottom: 10px;
+    bottom: -1px;
     left: 4px;
 }
 
diff --git a/src/skins/vector/img/icons-search-copy.svg b/src/skins/vector/img/icons-search-copy.svg
new file mode 100644
index 0000000000..54b6f8e503
--- /dev/null
+++ b/src/skins/vector/img/icons-search-copy.svg
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="13px" height="13px" viewBox="0 0 13 13" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: sketchtool 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <title>1C068C28-66A7-48CD-BAA3-6E96EAC39CEF</title>
+    <desc>Created with sketchtool.</desc>
+    <defs>
+        <circle id="path-1" cx="5" cy="5" r="5"></circle>
+        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="10" height="10" fill="white">
+            <use xlink:href="#path-1"></use>
+        </mask>
+    </defs>
+    <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Room-list-Copy-3" transform="translate(-21.000000, -50.000000)" stroke="#76CFA6">
+            <g id="Room-list/Header">
+                <g id="icons_search-copy" transform="translate(21.000000, 50.000000)">
+                    <use id="Oval-29" mask="url(#mask-2)" stroke-width="2" xlink:href="#path-1"></use>
+                    <path d="M8.5,8.5 L12.0355339,12.0355339" id="Line" stroke-linecap="round" opacity="0.7"></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
diff --git a/src/skins/vector/img/icons-settings-room.svg b/src/skins/vector/img/icons-settings-room.svg
new file mode 100644
index 0000000000..117d134c95
--- /dev/null
+++ b/src/skins/vector/img/icons-settings-room.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: sketchtool 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
+    <title>69011392-CE9D-4404-A85C-A8548C5D850B</title>
+    <desc>Created with sketchtool.</desc>
+    <defs></defs>
+    <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Room-header/Vector-Design" transform="translate(-664.000000, -27.000000)">
+            <g id="icons_settings_room" transform="translate(660.000000, 23.000000)">
+                <path d="M19.2916667,13.5728624 C19.2916667,13.5393757 19.3017819,13.5102943 19.3113438,13.4971468 C19.3355672,13.4638396 19.3859829,13.4310694 19.4436252,13.4214623 L17.694545,13.6861316 L17.3974447,13.7310981 L17.2977123,14.0145482 C17.185604,14.3331717 17.0722755,14.597605 16.9592353,14.8067293 L16.8124355,15.0783089 L16.9894726,15.331219 C17.2195103,15.6598444 17.565037,16.1054769 18.0280062,16.6713281 C18.022664,16.6649493 18.0099284,16.6331101 18.0099284,16.5920681 C18.0099284,16.5496402 18.0279377,16.5036164 18.0528321,16.475956 C17.8694436,16.7228218 17.5714051,17.0479546 17.1334654,17.4798119 C16.7965085,17.8120888 16.5345801,18.0099284 16.5920681,18.0099284 C16.6214055,18.0099284 16.6291649,18.0126143 16.6155936,18.0038899 L15.3431476,17.005336 L15.0891758,16.8065755 L14.8033664,16.9559758 C14.5503526,17.088233 14.2889914,17.1973729 14.0189869,17.2835445 L13.7120738,17.3814955 L13.6744316,17.7014535 C13.5757258,18.5404536 13.4865723,19.1122657 13.4117593,19.4000077 C13.4220315,19.3588282 13.508382,19.2916667 13.5538737,19.2916667 L11.4461263,19.2916667 C11.4709448,19.2916667 11.5046771,19.3033697 11.5281137,19.3223422 C11.5674577,19.3541921 11.5985339,19.4122911 11.6028567,19.4684877 L11.3327968,17.6846531 L11.2864626,17.3801712 L10.9936883,17.2845714 C10.7078788,17.1912459 10.44734,17.0841355 10.2119332,16.9635612 L9.93214937,16.8202573 L9.68174016,17.0102842 L8.34303574,18.0261804 C8.34222864,18.0245539 8.3828551,18.0099284 8.40793186,18.0099284 C8.4560459,18.0099284 8.50260257,18.0304133 8.52412631,18.0519371 C7.73317304,17.3354714 7.2298153,16.8229617 7.00934352,16.5176931 C7.02916553,16.5459153 7.0375434,16.5734426 7.0375434,16.5920681 C7.0375434,16.6255549 7.02742813,16.6546363 7.01786631,16.6677838 C7.10938322,16.5396915 7.26666674,16.3346061 7.48982077,16.0525642 C7.72197376,15.7591487 7.89698984,15.5306554 8.01617299,15.3651233 L8.19916614,15.1109661 L8.05035851,14.8353965 C7.89620291,14.5499231 7.78028893,14.2700333 7.70189913,13.9956689 L7.61327161,13.6854726 L7.29411759,13.6383843 L5.55665014,13.3820367 C5.60547283,13.3895382 5.65427606,13.4185878 5.68200405,13.4549808 C5.69744497,13.475247 5.70833333,13.5072316 5.70833333,13.534885 L5.70833333,11.4271376 C5.70833333,11.4606243 5.69821806,11.4897057 5.68865624,11.5028532 C5.66733768,11.5321662 5.61852108,11.5655671 5.55412371,11.5772757 L7.3050617,11.3139278 L7.6170932,11.2669553 L7.70896845,10.9650795 C7.78753435,10.7069344 7.89777395,10.446882 8.04022371,10.1847745 L8.18820877,9.91248195 L8.0101898,9.65880492 C7.74852329,9.28593014 7.40215158,8.83920775 6.9702929,8.31710994 C6.97614867,8.32413164 6.99007161,8.35754672 6.99007161,8.40793186 C6.99007161,8.4608591 6.98258594,8.47998916 6.98661693,8.47416662 C7.12501718,8.28270528 7.42133693,7.95931063 7.86180475,7.52491822 C8.20132871,7.19007736 8.46567196,6.99007161 8.40793186,6.99007161 C8.37230936,6.99007161 8.35028571,6.98160098 8.34992978,6.98132719 L9.65863124,7.99604966 L9.91223703,8.19268603 L10.1966336,8.04402418 C10.4496474,7.91176698 10.7110086,7.80262714 10.9810131,7.71645547 L11.2879262,7.61850448 L11.3255684,7.29854649 C11.4242742,6.45954641 11.5134277,5.88773433 11.5882407,5.59999227 C11.5779685,5.64117182 11.491618,5.70833333 11.4461263,5.70833333 L13.5538737,5.70833333 C13.5290552,5.70833333 13.4953229,5.69663029 13.4718863,5.67765781 C13.4325423,5.64580789 13.4014661,5.58770895 13.3971433,5.53151231 L13.6672032,7.31534687 L13.7135374,7.61982882 L14.0063117,7.7154286 C14.2921212,7.80875413 14.55266,7.91586455 14.7880668,8.03643878 L15.0667962,8.17920261 L15.3169039,7.99074117 L16.6651027,6.97484491 C16.6763099,6.97052126 16.6241756,6.99007161 16.5920681,6.99007161 C16.5510262,6.99007161 16.519187,6.97733595 16.5093349,6.96912583 C17.2816391,7.68242394 17.786379,8.20245893 17.9875122,8.48739759 C17.9775221,8.4800961 17.9624566,8.43274744 17.9624566,8.40793186 C17.9624566,8.37444515 17.9725719,8.34536374 17.9821337,8.33221623 C17.8906168,8.46030849 17.7333333,8.66539387 17.5101792,8.94743577 C17.2780262,9.24085135 17.1030102,9.46934457 16.983827,9.63487672 L16.8039941,9.8846446 L16.9459858,10.1577054 C17.0973302,10.4487525 17.2157304,10.7317577 17.3016229,11.0066136 L17.3947182,11.3045187 L17.7032402,11.3517243 L19.4407076,11.6175663 C19.3945272,11.6104618 19.3457239,11.5814122 19.3179959,11.5450192 C19.302555,11.524753 19.2916667,11.4927684 19.2916667,11.465115 L19.2916667,13.5728624 L19.2916667,13.5728624 Z M20.2916667,13.5728624 L20.2916667,11.465115 C20.2916667,11.2728919 20.2301422,11.0921639 20.1134277,10.938976 C19.984426,10.7696613 19.8027031,10.6614929 19.5923589,10.6291323 L17.8544855,10.363228 L17.7788628,10.8574761 L18.2561028,10.7083386 C18.1521072,10.3755526 18.0109975,10.038266 17.8332026,9.69635271 L17.3895942,9.92702908 L17.7953614,10.2191814 C17.9040439,10.0682334 18.0708213,9.85049629 18.2943998,9.56791796 C18.5269772,9.27396595 18.6924986,9.05813902 18.7933685,8.91692118 C18.9017053,8.76798915 18.9624566,8.59332905 18.9624566,8.40793186 C18.9624566,8.20588738 18.9030846,8.01928953 18.7722844,7.86980369 C18.5498818,7.5500335 18.0102527,6.99405205 17.1684488,6.21750426 C16.9877567,6.06610236 16.7976798,5.99007161 16.5920681,5.99007161 C16.3700726,5.99007161 16.1660301,6.06658755 16.0106502,6.22196744 L14.7151056,7.19209303 L15.0160048,7.5914171 L15.2439427,7.14639542 C14.9603221,7.00112631 14.6512052,6.87404491 14.3167135,6.76482314 L14.1615126,7.24012587 L14.655822,7.16490487 L14.38998,5.41794306 C14.3772158,5.23404949 14.2733503,5.03986612 14.1010846,4.90041294 C13.9447263,4.7738372 13.755921,4.70833333 13.5538737,4.70833333 L11.4461263,4.70833333 C11.0335176,4.70833333 10.7193048,4.95272109 10.6192582,5.35290753 C10.5306614,5.69357671 10.4362592,6.2990532 10.3324178,7.18170524 L10.8289931,7.24012587 L10.676973,6.76379626 C10.3519948,6.86751269 10.0373707,6.99889418 9.73337941,7.15779874 L9.96500651,7.60091146 L10.2713818,7.20577326 L8.96116042,6.18987699 C8.79471492,6.06183733 8.60812404,5.99007161 8.40793186,5.99007161 C8.0716892,5.99007161 7.73789391,6.24262573 7.15962537,6.81291815 C6.6823007,7.28365902 6.35516387,7.64068653 6.17018122,7.89681636 C6.05452286,8.06370379 5.99007161,8.22841254 5.99007161,8.40793186 C5.99007161,8.61022748 6.06728965,8.79555076 6.20090455,8.95588864 C6.61604566,9.45778088 6.94693135,9.88453066 7.19163311,10.2332307 L7.60091146,9.9460178 L7.1615992,9.70726113 C6.98756879,10.0274771 6.85095757,10.3497395 6.75229457,10.6739179 L7.23063151,10.8194987 L7.15620132,10.3250696 L5.3902508,10.5909116 C5.17158962,10.6304328 5.00251236,10.7461172 4.87992015,10.9146815 C4.76908467,11.0670803 4.70833333,11.2417404 4.70833333,11.4271376 L4.70833333,13.534885 C4.70833333,13.7271081 4.76985777,13.9078361 4.88657233,14.061024 C5.01557399,14.2303387 5.19729689,14.3385071 5.40764111,14.3708677 L7.14815672,14.6276747 L7.22113715,14.1330295 L6.74037518,14.2703901 C6.83921427,14.6163269 6.98281014,14.9630584 7.17045312,15.3105454 L7.61040582,15.0729709 L7.20463865,14.7808186 C7.09595607,14.9317666 6.9291787,15.1495037 6.70560023,15.432082 C6.47302282,15.7260341 6.30750141,15.941861 6.20663153,16.0830788 C6.09829474,16.2320109 6.0375434,16.406671 6.0375434,16.5920681 C6.0375434,16.7752634 6.09022783,16.9483694 6.19438795,17.0971695 C6.47190158,17.4815122 7.01291273,18.0323599 7.83511625,18.7762583 C7.97779454,18.9198189 8.18258892,19.0099284 8.40793186,19.0099284 C8.62289672,19.0099284 8.82176089,18.9383373 8.97977316,18.7961262 L10.2862503,17.8068816 L9.98399523,17.4085829 L9.75605729,17.8536046 C10.0396779,17.9988737 10.3487948,18.1259551 10.6832865,18.2351769 L10.8384874,17.7598741 L10.344178,17.8350951 L10.61002,19.5820569 C10.6227842,19.7659505 10.7266497,19.9601339 10.8989154,20.0995871 C11.0552737,20.2261628 11.244079,20.2916667 11.4461263,20.2916667 L13.5538737,20.2916667 C13.9664824,20.2916667 14.2806952,20.0472789 14.3807418,19.6470925 C14.4693386,19.3064233 14.5637408,18.7009468 14.6675822,17.8182948 L14.1710069,17.7598741 L14.323027,18.2362037 C14.6480052,18.1324873 14.9626293,18.0011058 15.2666206,17.8422013 L15.0349935,17.3990885 L14.7268394,17.792841 L16.0370607,18.8182317 C16.2384937,18.9502769 16.4108203,19.0099284 16.5920681,19.0099284 C16.9280588,19.0099284 17.2611042,18.7583728 17.8356102,18.1918461 C18.3091333,17.7248997 18.6377162,17.3664456 18.8283746,17.1051729 C18.9349535,16.9906682 19.0099284,16.7990657 19.0099284,16.5920681 C19.0099284,16.3864565 18.9338976,16.1963796 18.7990954,16.034617 C18.3534697,15.4899313 18.021739,15.0620917 17.8087045,14.7577567 L17.3990885,15.0444878 L17.8389418,15.2822464 C17.9790857,15.0229801 18.112608,14.7114281 18.2410247,14.3464544 L17.7693685,14.1805013 L17.844192,14.674871 L19.6006482,14.409029 C19.8175769,14.3729308 19.9945828,14.2578769 20.1200798,14.0853185 C20.2309153,13.9329197 20.2916667,13.7582596 20.2916667,13.5728624 L20.2916667,13.5728624 Z" id="Path" fill="#76CFA6"></path>
+                <path d="M15.625,12.5 C15.625,11.6373655 15.3198273,10.900882 14.7094727,10.2905273 C14.099118,9.68017273 13.3626345,9.375 12.5,9.375 C11.6373655,9.375 10.900882,9.68017273 10.2905273,10.2905273 C9.68017273,10.900882 9.375,11.6373655 9.375,12.5 C9.375,13.3626345 9.68017273,14.099118 10.2905273,14.7094727 C10.900882,15.3198273 11.6373655,15.625 12.5,15.625 C13.3626345,15.625 14.099118,15.3198273 14.7094727,14.7094727 C15.3198273,14.099118 15.625,13.3626345 15.625,12.5 L15.625,12.5 Z" id="Path" stroke="#76CFA6"></path>
+            </g>
+        </g>
+    </g>
+</svg>
diff --git a/src/skins/vector/img/icons-upload.svg b/src/skins/vector/img/icons-upload.svg
new file mode 100644
index 0000000000..d003934980
--- /dev/null
+++ b/src/skins/vector/img/icons-upload.svg
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="35px" height="35px" viewBox="0 0 35 35" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: sketchtool 3.8.2 (29753) - http://www.bohemiancoding.com/sketch -->
+    <title>2082AA27-EC81-4C61-8CD9-75C54E9D8FE2</title>
+    <desc>Created with sketchtool.</desc>
+    <defs>
+        <path d="M0,4.00955791 C0,1.79514022 1.78186122,0 4.00417171,0 L8.40206186,0 C8.40206186,0 15,6.49234232 15,6.49234232 L15,18.0063928 C15,20.2120012 13.2055487,22 10.9999798,22 L4.00002024,22 C1.79087006,22 0,20.1996477 0,17.9904421 L0,4.00955791 Z" id="path-1"></path>
+        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="15" height="22" fill="white">
+            <use xlink:href="#path-1"></use>
+        </mask>
+        <path d="M15,7 L10.1573486,7 C8.96587786,7 8,6.03402932 8,4.84265141 L8,0" id="path-3"></path>
+        <mask id="mask-4" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="7" height="7" fill="white">
+            <use xlink:href="#path-3"></use>
+        </mask>
+    </defs>
+    <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Room-footer" transform="translate(-654.000000, -13.000000)">
+            <g id="icons_upload" transform="translate(654.000000, 13.000000)">
+                <path d="M17.5,35 C27.1649831,35 35,27.1649831 35,17.5 C35,7.83501688 27.1649831,0 17.5,0 C7.83501688,0 0,7.83501688 0,17.5 C0,27.1649831 7.83501688,35 17.5,35 Z" id="Oval-109-Copy" fill="#EAF5F0"></path>
+                <g id="file" transform="translate(10.000000, 6.000000)" stroke="#76CFA6" stroke-width="2">
+                    <use id="Rectangle-5" mask="url(#mask-2)" xlink:href="#path-1"></use>
+                    <use id="Rectangle-6" mask="url(#mask-4)" xlink:href="#path-3"></use>
+                </g>
+                <path d="M21.4788601,19.0662095 C21.6122719,19.0662095 21.7456837,19.0149896 21.8478272,18.9118482 C22.0507243,18.7062669 22.0507243,18.3736884 21.8478272,18.1681072 L17.8711824,14.1540105 C17.6682853,13.9484293 17.33823,13.9491309 17.134638,14.1533089 L13.1531293,18.1617924 C12.9495373,18.3673736 12.9488424,18.7006538 13.1517396,18.9062351 C13.3546367,19.1125179 13.684692,19.1125179 13.8882839,18.9076383 L16.9866343,15.7881359 L16.988024,24.4737681 C16.988024,24.7642481 17.2221895,25 17.5091639,25 C17.7975279,25 18.0303038,24.7642481 18.0303038,24.4737681 L18.0289141,15.8014671 L21.1105879,18.9118482 C21.2120365,19.0149896 21.3454483,19.0662095 21.4788601,19.0662095 L21.4788601,19.0662095 Z" id="Fill-75" fill="#76CFA6"></path>
+            </g>
+        </g>
+    </g>
+</svg>