diff --git a/.stylelintrc.yml b/.stylelintrc.yml
index 5d8cafba..9ee9366e 100644
--- a/.stylelintrc.yml
+++ b/.stylelintrc.yml
@@ -5,3 +5,7 @@ ignoreFiles:
 
 rules:
   indentation: tab
+  # complains about FontAwesome
+  font-family-no-missing-generic-family-keyword:
+  # needs a lot of refactoring to be enabled
+  no-descending-specificity:
diff --git a/client/css/style.css b/client/css/style.css
index 7e9c5f04..db97e33a 100644
--- a/client/css/style.css
+++ b/client/css/style.css
@@ -310,6 +310,9 @@ kbd {
 }
 
 #chat .toggle-button {
+	display: inline-block;
+	transition: opacity 0.2s, transform 0.2s;
+
 	/* These 2 directives are loosely taken from .fa-fw */
 	width: 1.35em;
 	text-align: center;
@@ -1012,6 +1015,8 @@ kbd {
 #chat .content {
 	flex: 1 1 auto;
 	min-width: 0;
+	padding-left: 10px;
+	padding-right: 6px;
 }
 
 #loading a,
@@ -1064,11 +1069,6 @@ kbd {
 #chat.colored-nicks .user.color-31 { color: #ff4846; }
 #chat.colored-nicks .user.color-32 { color: #ff199b; }
 
-#chat .content {
-	padding-left: 10px;
-	padding-right: 6px;
-}
-
 #chat .self .text {
 	color: #999;
 }
@@ -1167,11 +1167,6 @@ kbd {
 	color: #f00;
 }
 
-#chat .toggle-button {
-	display: inline-block;
-	transition: opacity 0.2s, transform 0.2s;
-}
-
 #chat .toggle-button.opened, /* Thumbnail toggle */
 #chat .msg.condensed:not(.closed) .toggle-button { /* Expanded status message toggle */
 	transform: rotate(90deg);
diff --git a/package.json b/package.json
index 15a0ac58..72c68f58 100644
--- a/package.json
+++ b/package.json
@@ -81,8 +81,8 @@
     "npm-run-all": "4.1.2",
     "nyc": "11.3.0",
     "socket.io-client": "2.0.4",
-    "stylelint": "8.2.0",
-    "stylelint-config-standard": "17.0.0",
+    "stylelint": "8.3.0",
+    "stylelint-config-standard": "18.0.0",
     "webpack": "3.8.1"
   }
 }