diff --git a/index.theme b/index.theme
index 68f938e..61acfcd 100644
--- a/index.theme
+++ b/index.theme
@@ -137,11 +137,7 @@ Type=Scalable
 Size=16
 Context=Status
 MinSize=8
-<<<<<<< Updated upstream
-MaxSize=22
-=======
 MaxSize=256
->>>>>>> Stashed changes
 Type=Scalable
 
 [status/scalable]
@@ -154,16 +150,16 @@ Type=Scalable
 [panel/24]
 Size=24
 Context=Status
-MinSize=8
-MaxSize=128
+MinSize=24
+MaxSize=256
 Type=Scalable
 
 
 [panel/16]
 Size=16
 Context=Status
-MinSize=8
-MaxSize=24
+MinSize=1
+MaxSize=22
 Type=Scalable
 
 [stock/16]