diff --git a/ArmoredCar/ArmoredCar/FormMapWithSetArmoredCars.Designer.cs b/ArmoredCar/ArmoredCar/FormMapWithSetArmoredCars.Designer.cs
index 0cd41b5..8752fdf 100644
--- a/ArmoredCar/ArmoredCar/FormMapWithSetArmoredCars.Designer.cs
+++ b/ArmoredCar/ArmoredCar/FormMapWithSetArmoredCars.Designer.cs
@@ -31,6 +31,8 @@ namespace ArmoredCar
         private void InitializeComponent()
         {
             this.groupBoxTools = new System.Windows.Forms.GroupBox();
+            this.ButtonSortByType = new System.Windows.Forms.Button();
+            this.ButtonSortByColor = new System.Windows.Forms.Button();
             this.groupBoxMaps = new System.Windows.Forms.GroupBox();
             this.buttonAddMap = new System.Windows.Forms.Button();
             this.buttonDeleteMap = new System.Windows.Forms.Button();
@@ -61,6 +63,8 @@ namespace ArmoredCar
             // 
             // groupBoxTools
             // 
+            this.groupBoxTools.Controls.Add(this.ButtonSortByType);
+            this.groupBoxTools.Controls.Add(this.ButtonSortByColor);
             this.groupBoxTools.Controls.Add(this.groupBoxMaps);
             this.groupBoxTools.Controls.Add(this.maskedTextBoxPosition);
             this.groupBoxTools.Controls.Add(this.buttonRemoveCar);
@@ -72,13 +76,33 @@ namespace ArmoredCar
             this.groupBoxTools.Controls.Add(this.buttonShowOnMap);
             this.groupBoxTools.Controls.Add(this.buttonAddCar);
             this.groupBoxTools.Dock = System.Windows.Forms.DockStyle.Right;
-            this.groupBoxTools.Location = new System.Drawing.Point(802, 24);
+            this.groupBoxTools.Location = new System.Drawing.Point(798, 24);
             this.groupBoxTools.Name = "groupBoxTools";
-            this.groupBoxTools.Size = new System.Drawing.Size(204, 637);
+            this.groupBoxTools.Size = new System.Drawing.Size(204, 639);
             this.groupBoxTools.TabIndex = 0;
             this.groupBoxTools.TabStop = false;
             this.groupBoxTools.Text = "Инструменты";
             // 
+            // ButtonSortByType
+            // 
+            this.ButtonSortByType.Location = new System.Drawing.Point(17, 269);
+            this.ButtonSortByType.Name = "ButtonSortByType";
+            this.ButtonSortByType.Size = new System.Drawing.Size(175, 35);
+            this.ButtonSortByType.TabIndex = 13;
+            this.ButtonSortByType.Text = "Сортировать по типу";
+            this.ButtonSortByType.UseVisualStyleBackColor = true;
+            this.ButtonSortByType.Click += new System.EventHandler(this.ButtonSortByType_Click);
+            // 
+            // ButtonSortByColor
+            // 
+            this.ButtonSortByColor.Location = new System.Drawing.Point(17, 311);
+            this.ButtonSortByColor.Name = "ButtonSortByColor";
+            this.ButtonSortByColor.Size = new System.Drawing.Size(175, 35);
+            this.ButtonSortByColor.TabIndex = 12;
+            this.ButtonSortByColor.Text = "Сортировать по цвету";
+            this.ButtonSortByColor.UseVisualStyleBackColor = true;
+            this.ButtonSortByColor.Click += new System.EventHandler(this.ButtonSortByColor_Click);
+            // 
             // groupBoxMaps
             // 
             this.groupBoxMaps.Controls.Add(this.buttonAddMap);
@@ -143,7 +167,7 @@ namespace ArmoredCar
             // 
             // maskedTextBoxPosition
             // 
-            this.maskedTextBoxPosition.Location = new System.Drawing.Point(17, 355);
+            this.maskedTextBoxPosition.Location = new System.Drawing.Point(17, 393);
             this.maskedTextBoxPosition.Mask = "00";
             this.maskedTextBoxPosition.Name = "maskedTextBoxPosition";
             this.maskedTextBoxPosition.Size = new System.Drawing.Size(175, 23);
@@ -152,7 +176,7 @@ namespace ArmoredCar
             // 
             // buttonRemoveCar
             // 
-            this.buttonRemoveCar.Location = new System.Drawing.Point(17, 384);
+            this.buttonRemoveCar.Location = new System.Drawing.Point(17, 422);
             this.buttonRemoveCar.Name = "buttonRemoveCar";
             this.buttonRemoveCar.Size = new System.Drawing.Size(175, 35);
             this.buttonRemoveCar.TabIndex = 3;
@@ -162,7 +186,7 @@ namespace ArmoredCar
             // 
             // buttonShowStorage
             // 
-            this.buttonShowStorage.Location = new System.Drawing.Point(17, 437);
+            this.buttonShowStorage.Location = new System.Drawing.Point(17, 475);
             this.buttonShowStorage.Name = "buttonShowStorage";
             this.buttonShowStorage.Size = new System.Drawing.Size(175, 35);
             this.buttonShowStorage.TabIndex = 4;
@@ -175,7 +199,7 @@ namespace ArmoredCar
             this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonDown.BackgroundImage = global::ArmoredCar.Properties.Resources.Down;
             this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonDown.Location = new System.Drawing.Point(91, 587);
+            this.buttonDown.Location = new System.Drawing.Point(91, 603);
             this.buttonDown.Name = "buttonDown";
             this.buttonDown.Size = new System.Drawing.Size(30, 30);
             this.buttonDown.TabIndex = 10;
@@ -187,7 +211,7 @@ namespace ArmoredCar
             this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonRight.BackgroundImage = global::ArmoredCar.Properties.Resources.Right;
             this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonRight.Location = new System.Drawing.Point(127, 587);
+            this.buttonRight.Location = new System.Drawing.Point(127, 603);
             this.buttonRight.Name = "buttonRight";
             this.buttonRight.Size = new System.Drawing.Size(30, 30);
             this.buttonRight.TabIndex = 9;
@@ -199,7 +223,7 @@ namespace ArmoredCar
             this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonLeft.BackgroundImage = global::ArmoredCar.Properties.Resources.Left;
             this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonLeft.Location = new System.Drawing.Point(55, 587);
+            this.buttonLeft.Location = new System.Drawing.Point(55, 603);
             this.buttonLeft.Name = "buttonLeft";
             this.buttonLeft.Size = new System.Drawing.Size(30, 30);
             this.buttonLeft.TabIndex = 8;
@@ -211,7 +235,7 @@ namespace ArmoredCar
             this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonUp.BackgroundImage = global::ArmoredCar.Properties.Resources.Up;
             this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonUp.Location = new System.Drawing.Point(91, 551);
+            this.buttonUp.Location = new System.Drawing.Point(91, 567);
             this.buttonUp.Name = "buttonUp";
             this.buttonUp.Size = new System.Drawing.Size(30, 30);
             this.buttonUp.TabIndex = 7;
@@ -220,7 +244,7 @@ namespace ArmoredCar
             // 
             // buttonShowOnMap
             // 
-            this.buttonShowOnMap.Location = new System.Drawing.Point(17, 487);
+            this.buttonShowOnMap.Location = new System.Drawing.Point(17, 525);
             this.buttonShowOnMap.Name = "buttonShowOnMap";
             this.buttonShowOnMap.Size = new System.Drawing.Size(175, 35);
             this.buttonShowOnMap.TabIndex = 5;
@@ -230,7 +254,7 @@ namespace ArmoredCar
             // 
             // buttonAddCar
             // 
-            this.buttonAddCar.Location = new System.Drawing.Point(17, 314);
+            this.buttonAddCar.Location = new System.Drawing.Point(17, 352);
             this.buttonAddCar.Name = "buttonAddCar";
             this.buttonAddCar.Size = new System.Drawing.Size(175, 35);
             this.buttonAddCar.TabIndex = 1;
@@ -243,7 +267,7 @@ namespace ArmoredCar
             this.pictureBox.Dock = System.Windows.Forms.DockStyle.Fill;
             this.pictureBox.Location = new System.Drawing.Point(0, 24);
             this.pictureBox.Name = "pictureBox";
-            this.pictureBox.Size = new System.Drawing.Size(802, 637);
+            this.pictureBox.Size = new System.Drawing.Size(798, 639);
             this.pictureBox.TabIndex = 1;
             this.pictureBox.TabStop = false;
             // 
@@ -253,7 +277,7 @@ namespace ArmoredCar
             this.FileToolStripMenuItem});
             this.menuStrip1.Location = new System.Drawing.Point(0, 0);
             this.menuStrip1.Name = "menuStrip1";
-            this.menuStrip1.Size = new System.Drawing.Size(1006, 24);
+            this.menuStrip1.Size = new System.Drawing.Size(1002, 24);
             this.menuStrip1.TabIndex = 2;
             this.menuStrip1.Text = "menuStrip1";
             // 
@@ -292,7 +316,7 @@ namespace ArmoredCar
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1006, 661);
+            this.ClientSize = new System.Drawing.Size(1002, 663);
             this.Controls.Add(this.pictureBox);
             this.Controls.Add(this.groupBoxTools);
             this.Controls.Add(this.menuStrip1);
@@ -336,5 +360,7 @@ namespace ArmoredCar
         private ToolStripMenuItem LoadToolStripMenuItem;
         private OpenFileDialog openFileDialog;
         private SaveFileDialog saveFileDialog;
+        private Button ButtonSortByType;
+        private Button ButtonSortByColor;
     }
 }
\ No newline at end of file
diff --git a/ArmoredCar/ArmoredCar/FormMapWithSetArmoredCars.cs b/ArmoredCar/ArmoredCar/FormMapWithSetArmoredCars.cs
index 60af64b..9af7a3c 100644
--- a/ArmoredCar/ArmoredCar/FormMapWithSetArmoredCars.cs
+++ b/ArmoredCar/ArmoredCar/FormMapWithSetArmoredCars.cs
@@ -313,5 +313,24 @@ namespace ArmoredCar
             }
         }
 
+        private void ButtonSortByType_Click(object sender, EventArgs e)
+        {
+            if (listBoxMaps.SelectedIndex == -1)
+            {
+                return;
+            }
+            _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].Sort(new ArmoredCarCompareByType());
+            pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+        }
+
+        private void ButtonSortByColor_Click(object sender, EventArgs e)
+        {
+            if (listBoxMaps.SelectedIndex == -1)
+            {
+                return;
+            }
+            _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].Sort(new ArmoredCarCompareByColor());
+            pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+        }
     }
 }
\ No newline at end of file