diff --git a/.stylelintrc.js b/.stylelintrc.js
index c044b19a63..0bdea3cccd 100644
--- a/.stylelintrc.js
+++ b/.stylelintrc.js
@@ -11,7 +11,8 @@ module.exports = {
         "length-zero-no-unit": null,
         "rule-empty-line-before": null,
         "color-hex-length": null,
-        "max-empty-lines": null,
+        "max-empty-lines": 1,
+        "no-eol-whitespace": true,
         "number-no-trailing-zeros": null,
         "number-leading-zero": null,
         "selector-list-comma-newline-after": null,
diff --git a/res/css/structures/_CreateRoom.scss b/res/css/structures/_CreateRoom.scss
index 3d23ccc4b2..78e6881b10 100644
--- a/res/css/structures/_CreateRoom.scss
+++ b/res/css/structures/_CreateRoom.scss
@@ -34,4 +34,3 @@ limitations under the License.
 .mx_CreateRoom_description {
     width: 330px;
 }
-
diff --git a/res/css/structures/_LeftPanel.scss b/res/css/structures/_LeftPanel.scss
index 5ddea244f3..a658005821 100644
--- a/res/css/structures/_LeftPanel.scss
+++ b/res/css/structures/_LeftPanel.scss
@@ -43,8 +43,6 @@ $roomListCollapsedWidth: 68px;
     }
 }
 
-
-
 .mx_LeftPanel {
     background-color: $roomlist-bg-color;
     // TODO decrease this once Spaces launches as it'll no longer need to include the 56px Community Panel
diff --git a/res/css/structures/_RoomView.scss b/res/css/structures/_RoomView.scss
index fd9c4a14fc..50fa304bd6 100644
--- a/res/css/structures/_RoomView.scss
+++ b/res/css/structures/_RoomView.scss
@@ -32,7 +32,6 @@ limitations under the License.
     position: relative;
 }
 
-
 @keyframes mx_RoomView_fileDropTarget_animation {
     from {
         opacity: 0;
@@ -112,7 +111,6 @@ limitations under the License.
     max-width: 1920px !important;
 }
 
-
 .mx_RoomView .mx_MainSplit {
     flex: 1 1 0;
 }
diff --git a/res/css/structures/_SpacePanel.scss b/res/css/structures/_SpacePanel.scss
index f590de18c1..4be9d49120 100644
--- a/res/css/structures/_SpacePanel.scss
+++ b/res/css/structures/_SpacePanel.scss
@@ -348,7 +348,6 @@ $activeBorderColor: $secondary-content;
     }
 }
 
-
 .mx_SpacePanel_sharePublicSpace {
     margin: 0;
 }
diff --git a/res/css/views/dialogs/_JoinRuleDropdown.scss b/res/css/views/dialogs/_JoinRuleDropdown.scss
index 91691cf53b..19209e9536 100644
--- a/res/css/views/dialogs/_JoinRuleDropdown.scss
+++ b/res/css/views/dialogs/_JoinRuleDropdown.scss
@@ -64,4 +64,3 @@ limitations under the License.
         mask-size: contain;
     }
 }
-
diff --git a/res/css/views/dialogs/_MessageEditHistoryDialog.scss b/res/css/views/dialogs/_MessageEditHistoryDialog.scss
index 4574344a28..f60bbc9589 100644
--- a/res/css/views/dialogs/_MessageEditHistoryDialog.scss
+++ b/res/css/views/dialogs/_MessageEditHistoryDialog.scss
@@ -64,4 +64,3 @@ limitations under the License.
         padding: 0 8px;
     }
 }
-
diff --git a/res/css/views/dialogs/_RoomSettingsDialog.scss b/res/css/views/dialogs/_RoomSettingsDialog.scss
index 9bcde6e1e0..cad83e2a42 100644
--- a/res/css/views/dialogs/_RoomSettingsDialog.scss
+++ b/res/css/views/dialogs/_RoomSettingsDialog.scss
@@ -58,4 +58,3 @@ limitations under the License.
     mask-size: 36px;
     mask-position: center;
 }
-
diff --git a/res/css/views/dialogs/_RoomUpgradeWarningDialog.scss b/res/css/views/dialogs/_RoomUpgradeWarningDialog.scss
index 941c8cb807..05e7f5c2e4 100644
--- a/res/css/views/dialogs/_RoomUpgradeWarningDialog.scss
+++ b/res/css/views/dialogs/_RoomUpgradeWarningDialog.scss
@@ -50,4 +50,3 @@ limitations under the License.
         vertical-align: middle;
     }
 }
-
diff --git a/res/css/views/dialogs/_WidgetCapabilitiesPromptDialog.scss b/res/css/views/dialogs/_WidgetCapabilitiesPromptDialog.scss
index 176919b84c..8786defed3 100644
--- a/res/css/views/dialogs/_WidgetCapabilitiesPromptDialog.scss
+++ b/res/css/views/dialogs/_WidgetCapabilitiesPromptDialog.scss
@@ -14,7 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-
 .mx_WidgetCapabilitiesPromptDialog {
     .text-muted {
         font-size: $font-12px;
@@ -55,7 +54,6 @@ limitations under the License.
             width: $font-32px;
             height: $font-15px;
 
-
             &.mx_ToggleSwitch_on > .mx_ToggleSwitch_ball {
                 left: calc(100% - $font-15px);
             }
diff --git a/res/css/views/elements/_Dropdown.scss b/res/css/views/elements/_Dropdown.scss
index 1acac70e42..e1e265f701 100644
--- a/res/css/views/elements/_Dropdown.scss
+++ b/res/css/views/elements/_Dropdown.scss
@@ -130,4 +130,3 @@ input.mx_Dropdown_option:focus {
     margin-left: 5px;
     margin-bottom: 5px;
 }
-
diff --git a/res/css/views/elements/_EditableItemList.scss b/res/css/views/elements/_EditableItemList.scss
index f089fa3dc2..8987510a18 100644
--- a/res/css/views/elements/_EditableItemList.scss
+++ b/res/css/views/elements/_EditableItemList.scss
@@ -61,4 +61,3 @@ limitations under the License.
 .mx_EditableItemList_label {
     margin-bottom: 5px;
 }
-
diff --git a/res/css/views/elements/_StyledCheckbox.scss b/res/css/views/elements/_StyledCheckbox.scss
index e2d61c033b..1467474b05 100644
--- a/res/css/views/elements/_StyledCheckbox.scss
+++ b/res/css/views/elements/_StyledCheckbox.scss
@@ -14,7 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-
 .mx_Checkbox {
     $size: $font-16px;
     $border-size: $font-1-5px;
diff --git a/res/css/views/elements/_TooltipButton.scss b/res/css/views/elements/_TooltipButton.scss
index 0c85dac818..5b7c0ce14d 100644
--- a/res/css/views/elements/_TooltipButton.scss
+++ b/res/css/views/elements/_TooltipButton.scss
@@ -49,4 +49,3 @@ limitations under the License.
     text-align: start;
     line-height: 17px !important;
 }
-
diff --git a/res/css/views/messages/_MImageReplyBody.scss b/res/css/views/messages/_MImageReplyBody.scss
index 70c53f8c9c..3207443d65 100644
--- a/res/css/views/messages/_MImageReplyBody.scss
+++ b/res/css/views/messages/_MImageReplyBody.scss
@@ -34,4 +34,3 @@ limitations under the License.
         }
     }
 }
-
diff --git a/res/css/views/messages/_common_CryptoEvent.scss b/res/css/views/messages/_common_CryptoEvent.scss
index b400a933ae..ad986575a2 100644
--- a/res/css/views/messages/_common_CryptoEvent.scss
+++ b/res/css/views/messages/_common_CryptoEvent.scss
@@ -39,7 +39,6 @@ limitations under the License.
         background-color: $notice-primary-color;
     }
 
-
     .mx_cryptoEvent_state, .mx_cryptoEvent_buttons {
         grid-column: 3;
         grid-row: 1 / 3;
diff --git a/res/css/views/right_panel/_ThreadPanel.scss b/res/css/views/right_panel/_ThreadPanel.scss
index d06981a715..06137196a3 100644
--- a/res/css/views/right_panel/_ThreadPanel.scss
+++ b/res/css/views/right_panel/_ThreadPanel.scss
@@ -14,7 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-
 .mx_ThreadPanel {
     display: flex;
     flex-direction: column;
diff --git a/res/css/views/right_panel/_UserInfo.scss b/res/css/views/right_panel/_UserInfo.scss
index 9a09d96bc9..a015ef29a7 100644
--- a/res/css/views/right_panel/_UserInfo.scss
+++ b/res/css/views/right_panel/_UserInfo.scss
@@ -223,7 +223,6 @@ limitations under the License.
             display: flex;
             margin: 8px 0;
 
-
             &.mx_UserInfo_device_verified {
                 .mx_UserInfo_device_trusted {
                     color: $accent-color;
@@ -267,7 +266,6 @@ limitations under the License.
         margin: 16px 0 8px;
     }
 
-
     .mx_VerificationShowSas {
         .mx_AccessibleButton + .mx_AccessibleButton {
             margin: 8px 0; // space between buttons
diff --git a/res/css/views/right_panel/_VerificationPanel.scss b/res/css/views/right_panel/_VerificationPanel.scss
index 95856a5d69..0db93f58cc 100644
--- a/res/css/views/right_panel/_VerificationPanel.scss
+++ b/res/css/views/right_panel/_VerificationPanel.scss
@@ -23,7 +23,6 @@ limitations under the License.
     }
 }
 
-
 .mx_UserInfo {
     .mx_EncryptionPanel_cancel {
         mask: url('$(res)/img/feather-customised/cancel.svg');
diff --git a/res/css/views/rooms/_AppsDrawer.scss b/res/css/views/rooms/_AppsDrawer.scss
index cfcb0c48a2..1276b13fde 100644
--- a/res/css/views/rooms/_AppsDrawer.scss
+++ b/res/css/views/rooms/_AppsDrawer.scss
@@ -365,7 +365,6 @@ $MinWidth: 240px;
     to { opacity: 1; }
 }
 
-
 .mx_AppLoading iframe {
     display: none;
 }
diff --git a/res/css/views/rooms/_EditMessageComposer.scss b/res/css/views/rooms/_EditMessageComposer.scss
index bf3c7c9b42..136ae0d4eb 100644
--- a/res/css/views/rooms/_EditMessageComposer.scss
+++ b/res/css/views/rooms/_EditMessageComposer.scss
@@ -24,7 +24,6 @@ limitations under the License.
     margin: -7px -10px -5px -10px;
     overflow: visible !important;   // override mx_EventTile_content
 
-
     .mx_BasicMessageComposer_input {
         border-radius: 4px;
         border: solid 1px $primary-hairline-color;
diff --git a/res/css/views/rooms/_EventBubbleTile.scss b/res/css/views/rooms/_EventBubbleTile.scss
index 2a419530d8..17033f922c 100644
--- a/res/css/views/rooms/_EventBubbleTile.scss
+++ b/res/css/views/rooms/_EventBubbleTile.scss
@@ -263,7 +263,6 @@ limitations under the License.
         }
     }
 
-
     .mx_EventTile_readAvatars {
         position: absolute;
         right: -110px;
diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss
index 8961071c33..90fd3e9203 100644
--- a/res/css/views/rooms/_EventTile.scss
+++ b/res/css/views/rooms/_EventTile.scss
@@ -401,7 +401,6 @@ $left-gutter: 64px;
     cursor: pointer;
 }
 
-
 .mx_EventTile_e2eIcon {
     position: relative;
     width: 14px;
@@ -581,7 +580,6 @@ $left-gutter: 64px;
     color: inherit;
 }
 
-
 /* Make h1 and h2 the same size as h3. */
 .mx_EventTile_content .markdown-body h1,
 .mx_EventTile_content .markdown-body h2 {
@@ -613,7 +611,6 @@ $left-gutter: 64px;
 
 /* end of overrides */
 
-
 .mx_EventTile_keyRequestInfo {
     font-size: $font-12px;
 }
@@ -731,8 +728,6 @@ $left-gutter: 64px;
     }
 }
 
-
-
 .mx_ThreadView {
     display: flex;
     flex-direction: column;
diff --git a/res/css/views/rooms/_MessageComposer.scss b/res/css/views/rooms/_MessageComposer.scss
index 62cbdb910a..d824e8105e 100644
--- a/res/css/views/rooms/_MessageComposer.scss
+++ b/res/css/views/rooms/_MessageComposer.scss
@@ -247,7 +247,6 @@ limitations under the License.
     }
 }
 
-
 .mx_MessageComposer_upload::before {
     mask-image: url('$(res)/img/element-icons/room/composer/attach.svg');
 }
diff --git a/res/css/views/rooms/_ReplyPreview.scss b/res/css/views/rooms/_ReplyPreview.scss
index 70a820e412..eb0233108b 100644
--- a/res/css/views/rooms/_ReplyPreview.scss
+++ b/res/css/views/rooms/_ReplyPreview.scss
@@ -52,4 +52,3 @@ limitations under the License.
         }
     }
 }
-
diff --git a/res/css/views/rooms/_SearchBar.scss b/res/css/views/rooms/_SearchBar.scss
index e08168a122..234363245a 100644
--- a/res/css/views/rooms/_SearchBar.scss
+++ b/res/css/views/rooms/_SearchBar.scss
@@ -68,4 +68,3 @@ limitations under the License.
         cursor: pointer;
     }
 }
-
diff --git a/res/css/views/rooms/_SendMessageComposer.scss b/res/css/views/rooms/_SendMessageComposer.scss
index 4b7eb54188..c7e6ea6a6e 100644
--- a/res/css/views/rooms/_SendMessageComposer.scss
+++ b/res/css/views/rooms/_SendMessageComposer.scss
@@ -47,4 +47,3 @@ limitations under the License.
         }
     }
 }
-
diff --git a/res/css/views/settings/_E2eAdvancedPanel.scss b/res/css/views/settings/_E2eAdvancedPanel.scss
index 9e32685d12..3f180e6fcd 100644
--- a/res/css/views/settings/_E2eAdvancedPanel.scss
+++ b/res/css/views/settings/_E2eAdvancedPanel.scss
@@ -17,4 +17,3 @@ limitations under the License.
 .mx_E2eAdvancedPanel_settingLongDescription {
     margin-right: 150px;
 }
-
diff --git a/res/css/views/settings/_ThemeChoicePanel.scss b/res/css/views/settings/_ThemeChoicePanel.scss
index 39b73e7837..a335b6e68e 100644
--- a/res/css/views/settings/_ThemeChoicePanel.scss
+++ b/res/css/views/settings/_ThemeChoicePanel.scss
@@ -85,4 +85,3 @@ limitations under the License.
         }
     }
 }
-
diff --git a/res/css/views/voip/CallView/_CallViewButtons.scss b/res/css/views/voip/CallView/_CallViewButtons.scss
index 8e343f0ff3..d9396ac3ee 100644
--- a/res/css/views/voip/CallView/_CallViewButtons.scss
+++ b/res/css/views/voip/CallView/_CallViewButtons.scss
@@ -35,7 +35,6 @@ limitations under the License.
         margin-left: 2px;
         margin-right: 2px;
 
-
         &::before {
             content: '';
             display: inline-block;
@@ -48,7 +47,6 @@ limitations under the License.
             background-position: center;
         }
 
-
         &.mx_CallViewButtons_dialpad::before {
             background-image: url('$(res)/img/voip/dialpad.svg');
         }
diff --git a/res/css/views/voip/_CallView.scss b/res/css/views/voip/_CallView.scss
index aa0aa4e2a6..088486bdf6 100644
--- a/res/css/views/voip/_CallView.scss
+++ b/res/css/views/voip/_CallView.scss
@@ -200,7 +200,6 @@ limitations under the License.
     }
 }
 
-
 .mx_CallView_presenting {
     opacity: 1;
     transition: opacity 0.5s;